pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-10 13:13:27 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

putting crappy guards all over the place.. is there something better I can do here?

Browse Source
This commit is contained in:
Justin E. Mann 2024-12-02 17:51:11 -07:00
parent 17265dfdc0
commit de9da5a3eb
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/Telemetry/EnvironmentTelemetry.cpp
View File

@ -59,7 +59,9 @@ MLX90632Sensor mlx90632Sensor;
DFRobotLarkSensor dfRobotLarkSensor; DFRobotLarkSensor dfRobotLarkSensor;
NAU7802Sensor nau7802Sensor; NAU7802Sensor nau7802Sensor;
BMP3XXSensor bmp3xxSensor; BMP3XXSensor bmp3xxSensor;
#ifdef CAN_HAVE_RAK12035VB_SENSOR
RAK12035VBSensor rak12035vbSensor; RAK12035VBSensor rak12035vbSensor;
#endif
#ifdef T1000X_SENSOR_EN #ifdef T1000X_SENSOR_EN
T1000xSensor t1000xSensor; T1000xSensor t1000xSensor;
#endif #endif
@ -153,8 +155,10 @@ int32_t EnvironmentTelemetryModule::runOnce()
result = max17048Sensor.runOnce(); result = max17048Sensor.runOnce();
if (cgRadSens.hasSensor()) if (cgRadSens.hasSensor())
result = cgRadSens.runOnce(); result = cgRadSens.runOnce();
#ifdef CAN_HAVE_RAK12035VB_SENSOR
if (rak12035vbSensor.hasSensor()) if (rak12035vbSensor.hasSensor())
result = rak12035vbSensor.runOnce(); result = rak12035vbSensor.runOnce();
#endif
#endif #endif
} }
return result; return result;
@ -411,10 +415,12 @@ bool EnvironmentTelemetryModule::getEnvironmentTelemetry(meshtastic_Telemetry *m
valid = valid && cgRadSens.getMetrics(m); valid = valid && cgRadSens.getMetrics(m);
hasSensor = true; hasSensor = true;
} }
#ifdef CAN_HAVE_RAK12035VB_SENSOR
if (rak12035vbSensor.hasSensor()){ if (rak12035vbSensor.hasSensor()){
valid = valid && rak12035vbSensor.getMetrics(m); valid = valid && rak12035vbSensor.getMetrics(m);
hasSensor = true; hasSensor = true;
} }
#endif
#endif #endif
return valid && hasSensor; return valid && hasSensor;
@ -621,12 +627,14 @@ AdminMessageHandleResult EnvironmentTelemetryModule::handleAdminMessageForModule
if (result != AdminMessageHandleResult::NOT_HANDLED) if (result != AdminMessageHandleResult::NOT_HANDLED)
return result; return result;
} }
#ifdef CAN_HAVE_RAK12035VB_SENSOR
if (rak12035vbSensor.hasSensor()){ if (rak12035vbSensor.hasSensor()){
result = rak12035vbSensor.handleAdminMessage(mp, request, response); result = rak12035vbSensor.handleAdminMessage(mp, request, response);
if (result != AdminMessageHandleResult::NOT_HANDLED) if (result != AdminMessageHandleResult::NOT_HANDLED)
return result; return result;
} }
return result; return result;
#endif
} }
#endif #endif