From 5346e3f5a6a3ec500d6c5fa492f7ada4d68f1da3 Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Tue, 7 Dec 2021 20:20:03 +0100
Subject: [PATCH] display text commands

---
 include/display.h | 12 ++++++++----
 include/ir.h      | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/include/display.h b/include/display.h
index acff32e..4cb5caa 100644
--- a/include/display.h
+++ b/include/display.h
@@ -55,9 +55,7 @@ namespace Display {
     clockDisplay.setBrightness(brightness);
   }
 
-  void displayColon() {
-    static bool colonOn = false;
-
+  void displayColon(bool colonOn) {
     if (colonOn) {
       if (currentHour != hour()) {
         currentHour = hour();
@@ -71,6 +69,12 @@ namespace Display {
       }
     }
     clockDisplay.drawColon(colonOn);
+  }
+
+  void displayColon() {
+    static bool colonOn = false;
+
+    displayColon(colonOn);
     clockDisplay.writeDisplay();
 
     colonOn = !colonOn;
@@ -82,7 +86,7 @@ namespace Display {
   }
 
   void displayText(const char c[]) {
-    clockDisplay.print(c);
+    clockDisplay.println(c);
     clockDisplay.writeDisplay();
   }
 
diff --git a/include/ir.h b/include/ir.h
index 7791f28..95acb36 100644
--- a/include/ir.h
+++ b/include/ir.h
@@ -38,13 +38,16 @@ namespace Ir {
     }
 
     void displayValue() {
+        Display::tDisplay.disable();
+        Display::displayColon(false);
         Display::displayValue(lastCommand);
-        Display::tDisplay.setCallback(Display::displayColon);
         Display::adjustTime();
+        Display::tDisplay.enableDelayed(1000);
     }
 
     void displayText(const char c[]) {
         Display::tDisplay.disable();
+        Display::displayColon(false);
         Display::displayText(c);
         Display::adjustTime();
         Display::tDisplay.enableDelayed(1000);
@@ -57,7 +60,7 @@ namespace Ir {
             case 0x9F:
                 avrOn = false;
                 tCheckWifi.enable();
-                displayText("off");
+                displayText("Off");
                 break;
             case 0xC4:
             case 0xD0:
@@ -66,16 +69,17 @@ namespace Ir {
                 Wifi::reconnect();
                 break;
             default:
-                Display::tDisplay.setCallback(displayValue);
-                Display::tDisplay.forceNextIteration();
+                displayValue();
                 break;
             }
         }
         if (!avrOn && Mqtt::commands.getCurrent() == 0xC7) {
+            displayText("Up");
             Display::changeBrightness(true);
             Mqtt::commands.pop();
         }
         if (!avrOn && Mqtt::commands.getCurrent() == 0xC8) {
+            displayText("Down");
             Display::changeBrightness(false);
             Mqtt::commands.pop();
         }