From b7b8fc603d401d07fa9409bfdc228e7f4ba2726a Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Fri, 7 Feb 2025 08:21:05 +0100
Subject: [PATCH 1/9] add timer and expose: - duration - start/stop switch On
 start, it will display the remaining time instead of the watch

---
 include/devices.h | 20 ++++++++++++++++++++
 include/display.h | 33 +++++++++++++++++++++++++++++----
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/include/devices.h b/include/devices.h
index 4f174d6..b6f8e0b 100644
--- a/include/devices.h
+++ b/include/devices.h
@@ -46,6 +46,24 @@ namespace Devices {
                 strcmp("ON", msg) == 0 ? Display::changeHourFormat24(true) : Display::changeHourFormat24(false);
             }
         }).restoreStateFromCommand().build();
+    Number* displayTimerMqtt = Builder<Number>::instance(new Number{ "Display imer", "display_timer",
+            [](const char* msg) {
+                auto value = String{ msg }.toInt();
+                Display::Timer::timer = value;
+                displayTimerMqtt->updateState(value);
+            }
+        }).withMin(0).withMax(90).withStep(5).restoreStateFromCommand().build();
+    Switch* timerMqtt = Builder<Switch>::instance(new Switch{"Timer", "timer",
+            [](const char* msg) {
+                if (strcmp("ON", msg) == 0) {
+                    Display::Timer::start();
+                    timerMqtt->updateState(true);
+                 } else {
+                    Display::Timer::stop();
+                    timerMqtt->updateState(false);
+                 }
+            }
+        }).restoreStateFromCommand().build();
 
     auto button = 
         Builder<Button>::instance(new Button{"Restart", "restart",
@@ -82,8 +100,10 @@ namespace Devices {
             }).build()
         )
         .addSecondary(ledMqtt)
+        .addSecondary(timerMqtt)
         .addConfiguration(brightnessMqtt)
         .addConfiguration(hourFormatMqtt)
+        .addConfiguration(displayTimerMqtt)
         .addPreconfigured(HaESP::heapStats)
         .addPreconfigured(HaESP::restartInfo)
         .build();
diff --git a/include/display.h b/include/display.h
index d3a8d90..ad3d487 100644
--- a/include/display.h
+++ b/include/display.h
@@ -13,7 +13,9 @@
 #define BRIGHTNESS_STEP 1
 #define BRIGHTNESS_NIGHT BRIGHTNESS_MIN
 #define BRIGHTNESS_DAY 11
-#define SECONDS(value) value*1000
+#define MILLISECONDS(value) value*TASK_MILLISECOND
+#define SECONDS(value) value*TASK_SECOND
+#define MINUTES(value) value*TASK_MINUTE
 #define DISPLAY_SENSOR_ITERATIONS 2
 #define DISPLAY_DELAY (SECONDS(2))
 
