fix led leb double lib issue

.gitignore

@@ -3,6 +3,4 @@
 .vscode/c_cpp_properties.json
 .vscode/launch.json
 .vscode/ipch
-secrets.ini
-
-docs/output/*
+secrets.ini

config.ini

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

include/Program.h

@@ -40,16 +40,6 @@ private:
     WiFiUDP* ntpUDP;
     NTPClient* timeClient;
 
-    /**
-     * @brief Time to reset the encoder menu
-     */
-    unsigned long resetMillis;
-
-    /**
-     * @brief true if the NTP is updated durring the cycle
-     */
-    bool ntpUpdated;
-
     /**
      * @brief Send time to discord
      * the start time is automaticly set to the current time

lib/LedLib/scr/LedLib.cpp

@@ -26,10 +26,9 @@ void LedLib::actLed(int nb, int start){
 
     // Boucle dans les LEDs
     // Loop in LEDs
-    for (int i = start; i <= nb+start; i++) {
+    for (int i = start; i <= nb+start-1; i++) {
         int j = i;
-        //TODO: géré le cas ou j > 24
-        if(j >= 24){
+        if(j > 24){
             j -= 24;
         }
 
@@ -53,17 +52,30 @@ void LedLib::actLed(int nb, int start){
 int LedLib::getledNB(){
   return this->ledNb;
 }
-//FIXME: this function is broken
+
 void LedLib::okBlink(){
-    this->strip->clear();
-    for(int i = 0; i < 3; i++){
-        for(int j = 0; j < 24; j++){
-            this->strip->setPixelColor(j, 0, 255, 0);
-        }
-        this->strip->show();
-        delay(100);
-        this->strip->clear();
-        this->strip->show();
-        delay(100);
-    }
+  int tempR;
+  int tempV;
+  int tempB;
+
+  for (int i = 0; i < 3*2; i++) {
+      if(i%2 == 0){
+        tempR = 0;
+        tempV = 0;
+        tempB = 0;
+
+      }else{
+        tempR = 75;
+        tempV = 181;
+        tempB = 67;
+      }
+
+      for (int j = 0; j < 24; j++) {
+        // On fait clignoter les LEDs pour confirmer
+        // We make the LEDs blink to confirm
+        this->strip->setPixelColor(j-1, tempR, tempV, tempB);
+      }
+
+      this->strip->show();
+  }
 }

lib/SwitchableEncodeur/src/SwitchableEncodeur.cpp

@@ -17,7 +17,7 @@ SwitchableEncodeur::SwitchableEncodeur(uint8_t pin1, uint8_t pin2, uint8_t pinSW
     this->menu = 0;
     this->nbMenu = nbMenu;
     pinMode(pinSW, INPUT_PULLUP);
-    attachInterrupt(digitalPinToInterrupt(pinSW), switchEncoder, RISING);
+    attachInterrupt(digitalPinToInterrupt(pinSW), switchEncoder, RISING);//FIXME: maybe change to FALLING
     this->oldPosition = -999;
     this->oldMenu = -999;
 }

src/Program.cpp

@@ -39,8 +39,6 @@ Program::Program() {
     // Startup LEDs
     this->ledLib = new LedLib(PIXEL_COUNT, PIXEL_PIN, 255);
 
-    this->ledLib->okBlink();
-
 }
 
 void Program::sendTime(String timeEnd){
@@ -54,57 +52,11 @@ void Program::sendTime(String timeEnd){
 
 void Program::loop() {
     if(this->encoder->update()){
-        switch (this->encoder->getMenu()){
-        case 1:{
-            if(!this->ntpUpdated){
-                this->timeClient->update();
-                this->encoder->resetMenu();
-                this->ntpUpdated = true;
-            }
-            int currentHour = this->timeClient->getHours();
-            if(currentHour > 12){
-                currentHour -= 12;
-            }
-            //TODO: debug this shit
-            int startLed = currentHour * 2;
-            startLed += this->timeClient->getMinutes()/30;
-            int encValue = this->encoder->getValue();
-            Serial.println(startLed);
-
-            this->ledLib->actLed(encValue+1, startLed);
-        break;
-        }case 2:{
-            int finalEncValue = this->encoder->getValue();
-            int finalHour = this->timeClient->getHours();
-            int finalMinute = this->timeClient->getMinutes();
-
-            Serial.print("finalHour: ");
-            Serial.print(finalHour);
-            Serial.print("h");
-            Serial.print(finalMinute);
-            Serial.print(" finalEncValue: ");
-            Serial.println(finalEncValue);
-
-            // TODO: send time sur discord
-            //this->sendTime()
-
-            this->ledLib->okBlink();
-            this->ntpUpdated = false;
-            this->encoder->resetMenu();
-            this->resetMillis = millis();
-        break;
-        }}
         Serial.print(this->encoder->getValue());
+        this->ledLib->actLed(this->encoder->getValue(), 5);
         Serial.print(" ");
         Serial.println(this->encoder->getMenu());
-        //this->ledLib->actLed(this->encoder->getValue(), 5);
     }
-    if(this->resetMillis + RESET_TIME == millis()){
-        this->encoder->resetMenu();
-        this->resetMillis = millis();
-        this->ntpUpdated = false;
-    }
-
     // delay(1000);
 
     // this->timeClient->update();