pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-07 20:19:25 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Justin E. Mann 2024-12-05 18:32:09 -07:00
parent fde7f5721a
commit 06728f12c5
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,9 +39,7 @@
#include "Sensor/T1000xSensor.h" #include "Sensor/T1000xSensor.h"
#include "Sensor/TSL2591Sensor.h" #include "Sensor/TSL2591Sensor.h"
#include "Sensor/VEML7700Sensor.h" #include "Sensor/VEML7700Sensor.h"
#ifdef CAN_HAVE_RAK12035VB_SENSOR #include "Sensor/RAK12035VBSensor.h"
#include "Sensor/RAK12035VBSensor.h"
#endif
BMP085Sensor bmp085Sensor; BMP085Sensor bmp085Sensor;
BMP280Sensor bmp280Sensor; BMP280Sensor bmp280Sensor;
@ -61,9 +59,7 @@ 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
@ -157,10 +153,8 @@ 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;
@ -417,12 +411,10 @@ 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;
@ -629,14 +621,12 @@ 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