thooge
/
esp32-nmea2000-obp60
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git
1
0
Fork 0
Code Releases Activity

Merge pull request #55 from free-x/twai 

[WIP] Update NMEA Libraries
This commit is contained in:
Andreas Vogel 2023-10-13 19:39:05 +02:00 committed by GitHub
parent 4bced6e47c a22a40b4c1
commit d1032bc231
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nmea0183ton2k/NMEA0183AIStoNMEA2000.h
View File

@ -160,7 +160,7 @@ class MyAisDecoder : public AIS::AisDecoder
_uToPort + _uToStarboard, _uToStarboard, _uToBow, eta_days, _uToPort + _uToStarboard, _uToStarboard, _uToBow, eta_days,
(_uEtaHour * 3600) + (_uEtaMinute * 60), _uDraught / 10.0, Dest, (_uEtaHour * 3600) + (_uEtaMinute * 60), _uDraught / 10.0, Dest,
(tN2kAISVersion) _ais_version, (tN2kGNSStype) _uFixType, (tN2kAISVersion) _ais_version, (tN2kGNSStype) _uFixType,
(tN2kAISDTE) _dte, (tN2kAISTranceiverInfo) _ais_version); (tN2kAISDTE) _dte, (tN2kAISTransceiverInformation) _ais_version);
send(N2kMsg); send(N2kMsg);
} }

7
lib/nmea2kto0183/N2kDataToNMEA0183.cpp
View File

@ -738,7 +738,7 @@ private:
char _Destination[21]; char _Destination[21];
tN2kAISVersion _AISversion; tN2kAISVersion _AISversion;
tN2kGNSStype _GNSStype; tN2kGNSStype _GNSStype;
tN2kAISTranceiverInfo _AISinfo; tN2kAISTransceiverInformation _AISinfo;
tN2kAISDTE _DTE; tN2kAISDTE _DTE;
tNMEA0183AISMsg NMEA0183AISMsg; tNMEA0183AISMsg NMEA0183AISMsg;
@ -848,15 +848,16 @@ private:
tN2kAISUnit _Unit; tN2kAISUnit _Unit;
bool _Display, _DSC, _Band, _Msg22, _State; bool _Display, _DSC, _Band, _Msg22, _State;
tN2kAISMode _Mode; tN2kAISMode _Mode;
tN2kAISTransceiverInformation _AISTranceiverInformation;
if (ParseN2kPGN129039(N2kMsg, _MessageID, _Repeat, _UserID, _Latitude, _Longitude, _Accuracy, _RAIM, 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; tNMEA0183AISMsg NMEA0183AISMsg;
if (SetAISClassBMessage18(NMEA0183AISMsg, _MessageID, _Repeat, _UserID, _Latitude, _Longitude, _Accuracy, _RAIM, 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); SendMessage(NMEA0183AISMsg);

4
platformio.ini
View File

@ -23,8 +23,8 @@ framework = arduino
; framework-arduinoespressif32 @ 3.20011.230801 ; framework-arduinoespressif32 @ 3.20011.230801
; framework-espidf @ 3.50101.0 ; framework-espidf @ 3.50101.0
lib_deps = lib_deps =
ttlappalainen/NMEA2000-library @ 4.17.2 ttlappalainen/NMEA2000-library @ 4.18.9
ttlappalainen/NMEA0183 @ 1.7.1 ttlappalainen/NMEA0183 @ 1.9.1
ArduinoJson @ 6.18.5 ArduinoJson @ 6.18.5
ottowinter/ESPAsyncWebServer-esphome@2.0.1 ottowinter/ESPAsyncWebServer-esphome@2.0.1
#fastled/FastLED @ 3.4.0 #fastled/FastLED @ 3.4.0