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

correctly handle invalid/empty fields in RMB message

This commit is contained in:
andreas 2024-11-24 19:10:21 +01:00
parent ca60d3fbac
commit d81a56aec7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/nmea0183ton2k/NMEA0183DataToN2K.cpp
View File

@ -320,7 +320,7 @@ private:
return; return;
} }
tN2kMsg n2kMsg; tN2kMsg n2kMsg;
if (boatData->XTE->update(rmb.xte,msg.sourceId)){ if (updateDouble(boatData->XTE,rmb.xte,msg.sourceId)){
tN2kXTEMode mode=N2kxtem_Autonomous; tN2kXTEMode mode=N2kxtem_Autonomous;
if (msg.FieldCount() > 13){ if (msg.FieldCount() > 13){
const char *modeChar=msg.Field(13); const char *modeChar=msg.Field(13);
@ -331,10 +331,10 @@ private:
} }
uint8_t destinationId=getWaypointId(rmb.destID); uint8_t destinationId=getWaypointId(rmb.destID);
uint8_t sourceId=getWaypointId(rmb.originID); uint8_t sourceId=getWaypointId(rmb.originID);
if (boatData->DTW->update(rmb.dtw,msg.sourceId) if (updateDouble(boatData->DTW,rmb.dtw,msg.sourceId)
&& boatData->BTW->update(rmb.btw,msg.sourceId) && updateDouble(boatData->BTW,rmb.btw,msg.sourceId)
&& boatData->WPLat->update(rmb.latitude,msg.sourceId) && updateDouble(boatData->WPLat,rmb.latitude,msg.sourceId)
&& boatData->WPLon->update(rmb.longitude,msg.sourceId) && updateDouble(boatData->WPLon,rmb.longitude,msg.sourceId)
){ ){
SetN2kNavigationInfo(n2kMsg,1,rmb.dtw,N2khr_true, SetN2kNavigationInfo(n2kMsg,1,rmb.dtw,N2khr_true,
false, false,