From 32862b9e29cd9032b290df1ed359d9954403b7fd Mon Sep 17 00:00:00 2001 From: wellenvogel Date: Mon, 29 Sep 2025 17:53:14 +0200 Subject: [PATCH] avoid creating unmapped XDR entries for unset N2K values --- lib/nmea0183ton2k/NMEA0183DataToN2K.cpp | 2 +- lib/nmea2kto0183/N2kDataToNMEA0183.cpp | 47 +++++++++++++------------ lib/xdrmappings/GwXDRMappings.cpp | 3 +- lib/xdrmappings/GwXDRMappings.h | 2 +- 4 files changed, 28 insertions(+), 26 deletions(-) diff --git a/lib/nmea0183ton2k/NMEA0183DataToN2K.cpp b/lib/nmea0183ton2k/NMEA0183DataToN2K.cpp index ef17866..6989570 100644 --- a/lib/nmea0183ton2k/NMEA0183DataToN2K.cpp +++ b/lib/nmea0183ton2k/NMEA0183DataToN2K.cpp @@ -143,7 +143,7 @@ private: */ GwXDRFoundMapping getOtherFieldMapping(GwXDRFoundMapping &found, int field){ if (found.empty) return GwXDRFoundMapping(); - return xdrMappings->getMapping(found.definition->category, + return xdrMappings->getMapping(0,found.definition->category, found.definition->selector, field, found.instanceId); diff --git a/lib/nmea2kto0183/N2kDataToNMEA0183.cpp b/lib/nmea2kto0183/N2kDataToNMEA0183.cpp index e2b61fd..0c0e68c 100644 --- a/lib/nmea2kto0183/N2kDataToNMEA0183.cpp +++ b/lib/nmea2kto0183/N2kDataToNMEA0183.cpp @@ -1147,12 +1147,12 @@ private: double Level=N2kDoubleNA; double Capacity=N2kDoubleNA; if (ParseN2kPGN127505(N2kMsg,Instance,FluidType,Level,Capacity)) { - GwXDRFoundMapping mapping=xdrMappings->getMapping(XDRFLUID,FluidType,0,Instance); + GwXDRFoundMapping mapping=xdrMappings->getMapping(Level,XDRFLUID,FluidType,0,Instance); if (updateDouble(&mapping,Level)){ LOG_DEBUG(GwLog::DEBUG+1,"found fluidlevel mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(Level)); } - mapping=xdrMappings->getMapping(XDRFLUID,FluidType,1,Instance); + mapping=xdrMappings->getMapping(Capacity, XDRFLUID,FluidType,1,Instance); if (updateDouble(&mapping,Capacity)){ LOG_DEBUG(GwLog::DEBUG+1,"found fluid capacity mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(Capacity)); @@ -1170,19 +1170,19 @@ private: double BatteryTemperature=N2kDoubleNA; if (ParseN2kPGN127508(N2kMsg,BatteryInstance,BatteryVoltage,BatteryCurrent,BatteryTemperature,SID)) { int i=0; - GwXDRFoundMapping mapping=xdrMappings->getMapping(XDRBAT,0,0,BatteryInstance); + GwXDRFoundMapping mapping=xdrMappings->getMapping(BatteryVoltage, XDRBAT,0,0,BatteryInstance); if (updateDouble(&mapping,BatteryVoltage)){ LOG_DEBUG(GwLog::DEBUG+1,"found BatteryVoltage mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(BatteryVoltage)); i++; } - mapping=xdrMappings->getMapping(XDRBAT,0,1,BatteryInstance); + mapping=xdrMappings->getMapping(BatteryCurrent,XDRBAT,0,1,BatteryInstance); if (updateDouble(&mapping,BatteryCurrent)){ LOG_DEBUG(GwLog::DEBUG+1,"found BatteryCurrent mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(BatteryCurrent)); i++; } - mapping=xdrMappings->getMapping(XDRBAT,0,2,BatteryInstance); + mapping=xdrMappings->getMapping(BatteryTemperature,XDRBAT,0,2,BatteryInstance); if (updateDouble(&mapping,BatteryTemperature)){ LOG_DEBUG(GwLog::DEBUG+1,"found BatteryTemperature mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(BatteryTemperature)); @@ -1214,13 +1214,13 @@ private: SendMessage(NMEA0183Msg); } int i=0; - GwXDRFoundMapping mapping=xdrMappings->getMapping(XDRTEMP,N2kts_OutsideTemperature,0,0); + GwXDRFoundMapping mapping=xdrMappings->getMapping(OutsideAmbientAirTemperature, XDRTEMP,N2kts_OutsideTemperature,0,0); if (updateDouble(&mapping,OutsideAmbientAirTemperature)){ LOG_DEBUG(GwLog::DEBUG+1,"found temperature mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(OutsideAmbientAirTemperature)); i++; } - mapping=xdrMappings->getMapping(XDRPRESSURE,N2kps_Atmospheric,0,0); + mapping=xdrMappings->getMapping(AtmosphericPressure,XDRPRESSURE,N2kps_Atmospheric,0,0); if (updateDouble(&mapping,AtmosphericPressure)){ LOG_DEBUG(GwLog::DEBUG+1,"found pressure mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(AtmosphericPressure)); @@ -1255,19 +1255,19 @@ private: SendMessage(NMEA0183Msg); } - GwXDRFoundMapping mapping=xdrMappings->getMapping(XDRTEMP,TempSource,0,0); + GwXDRFoundMapping mapping=xdrMappings->getMapping(Temperature, XDRTEMP,TempSource,0,0); if (updateDouble(&mapping,Temperature)){ LOG_DEBUG(GwLog::DEBUG+1,"found temperature mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(Temperature)); i++; } - mapping=xdrMappings->getMapping(XDRHUMIDITY,HumiditySource,0,0); + mapping=xdrMappings->getMapping(Humidity, XDRHUMIDITY,HumiditySource,0,0); if (updateDouble(&mapping,Humidity)){ LOG_DEBUG(GwLog::DEBUG+1,"found humidity mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(Humidity)); i++; } - mapping=xdrMappings->getMapping(XDRPRESSURE,N2kps_Atmospheric,0,0); + mapping=xdrMappings->getMapping(AtmosphericPressure, XDRPRESSURE,N2kps_Atmospheric,0,0); if (updateDouble(&mapping,AtmosphericPressure)){ LOG_DEBUG(GwLog::DEBUG+1,"found pressure mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(AtmosphericPressure)); @@ -1302,12 +1302,12 @@ private: SendMessage(NMEA0183Msg); } - GwXDRFoundMapping mapping=xdrMappings->getMapping(XDRTEMP,(int)TemperatureSource,0,TemperatureInstance); + GwXDRFoundMapping mapping=xdrMappings->getMapping(Temperature, XDRTEMP,(int)TemperatureSource,0,TemperatureInstance); if (updateDouble(&mapping,Temperature)){ LOG_DEBUG(GwLog::DEBUG+1,"found temperature mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(Temperature)); } - mapping=xdrMappings->getMapping(XDRTEMP,(int)TemperatureSource,1,TemperatureInstance); + mapping=xdrMappings->getMapping(setTemperature, XDRTEMP,(int)TemperatureSource,1,TemperatureInstance); if (updateDouble(&mapping,setTemperature)){ LOG_DEBUG(GwLog::DEBUG+1,"found temperature mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(setTemperature)); @@ -1325,12 +1325,13 @@ private: LOG_DEBUG(GwLog::DEBUG,"unable to parse PGN %d",msg.PGN); return; } - GwXDRFoundMapping mapping=xdrMappings->getMapping(XDRHUMIDITY,(int)HumiditySource,0,HumidityInstance); + GwXDRFoundMapping mapping; + mapping=xdrMappings->getMapping(ActualHumidity, XDRHUMIDITY,(int)HumiditySource,0,HumidityInstance); if (updateDouble(&mapping,ActualHumidity)){ LOG_DEBUG(GwLog::DEBUG+1,"found humidity mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(ActualHumidity)); } - mapping=xdrMappings->getMapping(XDRHUMIDITY,(int)HumiditySource,1,HumidityInstance); + mapping=xdrMappings->getMapping(SetHumidity, XDRHUMIDITY,(int)HumiditySource,1,HumidityInstance); if (updateDouble(&mapping,SetHumidity)){ LOG_DEBUG(GwLog::DEBUG+1,"found humidity mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(SetHumidity)); @@ -1348,7 +1349,7 @@ private: LOG_DEBUG(GwLog::DEBUG,"unable to parse PGN %d",msg.PGN); return; } - GwXDRFoundMapping mapping=xdrMappings->getMapping(XDRPRESSURE,(int)PressureSource,0,PressureInstance); + GwXDRFoundMapping mapping=xdrMappings->getMapping(ActualPressure, XDRPRESSURE,(int)PressureSource,0,PressureInstance); if (! updateDouble(&mapping,ActualPressure)) return; LOG_DEBUG(GwLog::DEBUG+1,"found pressure mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(ActualPressure)); @@ -1366,12 +1367,12 @@ private: LOG_DEBUG(GwLog::DEBUG,"unable to parse PGN %d",msg.PGN); } for (int i=0;i<8;i++){ - GwXDRFoundMapping mapping=xdrMappings->getMapping(XDRENGINE,0,i,instance); + GwXDRFoundMapping mapping=xdrMappings->getMapping(values[i], XDRENGINE,0,i,instance); if (! updateDouble(&mapping,values[i])) continue; addToXdr(mapping.buildXdrEntry(values[i])); } for (int i=0;i< 2;i++){ - GwXDRFoundMapping mapping=xdrMappings->getMapping(XDRENGINE,0,i+8,instance); + GwXDRFoundMapping mapping=xdrMappings->getMapping(ivalues[i],XDRENGINE,0,i+8,instance); if (! updateDouble(&mapping,ivalues[i])) continue; addToXdr(mapping.buildXdrEntry((double)ivalues[i])); } @@ -1387,7 +1388,7 @@ private: LOG_DEBUG(GwLog::DEBUG,"unable to parse PGN %d",msg.PGN); } for (int i=0;i<3;i++){ - GwXDRFoundMapping mapping=xdrMappings->getMapping(XDRATTITUDE,0,i,instance); + GwXDRFoundMapping mapping=xdrMappings->getMapping(values[i], XDRATTITUDE,0,i,instance); if (! updateDouble(&mapping,values[i])) continue; addToXdr(mapping.buildXdrEntry(values[i])); } @@ -1401,15 +1402,15 @@ private: speed,pressure,tilt)){ LOG_DEBUG(GwLog::DEBUG,"unable to parse PGN %d",msg.PGN); } - GwXDRFoundMapping mapping=xdrMappings->getMapping(XDRENGINE,0,10,instance); + GwXDRFoundMapping mapping=xdrMappings->getMapping(speed, XDRENGINE,0,10,instance); if (updateDouble(&mapping,speed)){ addToXdr(mapping.buildXdrEntry(speed)); } - mapping=xdrMappings->getMapping(XDRENGINE,0,11,instance); + mapping=xdrMappings->getMapping(pressure, XDRENGINE,0,11,instance); if (updateDouble(&mapping,pressure)){ addToXdr(mapping.buildXdrEntry(pressure)); } - mapping=xdrMappings->getMapping(XDRENGINE,0,12,instance); + mapping=xdrMappings->getMapping(tilt, XDRENGINE,0,12,instance); if (updateDouble(&mapping,tilt)){ addToXdr(mapping.buildXdrEntry((double)tilt)); } @@ -1435,12 +1436,12 @@ private: LOG_DEBUG(GwLog::DEBUG,"unable to parse PGN %d",msg.PGN); return; } - GwXDRFoundMapping mapping=xdrMappings->getMapping(XDRTEMP,(int)TemperatureSource,0,TemperatureInstance); + GwXDRFoundMapping mapping=xdrMappings->getMapping(Temperature, XDRTEMP,(int)TemperatureSource,0,TemperatureInstance); if (updateDouble(&mapping,Temperature)){ LOG_DEBUG(GwLog::DEBUG+1,"found temperature mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(Temperature)); } - mapping=xdrMappings->getMapping(XDRTEMP,(int)TemperatureSource,1,TemperatureInstance); + mapping=xdrMappings->getMapping(setTemperature, XDRTEMP,(int)TemperatureSource,1,TemperatureInstance); if (updateDouble(&mapping,setTemperature)){ LOG_DEBUG(GwLog::DEBUG+1,"found temperature mapping %s",mapping.definition->toString().c_str()); addToXdr(mapping.buildXdrEntry(setTemperature)); diff --git a/lib/xdrmappings/GwXDRMappings.cpp b/lib/xdrmappings/GwXDRMappings.cpp index 28f88c2..211d394 100644 --- a/lib/xdrmappings/GwXDRMappings.cpp +++ b/lib/xdrmappings/GwXDRMappings.cpp @@ -431,7 +431,8 @@ GwXDRFoundMapping GwXDRMappings::getMapping(String xName,String xType,String xUn } return selectMapping(&(it->second),instance,n183Key.c_str()); } -GwXDRFoundMapping GwXDRMappings::getMapping(GwXDRCategory category,int selector,int field,int instance){ +GwXDRFoundMapping GwXDRMappings::getMapping(double value,GwXDRCategory category,int selector,int field,int instance){ + if (value == N2kDoubleNA) return GwXDRFoundMapping(); //do not add to unknown mappings unsigned long n2kKey=GwXDRMappingDef::n2kKey(category,selector,field); auto it=n2kMap.find(n2kKey); if (it == n2kMap.end()){ diff --git a/lib/xdrmappings/GwXDRMappings.h b/lib/xdrmappings/GwXDRMappings.h index 198a729..21eb9c3 100644 --- a/lib/xdrmappings/GwXDRMappings.h +++ b/lib/xdrmappings/GwXDRMappings.h @@ -244,7 +244,7 @@ class GwXDRMappings{ //get the mappings //the returned mapping will exactly contain one mapping def GwXDRFoundMapping getMapping(String xName,String xType,String xUnit); - GwXDRFoundMapping getMapping(GwXDRCategory category,int selector,int field=0,int instance=-1); + GwXDRFoundMapping getMapping(double value,GwXDRCategory category,int selector,int field=0,int instance=-1); String getXdrEntry(String mapping, double value,int instance=0); const char * getUnMapped(); const GwXDRType * findType(const String &typeString, const String &unitString) const;