diff --git a/include/display.h b/include/display.h index 1af6622..303465e 100644 --- a/include/display.h +++ b/include/display.h @@ -79,10 +79,10 @@ namespace Display { colonOn = !colonOn; } - void displayFloat(float value) { + void displayTemp(float value) { tDisplay.disable(); drawColon(false); - clockDisplay.print(value); + clockDisplay.printFloat(value); clockDisplay.writeDisplay(); drawTime(); tDisplay.enableDelayed(1000); diff --git a/include/ir.h b/include/ir.h index 81bbcc9..0a1ce29 100644 --- a/include/ir.h +++ b/include/ir.h @@ -76,7 +76,7 @@ namespace Ir { command("On"); break; case 0x84: - Display::displayFloat(Bmp::bmp.readTemperature()); + Display::displayTemp(Bmp::bmp.readTemperature()); break; default: Display::displayValue(lastCommand); diff --git a/src/esp_clock.cpp b/src/esp_clock.cpp index 2d434cc..a4cd6a1 100644 --- a/src/esp_clock.cpp +++ b/src/esp_clock.cpp @@ -53,8 +53,8 @@ void checkWifiCallback() { if (difftime(now(), Ntp::lastConnectedTime) > STAY_CONNECTED_AFTER_BOOT) { Serial.println("Wifi connection timed out"); Mqtt::client.disconnect(); - Wifi::disconnect(); Ota::tLoop.disable(); tCheckWifi.disable(); + Wifi::disconnect(); } }