Hopefully fixes git mess

This commit is contained in:
Domingo 2025-05-23 16:16:55 +02:00
parent 69254f3a66
commit 7ec187791d

View File

@ -233,8 +233,6 @@ int32_t EnvironmentTelemetryModule::runOnce()
result = bme280Sensor.runOnce(); result = bme280Sensor.runOnce();
if (ltr390uvSensor.hasSensor()) if (ltr390uvSensor.hasSensor())
result = ltr390uvSensor.runOnce(); result = ltr390uvSensor.runOnce();
if (ltr390uvSensor.hasSensor())
result = ltr390uvSensor.runOnce();
if (bmp3xxSensor.hasSensor()) if (bmp3xxSensor.hasSensor())
result = bmp3xxSensor.runOnce(); result = bmp3xxSensor.runOnce();
if (bme680Sensor.hasSensor()) if (bme680Sensor.hasSensor())
@ -530,10 +528,6 @@ bool EnvironmentTelemetryModule::getEnvironmentTelemetry(meshtastic_Telemetry *m
valid = valid && ltr390uvSensor.getMetrics(m); valid = valid && ltr390uvSensor.getMetrics(m);
hasSensor = true; hasSensor = true;
} }
if (ltr390uvSensor.hasSensor()) {
valid = valid && ltr390uvSensor.getMetrics(m);
hasSensor = true;
}
if (bmp3xxSensor.hasSensor()) { if (bmp3xxSensor.hasSensor()) {
valid = valid && bmp3xxSensor.getMetrics(m); valid = valid && bmp3xxSensor.getMetrics(m);
hasSensor = true; hasSensor = true;
@ -763,11 +757,6 @@ AdminMessageHandleResult EnvironmentTelemetryModule::handleAdminMessageForModule
if (result != AdminMessageHandleResult::NOT_HANDLED) if (result != AdminMessageHandleResult::NOT_HANDLED)
return result; return result;
} }
if (ltr390uvSensor.hasSensor()) {
result = ltr390uvSensor.handleAdminMessage(mp, request, response);
if (result != AdminMessageHandleResult::NOT_HANDLED)
return result;
}
if (bmp3xxSensor.hasSensor()) { if (bmp3xxSensor.hasSensor()) {
result = bmp3xxSensor.handleAdminMessage(mp, request, response); result = bmp3xxSensor.handleAdminMessage(mp, request, response);
if (result != AdminMessageHandleResult::NOT_HANDLED) if (result != AdminMessageHandleResult::NOT_HANDLED)