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

unify sensor parameter names

This commit is contained in:
andreas 2023-10-31 15:35:52 +01:00
parent 9d3390b086
commit a4f5153440
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/iictask/GwIicTask.cpp
View File

@ -119,7 +119,7 @@ void initIicTask(GwApi *api){
api->addCapability("SHT3X","true"); api->addCapability("SHT3X","true");
LOG_DEBUG(GwLog::LOG,"SHT3X configured"); LOG_DEBUG(GwLog::LOG,"SHT3X configured");
SHT3XConfig sht3xConfig(api->getConfig()); SHT3XConfig sht3xConfig(api->getConfig());
if (sht3xConfig.huAct && ! sht3xConfig.humidTransducer.isEmpty()){ if (sht3xConfig.huAct && ! sht3xConfig.huNam.isEmpty()){
LOG_DEBUG(GwLog::DEBUG,"SHT3X humidity measure active, adding capability and xdr mappings"); LOG_DEBUG(GwLog::DEBUG,"SHT3X humidity measure active, adding capability and xdr mappings");
//add XDR mapping for humidity //add XDR mapping for humidity
GwXDRMappingDef xdr; GwXDRMappingDef xdr;
@ -129,10 +129,10 @@ void initIicTask(GwApi *api){
xdr.selector=(int)sht3xConfig.huSrc; xdr.selector=(int)sht3xConfig.huSrc;
xdr.instanceMode=GwXDRMappingDef::IS_SINGLE; xdr.instanceMode=GwXDRMappingDef::IS_SINGLE;
xdr.instanceId=sht3xConfig.iid; xdr.instanceId=sht3xConfig.iid;
xdr.xdrName=sht3xConfig.humidTransducer; xdr.xdrName=sht3xConfig.huNam;
api->addXdrMapping(xdr); api->addXdrMapping(xdr);
} }
if (sht3xConfig.tmAct && ! sht3xConfig.tName.isEmpty()){ if (sht3xConfig.tmAct && ! sht3xConfig.tmNam.isEmpty()){
LOG_DEBUG(GwLog::DEBUG,"SHT3X temperature measure active, adding capability and xdr mappings"); LOG_DEBUG(GwLog::DEBUG,"SHT3X temperature measure active, adding capability and xdr mappings");
//add XDR mapping for humidity //add XDR mapping for humidity
GwXDRMappingDef xdr; GwXDRMappingDef xdr;
@ -142,7 +142,7 @@ void initIicTask(GwApi *api){
xdr.selector=(int)sht3xConfig.tmSrc; xdr.selector=(int)sht3xConfig.tmSrc;
xdr.instanceMode=GwXDRMappingDef::IS_SINGLE; xdr.instanceMode=GwXDRMappingDef::IS_SINGLE;
xdr.instanceId=sht3xConfig.iid; xdr.instanceId=sht3xConfig.iid;
xdr.xdrName=sht3xConfig.tName; xdr.xdrName=sht3xConfig.tmNam;
api->addXdrMapping(xdr); api->addXdrMapping(xdr);
} }
if (sht3xConfig.tmAct || sht3xConfig.huAct) addTask=true; if (sht3xConfig.tmAct || sht3xConfig.huAct) addTask=true;
@ -159,7 +159,7 @@ void initIicTask(GwApi *api){
xdr.selector=(int)qmp6988Config.source; xdr.selector=(int)qmp6988Config.source;
xdr.instanceId=qmp6988Config.iid; xdr.instanceId=qmp6988Config.iid;
xdr.instanceMode=GwXDRMappingDef::IS_SINGLE; xdr.instanceMode=GwXDRMappingDef::IS_SINGLE;
xdr.xdrName=qmp6988Config.prName; xdr.xdrName=qmp6988Config.prNam;
api->addXdrMapping(xdr); api->addXdrMapping(xdr);
} }
else{ else{