fix led leb double lib issue

config.ini

@@ -26,5 +26,3 @@ build_flags =
 
     -D PIXEL_PIN=4
     -D PIXEL_COUNT=24
-
-    -D RESET_TIME=60000

include/Program.h

@@ -40,8 +40,6 @@ private:
     WiFiUDP* ntpUDP;
     NTPClient* timeClient;
 
-    ulong lastMillis;
-
     /**
      * @brief Send time to discord
      * the start time is automaticly set to the current time

lib/LedLib/scr/LedLib.cpp

@@ -26,14 +26,18 @@ void LedLib::actLed(int nb, int start){
 
     // Boucle dans les LEDs
     // Loop in LEDs
-    for (int i = start; i < start+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-start%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);
       }
     }
   }

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;

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){
@@ -44,61 +51,29 @@ void Program::sendTime(String timeEnd){
 }
 
 void Program::loop() {
-    ulong currentMillis = millis();
-    if (currentMillis + 1000 > this->lastMillis) {
-        this->lastMillis = currentMillis;
-        this->encoder->resetMenu();
-        this->encoder->resetValue();
-        this->ledLib->actLed(0);
-    }
-    if(this->encoder->update()){
-        switch (this->encoder->getMenu()) {
-        case 1:
-            this->encoder->resetValue();
-            this->timeClient->update();
-            int day = this->timeClient->getDay();
-            int hour = this->timeClient->getHours();
-            int halfHourNb = hour > 12 ? hour - 12 : hour;
-            halfHourNb *= 2;
-            int minute = this->timeClient->getMinutes();
-            if(minute > 30){
-                halfHourNb++;
-            }
-            if(day == 2 ||  day == 5){
-                //TODO: mettre l'heure d'envoie par defaut a 22h
-            }
-            int openTime = this->encoder->getValue();
-            this->ledLib->actLed(openTime,halfHourNb);
-        break;
-        case 2:
-            this->encoder->resetValue();
-            //this->sendTime();
-        break;
-        }
-    }
     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);
 }