From 07c2e67a8f56f5e788cd6ccfec1db882877f8eec Mon Sep 17 00:00:00 2001
From: Nicolae Hodos <nicu@hodos.ro>
Date: Wed, 8 Dec 2021 18:08:40 +0100
Subject: [PATCH] refactor display methods

---
 include/display.h | 22 +++++++++++-----------
 src/esp_clock.cpp |  1 +
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/include/display.h b/include/display.h
index 150b47e..82fc040 100644
--- a/include/display.h
+++ b/include/display.h
@@ -22,7 +22,7 @@ namespace Display {
   // Create display object
   Adafruit_7segment clockDisplay = Adafruit_7segment();
 
-  void adjustTime() {
+  void drawTime() {
     int displayHour = hour();
     int displayMinute = minute();
     int displayValue = displayHour * 100 + displayMinute;
@@ -55,7 +55,7 @@ namespace Display {
     clockDisplay.setBrightness(brightness);
   }
 
-  void displayColon(bool colonOn) {
+  void drawColon(bool colonOn) {
     if (colonOn) {
       if (currentHour != hour()) {
         currentHour = hour();
@@ -65,7 +65,7 @@ namespace Display {
       }
       if (currentMin != minute()) {
         currentMin = minute();
-        adjustTime();
+        drawTime();
       }
     }
     clockDisplay.drawColon(colonOn);
@@ -74,7 +74,7 @@ namespace Display {
   void displayColon() {
     static bool colonOn = false;
 
-    displayColon(colonOn);
+    drawColon(colonOn);
     clockDisplay.writeDisplay();
 
     colonOn = !colonOn;
@@ -82,35 +82,35 @@ namespace Display {
 
   void displayFloat(float value) {
     tDisplay.disable();
-    displayColon(false);
+    drawColon(false);
     clockDisplay.print(value);
     clockDisplay.writeDisplay();
-    adjustTime();
+    drawTime();
     tDisplay.enableDelayed(1000);
   }
 
   void displayValue(uint8_t value) {
     tDisplay.disable();
-    displayColon(false);
+    drawColon(false);
     clockDisplay.print(value, HEX);
     clockDisplay.writeDisplay();
-    adjustTime();
+    drawTime();
     tDisplay.enableDelayed(1000);
   }
 
   void displayText(const char c[]) {
     tDisplay.disable();
-    displayColon(false);
+    drawColon(false);
     clockDisplay.println(c);
     clockDisplay.writeDisplay();
-    adjustTime();
+    drawTime();
     tDisplay.enableDelayed(1000);
   }
 
   void setup() {
     clockDisplay.begin(DISPLAY_ADDRESS);
     clockDisplay.setBrightness(brightness);
-    adjustTime();
+    drawTime();
     displayColon();
   }
 }
diff --git a/src/esp_clock.cpp b/src/esp_clock.cpp
index da74a3e..7f6d9cf 100644
--- a/src/esp_clock.cpp
+++ b/src/esp_clock.cpp
@@ -55,6 +55,7 @@ void onWifiConnected() {
 
 void checkWifiCallback() {
   if (difftime(now(), Ntp::lastConnectedTime) > STAY_CONNECTED_AFTER_BOOT) {
+    Mqtt::client.disconnect();
     Wifi::disconnect();
     Ota::tLoop.disable();
     tCheckWifi.disable();