To fix the default temperature to be overridden by external sensors (if any)
This commit is contained in:
@@ -174,17 +174,18 @@ int MyMesh::handleRequest(ClientInfo *sender, uint32_t sender_timestamp, uint8_t
|
|||||||
telemetry.reset();
|
telemetry.reset();
|
||||||
telemetry.addVoltage(TELEM_CHANNEL_SELF, (float)board.getBattMilliVolts() / 1000.0f);
|
telemetry.addVoltage(TELEM_CHANNEL_SELF, (float)board.getBattMilliVolts() / 1000.0f);
|
||||||
|
|
||||||
float temperature = board.getMCUTemperature();
|
|
||||||
if(!isnan(temperature)) { // Supported boards with built-in temperature sensor. ESP32-C3 may return NAN
|
|
||||||
telemetry.addTemperature(TELEM_CHANNEL_SELF, temperature); // Built-in MCU Temperature
|
|
||||||
}
|
|
||||||
|
|
||||||
// query other sensors -- target specific
|
// query other sensors -- target specific
|
||||||
if ((sender->permissions & PERM_ACL_ROLE_MASK) == PERM_ACL_GUEST) {
|
if ((sender->permissions & PERM_ACL_ROLE_MASK) == PERM_ACL_GUEST) {
|
||||||
perm_mask = 0x00; // just base telemetry allowed
|
perm_mask = 0x00; // just base telemetry allowed
|
||||||
}
|
}
|
||||||
sensors.querySensors(perm_mask, telemetry);
|
sensors.querySensors(perm_mask, telemetry);
|
||||||
|
|
||||||
|
// This default temperature will be overridden by external sensors (if any)
|
||||||
|
float temperature = board.getMCUTemperature();
|
||||||
|
if(!isnan(temperature)) { // Supported boards with built-in temperature sensor. ESP32-C3 may return NAN
|
||||||
|
telemetry.addTemperature(TELEM_CHANNEL_SELF, temperature); // Built-in MCU Temperature
|
||||||
|
}
|
||||||
|
|
||||||
uint8_t tlen = telemetry.getSize();
|
uint8_t tlen = telemetry.getSize();
|
||||||
memcpy(&reply_data[4], telemetry.getBuffer(), tlen);
|
memcpy(&reply_data[4], telemetry.getBuffer(), tlen);
|
||||||
return 4 + tlen; // reply_len
|
return 4 + tlen; // reply_len
|
||||||
|
|||||||
Reference in New Issue
Block a user