From 415aa3a6062ae2473f266f134378447ae1866522 Mon Sep 17 00:00:00 2001
From: Djuri Baars <dsbaars@users.noreply.github.com>
Date: Mon, 6 Nov 2023 18:38:25 +0100
Subject: [PATCH] Use timer interrupt to update time

---
 src/tasks/minute.cpp | 71 +++++++++++++++++++++++++++-----------------
 src/tasks/minute.hpp |  4 +++
 2 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/tasks/minute.cpp b/src/tasks/minute.cpp
index e62c618..a676803 100644
--- a/src/tasks/minute.cpp
+++ b/src/tasks/minute.cpp
@@ -1,44 +1,59 @@
 #include "minute.hpp"
 
 TaskHandle_t minuteTaskHandle = NULL;
- // Define a type for the event callback
+// Define a type for the event callback
 std::vector<EventCallback> minuteEventCallbacks; // Define a vector to hold multiple event callbacks
-bool eventTriggered = false; // Initialize the event triggered flag to false
+bool eventTriggered = false;                     // Initialize the event triggered flag to false
+const int usPerMinute = 60 * 1000000;
 
-void minuteTask(void * parameter) {
-  while(1) {
-    #ifdef IS_3C // wait 5 minutes in case of a 3 color screen otherwise it keeps refreshing
-    if(rtc.getMinute() % 5 == 0 && !eventTriggered) {
-      eventTriggered = true;
-      for(auto &callback : minuteEventCallbacks) { // Loop through all the event callbacks and call them
-        callback();
-      }
+void minuteTask(void *parameter)
+{
+
+  esp_timer_handle_t minuteTimer;
+  const esp_timer_create_args_t minuteTimerConfig = {
+      .callback = &minuteTimerISR,
+      .name = "minute_timer"};
+
+  esp_timer_create(&minuteTimerConfig, &minuteTimer);
+
+  time_t currentTime;
+  struct tm timeinfo;
+  time(&currentTime);
+  localtime_r(&currentTime, &timeinfo);
+  uint32_t secondsUntilNextMinute = 60 - timeinfo.tm_sec;
+
+  if (secondsUntilNextMinute > 0)
+    vTaskDelay(pdMS_TO_TICKS((secondsUntilNextMinute * 1000)));
+
+  esp_timer_start_periodic(minuteTimer, usPerMinute);
+
+  while (1)
+  {
+    for (auto &callback : minuteEventCallbacks)
+    {
+      callback();
     }
-    if(rtc.getMinute() % 5 != 0 && eventTriggered) { // Reset the event triggered flag if the second is not 0
-      eventTriggered = false;
-    }
-    vTaskDelay(pdMS_TO_TICKS(1000)); // Sleep for 1000 milliseconds to avoid busy waiting
-    #else
-    if(rtc.getSecond() == 0 && !eventTriggered) {
-      eventTriggered = true;
-      for(auto &callback : minuteEventCallbacks) { // Loop through all the event callbacks and call them
-        callback();
-      }
-    }
-    if(rtc.getSecond() != 0) { // Reset the event triggered flag if the second is not 0
-      eventTriggered = false;
-    }
-    vTaskDelay(pdMS_TO_TICKS(1000)); // Sleep for 1000 milliseconds to avoid busy waiting
-    #endif
+
+    ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
+  }
+}
+
+void IRAM_ATTR minuteTimerISR(void *arg)
+{
+  BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+  vTaskNotifyGiveFromISR(minuteTaskHandle, &xHigherPriorityTaskWoken);
+  if (xHigherPriorityTaskWoken == pdTRUE)
+  {
+    portYIELD_FROM_ISR();
   }
 }
 
 void setupMinuteEvent()
 {
-    xTaskCreate(minuteTask, "MinuteTask", 4096, NULL, 1, &minuteTaskHandle); // Create the FreeRTOS task
+  xTaskCreate(minuteTask, "MinuteTask", 4096, NULL, 1, &minuteTaskHandle); // Create the FreeRTOS task
 }
 
 void registerNewMinuteCallback(const EventCallback cb)
 {
   minuteEventCallbacks.push_back(cb);
-} 
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/tasks/minute.hpp b/src/tasks/minute.hpp
index 6a3a635..811200a 100644
--- a/src/tasks/minute.hpp
+++ b/src/tasks/minute.hpp
@@ -6,9 +6,13 @@
 #include <freertos/task.h>
 #include <vector>
 #include "shared.hpp"
+#include <esp_timer.h>
+#include <time.h>
 
 extern TaskHandle_t minuteTaskHandle;
 
 void minuteTask(void *pvParameters);
 void setupMinuteEvent();
+void IRAM_ATTR minuteTimerISR(void* arg);
+
 void registerNewMinuteCallback(const EventCallback cb);
\ No newline at end of file