Merge pull request #55 from free-x/twai

[WIP] Update NMEA Libraries
norbert-walter · Oct 13, 2023 · d1032bc · d1032bc
2 parents 4bced6e + a22a40b
commit d1032bc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/lib/nmea0183ton2k/NMEA0183AIStoNMEA2000.h b/lib/nmea0183ton2k/NMEA0183AIStoNMEA2000.h
@@ -160,7 +160,7 @@ class MyAisDecoder : public AIS::AisDecoder
                             _uToPort + _uToStarboard, _uToStarboard, _uToBow, eta_days,
                             (_uEtaHour * 3600) + (_uEtaMinute * 60), _uDraught / 10.0, Dest,
                             (tN2kAISVersion) _ais_version, (tN2kGNSStype) _uFixType,
-                            (tN2kAISDTE) _dte, (tN2kAISTranceiverInfo) _ais_version);
+                            (tN2kAISDTE) _dte, (tN2kAISTransceiverInformation) _ais_version);
 
       send(N2kMsg);
     }

diff --git a/lib/nmea2kto0183/N2kDataToNMEA0183.cpp b/lib/nmea2kto0183/N2kDataToNMEA0183.cpp
@@ -738,7 +738,7 @@ class N2kToNMEA0183Functions : public N2kDataToNMEA0183
         char _Destination[21];
         tN2kAISVersion _AISversion;
         tN2kGNSStype _GNSStype;
-        tN2kAISTranceiverInfo _AISinfo;
+        tN2kAISTransceiverInformation _AISinfo;
         tN2kAISDTE _DTE;
 
         tNMEA0183AISMsg NMEA0183AISMsg;
@@ -848,15 +848,16 @@ class N2kToNMEA0183Functions : public N2kDataToNMEA0183
         tN2kAISUnit _Unit;
         bool _Display, _DSC, _Band, _Msg22, _State;
         tN2kAISMode _Mode;
+        tN2kAISTransceiverInformation  _AISTranceiverInformation;
 
         if (ParseN2kPGN129039(N2kMsg, _MessageID, _Repeat, _UserID, _Latitude, _Longitude, _Accuracy, _RAIM,
-                              _Seconds, _COG, _SOG, _Heading, _Unit, _Display, _DSC, _Band, _Msg22, _Mode, _State))
+                              _Seconds, _COG, _SOG, _AISTranceiverInformation, _Heading, _Unit, _Display, _DSC, _Band, _Msg22, _Mode, _State))
         {
 
             tNMEA0183AISMsg NMEA0183AISMsg;
 
             if (SetAISClassBMessage18(NMEA0183AISMsg, _MessageID, _Repeat, _UserID, _Latitude, _Longitude, _Accuracy, _RAIM,
-                                      _Seconds, _COG, _SOG, _Heading, _Unit, _Display, _DSC, _Band, _Msg22, _Mode, _State))
+                                      _Seconds, _COG, _SOG,  _Heading, _Unit, _Display, _DSC, _Band, _Msg22, _Mode, _State))
             {
 
                 SendMessage(NMEA0183AISMsg);

diff --git a/platformio.ini b/platformio.ini
@@ -23,8 +23,8 @@ framework = arduino
 ;	framework-arduinoespressif32 @ 3.20011.230801
 ;	framework-espidf @ 3.50101.0
 lib_deps = 
-	ttlappalainen/NMEA2000-library @ 4.17.2
-	ttlappalainen/NMEA0183 @ 1.7.1
+        ttlappalainen/NMEA2000-library @ 4.18.9
+	ttlappalainen/NMEA0183 @ 1.9.1
 	ArduinoJson @ 6.18.5
 	ottowinter/[email protected]
 	#fastled/FastLED @ 3.4.0