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

#107: correctly handle DBT,DBS,DBK

This commit is contained in:
andreas 2025-04-22 19:35:57 +02:00
parent c55bcc1f94
commit 38d370dcfb
4 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/Conversions.odt
View File

Binary file not shown.

BIN
doc/Conversions.pdf
View File

Binary file not shown.

13
lib/nmea0183ton2k/NMEA0183DataToN2K.cpp
View File

@ -638,8 +638,8 @@ private:
for (int i=0;i< 3;i++){ for (int i=0;i< 3;i++){
if (msg.FieldLen(0)>0){ if (msg.FieldLen(0)>0){
Depth=atof(msg.Field(0)); Depth=atof(msg.Field(0));
char dt=msg.Field(i+1)[0]; char du=msg.Field(i+1)[0];
switch(dt){ switch(du){
case 'f': case 'f':
Depth=Depth/mToFeet; Depth=Depth/mToFeet;
break; break;
@ -662,8 +662,9 @@ private:
//we can only send if we have a valid depth beloww tranducer //we can only send if we have a valid depth beloww tranducer
//to compute the offset //to compute the offset
if (! boatData->DBT->isValid()) return; if (! boatData->DBT->isValid()) return;
double offset=Depth-boatData->DBT->getData(); double dbs=boatData->DBT->getData();
if (offset >= 0 && dt == DBT){ double offset=Depth-dbs;
if (offset >= 0 && dt == DBK){
logger->logDebug(GwLog::DEBUG, "strange DBK - more depth then transducer %s", msg.line); logger->logDebug(GwLog::DEBUG, "strange DBK - more depth then transducer %s", msg.line);
return; return;
} }
@ -675,8 +676,8 @@ private:
if (! boatData->DBS->update(Depth,msg.sourceId)) return; if (! boatData->DBS->update(Depth,msg.sourceId)) return;
} }
tN2kMsg n2kMsg; tN2kMsg n2kMsg;
SetN2kWaterDepth(n2kMsg,1,Depth,offset); SetN2kWaterDepth(n2kMsg,1,dbs,offset); //on the N2K side we always have depth below transducer
send(n2kMsg,msg.sourceId,(n2kMsg.PGN)+String((offset != N2kDoubleNA)?1:0)); send(n2kMsg,msg.sourceId,(n2kMsg.PGN)+String((offset >=0)?1:0));
} }
} }
} }

22
lib/nmea2kto0183/N2kDataToNMEA0183.cpp
View File

@ -267,24 +267,32 @@ private:
double DepthBelowTransducer; double DepthBelowTransducer;
double Offset; double Offset;
double Range; double Range;
double WaterDepth;
if (ParseN2kWaterDepth(N2kMsg, SID, DepthBelowTransducer, Offset, Range)) if (ParseN2kWaterDepth(N2kMsg, SID, DepthBelowTransducer, Offset, Range))
{ {
if (updateDouble(boatData->DBT, DepthBelowTransducer))
WaterDepth = DepthBelowTransducer + Offset; {
updateDouble(boatData->DBS, WaterDepth);
updateDouble(boatData->DBT,DepthBelowTransducer);
tNMEA0183Msg NMEA0183Msg; tNMEA0183Msg NMEA0183Msg;
if (NMEA0183SetDPT(NMEA0183Msg, DepthBelowTransducer, Offset,talkerId)) bool offsetValid=true;
if (N2kIsNA(Offset)) {
Offset=NMEA0183DoubleNA;
offsetValid=false;
}
if (NMEA0183SetDPT(NMEA0183Msg, DepthBelowTransducer, Offset, talkerId))
{ {
SendMessage(NMEA0183Msg); SendMessage(NMEA0183Msg);
} }
if (NMEA0183SetDBx(NMEA0183Msg, DepthBelowTransducer, Offset,talkerId)) if (offsetValid)
{
double WaterDepth = DepthBelowTransducer + Offset;
updateDouble(boatData->DBS, WaterDepth);
}
if (NMEA0183SetDBx(NMEA0183Msg, DepthBelowTransducer, Offset, talkerId))
{ {
SendMessage(NMEA0183Msg); SendMessage(NMEA0183Msg);
} }
} }
} }
}
//***************************************************************************** //*****************************************************************************
void HandlePosition(const tN2kMsg &N2kMsg) void HandlePosition(const tN2kMsg &N2kMsg)