From 92943ff3e97efb279221b8c6d71376edfce8268f Mon Sep 17 00:00:00 2001
From: Clement <clement@jo85.com>
Date: Sun, 22 Oct 2023 00:34:20 +0200
Subject: [PATCH] feat: ajout start led on  led lib (#5)

---
 lib/LedLib/include/LedLib.h                   |  2 +-
 lib/LedLib/scr/LedLib.cpp                     | 14 ++++---
 .../src/SwitchableEncodeur.cpp                | 11 +++++-
 src/Program.cpp                               | 37 +++++++++++--------
 4 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/lib/LedLib/include/LedLib.h b/lib/LedLib/include/LedLib.h
index 3d13b94..d26f0e5 100644
--- a/lib/LedLib/include/LedLib.h
+++ b/lib/LedLib/include/LedLib.h
@@ -11,7 +11,7 @@ public :
 
     // Fonction pour allumer correctement les LEDs en fonction du Rotary
     // Function to manage LEDs colors according to the Rotary
-    void actLed(int nb);
+    void actLed(int nb, int start = 0);
 
     // Fonction qui renvoie le nombre de LEDs allumées
     // Function that returns the number of LEDs lit
diff --git a/lib/LedLib/scr/LedLib.cpp b/lib/LedLib/scr/LedLib.cpp
index 05185b6..2a9c9ed 100644
--- a/lib/LedLib/scr/LedLib.cpp
+++ b/lib/LedLib/scr/LedLib.cpp
@@ -13,7 +13,7 @@ LedLib::LedLib(int pixelCount, int pixelPin, int bright){
 
 // Fonction pour allumer correctement les LEDs en fonction du Rotary
 // Function to manage LEDs colors according to the Rotary
-void LedLib::actLed(int nb){
+void LedLib::actLed(int nb, int start){
   this->ledNb = nb;
 
   // On éteint tout
@@ -26,14 +26,18 @@ void LedLib::actLed(int nb){
 
     // Boucle dans les LEDs
     // Loop in LEDs
-    for (int i = 0; i < nb+1; i++) {
+    for (int i = start; i <= nb+start-1; i++) {
+        int j = i;
+        if(j > 24){
+            j -= 24;
+        }
 
       // Une LED sur deux est blanche : heure entière, l'autre rouge pour 30m
       // One LED out of two is white: whole hour, the other red for 30m
-      if (i%2 == 0) {
-        this->strip->setPixelColor(i-1, 255, 255, 255);
+      if (j%2 == 0) {
+        this->strip->setPixelColor(j, 255, 255, 255);
       }else{
-        this->strip->setPixelColor(i-1, 255, 0, 0);
+        this->strip->setPixelColor(j, 255, 0, 0);
       }
     }
   }
diff --git a/lib/SwitchableEncodeur/src/SwitchableEncodeur.cpp b/lib/SwitchableEncodeur/src/SwitchableEncodeur.cpp
index 8f23269..2b0edd4 100644
--- a/lib/SwitchableEncodeur/src/SwitchableEncodeur.cpp
+++ b/lib/SwitchableEncodeur/src/SwitchableEncodeur.cpp
@@ -1,7 +1,13 @@
 #include "../include/SwitchableEncodeur.h"
 
 IRAM_ATTR void switchEncoder() {
-    SwitchableEncodeur::getInstance()->addMenu();
+    static unsigned long last_interrupt_time = 0;
+    unsigned long interrupt_time = millis();
+    // If interrupts come faster than 200ms, assume it's a bounce and ignore
+    if (interrupt_time - last_interrupt_time > 200){
+        SwitchableEncodeur::getInstance()->addMenu();
+    }
+    last_interrupt_time = interrupt_time;
 }
 
 SwitchableEncodeur* SwitchableEncodeur::instance = nullptr;
@@ -42,6 +48,9 @@ bool SwitchableEncodeur::update() {
     if (newPosition != this->oldPosition || this->menu != this->oldMenu) {
         this->oldMenu = this->menu;
         this->oldPosition = newPosition;
+        if(this->oldPosition < 0){
+            this->oldPosition = 0;
+        }
         sortie = true;
     }
     return sortie;
diff --git a/src/Program.cpp b/src/Program.cpp
index 3d3e8f6..ea8cd16 100644
--- a/src/Program.cpp
+++ b/src/Program.cpp
@@ -32,6 +32,13 @@ Program::Program() {
 
     this->timeClient->update();
     //this->sendTime("18h12");
+
+    // Startup Rotary
+    this->encoder = new SwitchableEncodeur(ENCODER_DT, ENCODER_CLK, ENCODER_SWITCH, 3);
+
+    // Startup LEDs
+    this->ledLib = new LedLib(PIXEL_COUNT, PIXEL_PIN, 255);
+
 }
 
 void Program::sendTime(String timeEnd){
@@ -46,27 +53,27 @@ void Program::sendTime(String timeEnd){
 void Program::loop() {
     if(this->encoder->update()){
         Serial.print(this->encoder->getValue());
-        this->ledLib->actLed(this->encoder->getValue());
+        this->ledLib->actLed(this->encoder->getValue(), 5);
         Serial.print(" ");
         Serial.println(this->encoder->getMenu());
     }
-    delay(1000);
+    // delay(1000);
 
-    this->timeClient->update();
+    // this->timeClient->update();
 
-    int currentHour = this->timeClient->getHours();
-    Serial.print("Hour: ");
-    Serial.println(currentHour);
+    // int currentHour = this->timeClient->getHours();
+    // Serial.print("Hour: ");
+    // Serial.println(currentHour);
 
-    int currentMinute = this->timeClient->getMinutes();
-    Serial.print("Minutes: ");
-    Serial.println(currentMinute);
+    // int currentMinute = this->timeClient->getMinutes();
+    // Serial.print("Minutes: ");
+    // Serial.println(currentMinute);
 
-    int currentSecond = this->timeClient->getSeconds();
-    Serial.print("Seconds: ");
-    Serial.println(currentSecond);
+    // int currentSecond = this->timeClient->getSeconds();
+    // Serial.print("Seconds: ");
+    // Serial.println(currentSecond);
 
-    int currentDayOfWeek = this->timeClient->getDay();
-    Serial.print("Day of week: ");
-    Serial.println(currentDayOfWeek);
+    // int currentDayOfWeek = this->timeClient->getDay();
+    // Serial.print("Day of week: ");
+    // Serial.println(currentDayOfWeek);
 }