@@ -25,7 +27,7 @@ namespace Display {
     void displayHumidity();
     void drawTime();
     void drawColon(bool);
-    Task tDisplayTime(500, TASK_FOREVER, displayTime, &ts, false,
+    Task tDisplayTime(MILLISECONDS(500), TASK_FOREVER, displayTime, &ts, false,
         []() {
             drawTime();
             return true;
@@ -33,7 +35,7 @@ namespace Display {
         []() {
             drawColon(false);
         });
-    Task tDisplaySensor(5 * TASK_SECOND, DISPLAY_SENSOR_ITERATIONS, displayTemp, &ts, false,
+    Task tDisplaySensor(SECONDS(5), DISPLAY_SENSOR_ITERATIONS, displayTemp, &ts, false,
         []() {
             tDisplayTime.disable();
             return true;
@@ -49,7 +51,7 @@ namespace Display {
             return true;
         },
         []() {
-            tDisplayTime.enableDelayed(5 * TASK_SECOND);
+            tDisplayTime.enableDelayed(SECONDS(5));
         });
 
     bool hourFormat24 = false;
@@ -73,6 +75,29 @@ namespace Display {
         }
     }
 
+    namespace Timer {
+        int8 timer = 0, currentTimer = 0;
+
+        void start() {
+            currentTimer = timer;
+            auto displayTimer = []{
+                if (currentTimer >= 0) {
+                    clockDisplay.print(currentTimer--, DEC);
+                    clockDisplay.writeDisplay();
+                }
+            };
+            tDisplayTime.setInterval(MINUTES(1));
+            tDisplayTime.setCallback(displayTimer);
+            tDisplayTime.restart();
+        }
+
+        void stop() {
+            tDisplayTime.setInterval(MILLISECONDS(500));
+            tDisplayTime.setCallback(displayTime);
+            tDisplayTime.restart();
+        }
+    }
+
     void drawTime() {
         int displayHour = hourFormat24 ? hour() : hourFormat12();
         int displayMinute = minute();

From 06cdca90363ecb1f03e036522b3934e47c56b2ba Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Fri, 7 Feb 2025 21:40:39 +0100
Subject: [PATCH 2/9] fix issue with overlapping display of sensor and date by
 allowing them to be displayed only when time is being displayed

---
 include/display.h | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/include/display.h b/include/display.h
index ad3d487..a23dd3b 100644
--- a/include/display.h
+++ b/include/display.h
@@ -16,7 +16,7 @@
 #define MILLISECONDS(value) value*TASK_MILLISECOND
 #define SECONDS(value) value*TASK_SECOND
 #define MINUTES(value) value*TASK_MINUTE
-#define DISPLAY_SENSOR_ITERATIONS 2
+#define DISPLAY_SENSOR_ITERATIONS 2+1
 #define DISPLAY_DELAY (SECONDS(2))
 
 namespace Display {
@@ -35,23 +35,25 @@ namespace Display {
         []() {
             drawColon(false);
         });
-    Task tDisplaySensor(SECONDS(5), DISPLAY_SENSOR_ITERATIONS, displayTemp, &ts, false,
+    Task tDisplaySensor(SECONDS(5), DISPLAY_SENSOR_ITERATIONS, nullptr, &ts, false,
         []() {
+            if (!tDisplayTime.isEnabled()) return false;
             tDisplayTime.disable();
+            tDisplaySensor.setCallback(displayTemp);
             return true;
         },
         []() {
-            tDisplaySensor.setIterations(DISPLAY_SENSOR_ITERATIONS * 2);
-            tDisplayTime.enableDelayed(tDisplaySensor.getInterval());
+            tDisplaySensor.setIterations((DISPLAY_SENSOR_ITERATIONS - 1) * 2 + 1);
+            tDisplayTime.enable();
         });
-    Task tDisplayDate(TASK_IMMEDIATE, TASK_ONCE, displayDate, &ts, false,
+    Task tDisplayDate(SECONDS(5), TASK_ONCE + 1, displayDate, &ts, false,
         []() {
+            if (!tDisplayTime.isEnabled()) return false;
             tDisplayTime.disable();
-            tDisplaySensor.disable();
             return true;
         },
         []() {
-            tDisplayTime.enableDelayed(SECONDS(5));
+            tDisplayTime.enable();
         });
 
     bool hourFormat24 = false;
@@ -204,5 +206,6 @@ namespace Display {
     void setup() {
         clockDisplay.begin(DISPLAY_ADDRESS);
         clockDisplay.setBrightness(Brightness::current);
+        tDisplayTime.enable();
     }
 }

From 70f92f4d7ef99a87c6b7d6a8ea71b3859a394ce5 Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Fri, 7 Feb 2025 12:13:24 +0100
Subject: [PATCH 3/9] display timer for 10 secs when started and then
 continuously when 16 mins are left

---
 include/display.h | 44 ++++++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/include/display.h b/include/display.h
index a23dd3b..1eb4674 100644
--- a/include/display.h
+++ b/include/display.h
@@ -78,25 +78,41 @@ namespace Display {
     }
 
     namespace Timer {
-        int8 timer = 0, currentTimer = 0;
-
-        void start() {
-            currentTimer = timer;
-            auto displayTimer = []{
-                if (currentTimer >= 0) {
-                    clockDisplay.print(currentTimer--, DEC);
+        int8 timer = 0, current = 0;
+        Task tDisplayTimer(SECONDS(10), 2, 
+            []{
+                if (current >= 0) {
+                    clockDisplay.print(current, DEC);
                     clockDisplay.writeDisplay();
                 }
-            };
-            tDisplayTime.setInterval(MINUTES(1));
-            tDisplayTime.setCallback(displayTimer);
-            tDisplayTime.restart();
+            }, &ts, false,
+            []{
+                tDisplayTime.disable();
+                return true;
+            },
+            []{
+                tDisplayTime.enable();
+            });
+        Task tTimer(MINUTES(1), TASK_FOREVER, 
+            []{
+                current--;
+                if (current == timer) tDisplayTimer.restart();
+                if (current == 16) {
+                    tDisplayTimer.setIterations(TASK_FOREVER);
+                    tDisplayTimer.restart();
+                }
+            }, &ts, false, nullptr,
+            []{
+                tDisplayTimer.disable();
+            });
+
+        void start() {
+            current = timer+1;
+            tTimer.restart();
         }
 
         void stop() {
-            tDisplayTime.setInterval(MILLISECONDS(500));
-            tDisplayTime.setCallback(displayTime);
-            tDisplayTime.restart();
+            tTimer.disable();
         }
     }
 

From e6ef1bb8b93aa2721b1337b92d08b75e0ad0719e Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Fri, 7 Feb 2025 13:02:55 +0100
Subject: [PATCH 4/9] change exposed name of the timer duration

---
 include/devices.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/devices.h b/include/devices.h
index b6f8e0b..3b4d5da 100644
--- a/include/devices.h
+++ b/include/devices.h
@@ -46,7 +46,7 @@ namespace Devices {
                 strcmp("ON", msg) == 0 ? Display::changeHourFormat24(true) : Display::changeHourFormat24(false);
             }
         }).restoreStateFromCommand().build();
-    Number* displayTimerMqtt = Builder<Number>::instance(new Number{ "Display imer", "display_timer",
+    Number* displayTimerMqtt = Builder<Number>::instance(new Number{ "Timer duration", "timer_duration",
             [](const char* msg) {
                 auto value = String{ msg }.toInt();
                 Display::Timer::timer = value;

From 67355c7122a0ca74cfd812b9c7116db3783b6e2b Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Fri, 7 Feb 2025 13:23:13 +0100
Subject: [PATCH 5/9] expose sensor with remaining timer

---
 include/devices.h | 6 ++++++
 include/display.h | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/include/devices.h b/include/devices.h
index 3b4d5da..2bb18e4 100644
--- a/include/devices.h
+++ b/include/devices.h
@@ -53,6 +53,8 @@ namespace Devices {
                 displayTimerMqtt->updateState(value);
             }
         }).withMin(0).withMax(90).withStep(5).restoreStateFromCommand().build();
+    Sensor* timerRemainingMqtt = Builder<Sensor>::instance(new Sensor("Timer remaining", "timer_remaining"))
+        .withUnitMeasure("min").withPrecision(0).build();
     Switch* timerMqtt = Builder<Switch>::instance(new Switch{"Timer", "timer",
             [](const char* msg) {
                 if (strcmp("ON", msg) == 0) {
@@ -101,6 +103,7 @@ namespace Devices {
         )
         .addSecondary(ledMqtt)
         .addSecondary(timerMqtt)
+        .addSecondary(timerRemainingMqtt)
         .addConfiguration(brightnessMqtt)
         .addConfiguration(hourFormatMqtt)
         .addConfiguration(displayTimerMqtt)
@@ -125,5 +128,8 @@ namespace Devices {
         Display::Brightness::brightnessChangedCallback = []{
             brightnessMqtt->updateState(Display::Brightness::current);
         };
+        Display::Timer::timerCallback = []{
+            timerRemainingMqtt->updateState(to_string(Display::Timer::current).c_str());
+        };
     }
 }
\ No newline at end of file
diff --git a/include/display.h b/include/display.h
index 1eb4674..81579fa 100644
--- a/include/display.h
+++ b/include/display.h
@@ -79,6 +79,8 @@ namespace Display {
 
     namespace Timer {
         int8 timer = 0, current = 0;
+        void (*timerCallback)();
+
         Task tDisplayTimer(SECONDS(10), 2, 
             []{
                 if (current >= 0) {
@@ -101,6 +103,7 @@ namespace Display {
                     tDisplayTimer.setIterations(TASK_FOREVER);
                     tDisplayTimer.restart();
                 }
+                if (timerCallback) timerCallback();
             }, &ts, false, nullptr,
             []{
                 tDisplayTimer.disable();

From d123fe06ea0cb3ea55dd4ab7bb22994a723a9073 Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Fri, 7 Feb 2025 13:23:55 +0100
Subject: [PATCH 6/9] expose button to control displaying of remaining timer

---
 include/devices.h | 9 +++++++++
 include/display.h | 1 +
 2 files changed, 10 insertions(+)

diff --git a/include/devices.h b/include/devices.h
index 2bb18e4..3e6ccf6 100644
--- a/include/devices.h
+++ b/include/devices.h
@@ -94,6 +94,15 @@ namespace Devices {
                 }
             }).build()
         )
+        .addSecondary(
+            Builder<Button>::instance(new Button{"Display remaining timer", "display_remaining_timer",
+                [](const char* msg) {
+                    if (strcmp("PRESS", msg) == 0 && !Display::Timer::tDisplayTimer.isEnabled()) {
+                        Display::Timer::tDisplayTimer.restart();
+                    }
+                }
+            }).build()
+        )
         .addSecondary(
             Builder<Button>::instance(new Button{"Update time", "update_time",
                 [](const char* msg) {
diff --git a/include/display.h b/include/display.h
index 81579fa..93b9d20 100644
--- a/include/display.h
+++ b/include/display.h
@@ -89,6 +89,7 @@ namespace Display {
                 }
             }, &ts, false,
             []{
+                if (!tDisplayTime.isEnabled()) return false;
                 tDisplayTime.disable();
                 return true;
             },

From 06fd7ad3cdd1d9175fe674940bb20052f9b3335b Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Fri, 7 Feb 2025 20:59:50 +0100
Subject: [PATCH 7/9] pass parameter with current timer to timerCallback

---
 include/devices.h | 4 ++--
 include/display.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/devices.h b/include/devices.h
index 3e6ccf6..8284b0a 100644
--- a/include/devices.h
+++ b/include/devices.h
@@ -137,8 +137,8 @@ namespace Devices {
         Display::Brightness::brightnessChangedCallback = []{
             brightnessMqtt->updateState(Display::Brightness::current);
         };
-        Display::Timer::timerCallback = []{
-            timerRemainingMqtt->updateState(to_string(Display::Timer::current).c_str());
+        Display::Timer::timerCallback = [](int8 current){
+            timerRemainingMqtt->updateState(to_string(current).c_str());
         };
     }
 }
\ No newline at end of file
diff --git a/include/display.h b/include/display.h
index 93b9d20..050b335 100644
--- a/include/display.h
+++ b/include/display.h
@@ -79,7 +79,7 @@ namespace Display {
 
     namespace Timer {
         int8 timer = 0, current = 0;
-        void (*timerCallback)();
+        void (*timerCallback)(int8);
 
         Task tDisplayTimer(SECONDS(10), 2, 
             []{
@@ -104,7 +104,7 @@ namespace Display {
                     tDisplayTimer.setIterations(TASK_FOREVER);
                     tDisplayTimer.restart();
                 }
-                if (timerCallback) timerCallback();
+                if (timerCallback) timerCallback(current);
             }, &ts, false, nullptr,
             []{
                 tDisplayTimer.disable();

From e2607ffe6de21d6d89df7b3a2a6914bad808a05e Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Sat, 8 Feb 2025 09:02:32 +0100
Subject: [PATCH 8/9] edge case for when threshold is smaller than timer

---
 include/display.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/display.h b/include/display.h
index 050b335..03fb64f 100644
--- a/include/display.h
+++ b/include/display.h
@@ -81,7 +81,7 @@ namespace Display {
         int8 timer = 0, current = 0;
         void (*timerCallback)(int8);
 
-        Task tDisplayTimer(SECONDS(10), 2, 
+        Task tDisplayTimer(SECONDS(10), TASK_ONCE + 1, 
             []{
                 if (current >= 0) {
                     clockDisplay.print(current, DEC);
@@ -94,13 +94,17 @@ namespace Display {
                 return true;
             },
             []{
+                tDisplayTimer.setIterations(TASK_ONCE + 1);
                 tDisplayTime.enable();
             });
         Task tTimer(MINUTES(1), TASK_FOREVER, 
             []{
+                static constexpr uint8 threshold = 16;
                 current--;
-                if (current == timer) tDisplayTimer.restart();
-                if (current == 16) {
+                if (current == timer) {
+                    if (timer <= threshold) tDisplayTimer.setIterations(TASK_FOREVER);
+                    tDisplayTimer.restart();
+                } else if (current == threshold) {
                     tDisplayTimer.setIterations(TASK_FOREVER);
                     tDisplayTimer.restart();
                 }

From b90a1905044b71eb6a9ac0d4328893d3706d4ea1 Mon Sep 17 00:00:00 2001
From: Nicu Hodos <nicu@hodos.ro>
Date: Mon, 10 Feb 2025 11:02:03 +0100
Subject: [PATCH 9/9] small improvement

---
 include/devices.h |  2 +-
 include/display.h | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/devices.h b/include/devices.h
index 8284b0a..1bd3fe5 100644
--- a/include/devices.h
+++ b/include/devices.h
@@ -137,7 +137,7 @@ namespace Devices {
         Display::Brightness::brightnessChangedCallback = []{
             brightnessMqtt->updateState(Display::Brightness::current);
         };
-        Display::Timer::timerCallback = [](int8 current){
+        Display::Timer::remainingCallback = [](int8 current){
             timerRemainingMqtt->updateState(to_string(current).c_str());
         };
     }
diff --git a/include/display.h b/include/display.h
index 03fb64f..dce6e48 100644
--- a/include/display.h
+++ b/include/display.h
@@ -79,7 +79,7 @@ namespace Display {
 
     namespace Timer {
         int8 timer = 0, current = 0;
-        void (*timerCallback)(int8);
+        void (*remainingCallback)(int8);
 
         Task tDisplayTimer(SECONDS(10), TASK_ONCE + 1, 
             []{
@@ -108,14 +108,17 @@ namespace Display {
                     tDisplayTimer.setIterations(TASK_FOREVER);
                     tDisplayTimer.restart();
                 }
-                if (timerCallback) timerCallback(current);
-            }, &ts, false, nullptr,
+                if (remainingCallback) remainingCallback(current);
+            }, &ts, false, 
+            []{
+                current = timer+1;
+                return true;
+            },
             []{
                 tDisplayTimer.disable();
             });
 
         void start() {
-            current = timer+1;
             tTimer.restart();
         }
 
@@ -223,7 +226,7 @@ namespace Display {
 
     void changeHourFormat24(bool format24) {
         hourFormat24 = format24;
-        drawTime();
+        tDisplayTime.restart();
         if (hourFormatChangedCallback) hourFormatChangedCallback();
     }