mirror of
https://github.com/meshtastic/firmware.git
synced 2025-09-06 11:39:32 +00:00
not sure where to go from here.. sensor works.. im gonna build a branch form my project since there has not been that much guidance in terms of next steps for this branch.
This commit is contained in:
parent
138414f2b8
commit
544528af93
@ -39,7 +39,9 @@
|
||||
#include "Sensor/T1000xSensor.h"
|
||||
#include "Sensor/TSL2591Sensor.h"
|
||||
#include "Sensor/VEML7700Sensor.h"
|
||||
#ifdef CAN_HAVE_RAK12035
|
||||
#include "Sensor/RAK12035VBSensor.h"
|
||||
#endif
|
||||
|
||||
BMP085Sensor bmp085Sensor;
|
||||
BMP280Sensor bmp280Sensor;
|
||||
@ -59,7 +61,9 @@ MLX90632Sensor mlx90632Sensor;
|
||||
DFRobotLarkSensor dfRobotLarkSensor;
|
||||
NAU7802Sensor nau7802Sensor;
|
||||
BMP3XXSensor bmp3xxSensor;
|
||||
#ifdef CAN_HAVE_RAK12035
|
||||
RAK12035VBSensor rak12035vbSensor;
|
||||
#endif
|
||||
#ifdef T1000X_SENSOR_EN
|
||||
T1000xSensor t1000xSensor;
|
||||
#endif
|
||||
@ -153,8 +157,10 @@ int32_t EnvironmentTelemetryModule::runOnce()
|
||||
result = max17048Sensor.runOnce();
|
||||
if (cgRadSens.hasSensor())
|
||||
result = cgRadSens.runOnce();
|
||||
#ifdef CAN_HAVE_RAK12035
|
||||
if (rak12035vbSensor.hasSensor())
|
||||
result = rak12035vbSensor.runOnce();
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
return result;
|
||||
@ -411,10 +417,12 @@ bool EnvironmentTelemetryModule::getEnvironmentTelemetry(meshtastic_Telemetry *m
|
||||
valid = valid && cgRadSens.getMetrics(m);
|
||||
hasSensor = true;
|
||||
}
|
||||
#ifdef CAN_HAVE_RAK12035
|
||||
if (rak12035vbSensor.hasSensor()){
|
||||
valid = valid && rak12035vbSensor.getMetrics(m);
|
||||
hasSensor = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
return valid && hasSensor;
|
||||
@ -621,11 +629,13 @@ AdminMessageHandleResult EnvironmentTelemetryModule::handleAdminMessageForModule
|
||||
if (result != AdminMessageHandleResult::NOT_HANDLED)
|
||||
return result;
|
||||
}
|
||||
#ifdef CAN_HAVE_RAK12035
|
||||
if (rak12035vbSensor.hasSensor()){
|
||||
result = rak12035vbSensor.handleAdminMessage(mp, request, response);
|
||||
if (result != AdminMessageHandleResult::NOT_HANDLED)
|
||||
return result;
|
||||
}
|
||||
#endif
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -37,6 +37,8 @@
|
||||
extern "C" {
|
||||
#endif // __cplusplus
|
||||
|
||||
#define CAN_HAVE_RAK12035 1
|
||||
|
||||
// Number of pins defined in PinDescription array
|
||||
#define PINS_COUNT (48)
|
||||
#define NUM_DIGITAL_PINS (48)
|
||||
|
Loading…
Reference in New Issue
Block a user