Regression fix.

This commit is contained in:
Blaz Kristan 2022-03-03 11:14:28 +01:00
parent 4ebfc1516c
commit fb19ca8bf4

View File

@ -98,16 +98,9 @@ class UsermodTemperature : public Usermod {
} }
void readTemperature() { void readTemperature() {
float newTemp = readDallas(); temperature = readDallas();
waitingForConversion = false;
if (temperature > -100.f && abs(newTemp-temperature)>10.) {
lastMeasurement = millis() - readingInterval + 5000; // speed up next reading
errorReading = true;
} else {
lastMeasurement = millis(); lastMeasurement = millis();
errorReading = false; waitingForConversion = false;
temperature = newTemp;
}
//DEBUG_PRINTF("Read temperature %2.1f.\n", temperature); // does not work properly on 8266 //DEBUG_PRINTF("Read temperature %2.1f.\n", temperature); // does not work properly on 8266
DEBUG_PRINT(F("Read temperature ")); DEBUG_PRINT(F("Read temperature "));
DEBUG_PRINTLN(temperature); DEBUG_PRINTLN(temperature);
@ -243,7 +236,7 @@ class UsermodTemperature : public Usermod {
return; return;
} }
temp.add(degC ? temperature : (float)temperature * 1.8f + 32); temp.add(degC ? getTemperatureC() : getTemperatureF());
temp.add(degC ? F("°C") : F("°F")); temp.add(degC ? F("°C") : F("°F"));
JsonObject sensor = root[F("sensor")]; JsonObject sensor = root[F("sensor")];