From 55207473a7a2b4584a26b44343effea6e7272337 Mon Sep 17 00:00:00 2001 From: free-x Date: Wed, 30 Aug 2023 11:08:49 +0200 Subject: [PATCH] bump nmea2000 library --- lib/nmea0183ton2k/NMEA0183AIStoNMEA2000.h | 2 +- lib/nmea2kto0183/N2kDataToNMEA0183.cpp | 7 ++++--- platformio.ini | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/nmea0183ton2k/NMEA0183AIStoNMEA2000.h b/lib/nmea0183ton2k/NMEA0183AIStoNMEA2000.h index bd22fd6..169f181 100644 --- 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 index 1e61d8e..1f490df 100644 --- a/lib/nmea2kto0183/N2kDataToNMEA0183.cpp +++ b/lib/nmea2kto0183/N2kDataToNMEA0183.cpp @@ -738,7 +738,7 @@ private: char _Destination[21]; tN2kAISVersion _AISversion; tN2kGNSStype _GNSStype; - tN2kAISTranceiverInfo _AISinfo; + tN2kAISTransceiverInformation _AISinfo; tN2kAISDTE _DTE; tNMEA0183AISMsg NMEA0183AISMsg; @@ -848,15 +848,16 @@ private: 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 index c9d3290..646b569 100644 --- a/platformio.ini +++ b/platformio.ini @@ -23,7 +23,7 @@ framework = arduino ; framework-arduinoespressif32 @ 3.20011.230801 ; framework-espidf @ 3.50101.0 lib_deps = - ttlappalainen/NMEA2000-library @ 4.17.2 + ttlappalainen/NMEA2000-library @ 4.18.7 ttlappalainen/NMEA0183 @ 1.7.1 ArduinoJson @ 6.18.5 ottowinter/ESPAsyncWebServer-esphome@2.0.1