Merge commit '8edae04556c46aa0645792c6b3c021636bb454ff' into feat--add-ntp-support

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, int start = 0);
+    void actLed(int nb);
 
     // Fonction qui renvoie le nombre de LEDs allumées
     // Function that returns the number of LEDs lit

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, int start){
+void LedLib::actLed(int nb){
   this->ledNb = nb;
 
   // On éteint tout
@@ -26,18 +26,14 @@ void LedLib::actLed(int nb, int start){
 
     // Boucle dans les LEDs
     // Loop in LEDs
-    for (int i = start; i <= nb+start-1; i++) {
+    for (int i = 0; i < nb+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 (j%2 == 0) {
+      if (i%2 == 0) {
-        this->strip->setPixelColor(j, 255, 255, 255);
+        this->strip->setPixelColor(i-1, 255, 255, 255);
       }else{
-        this->strip->setPixelColor(j, 255, 0, 0);
+        this->strip->setPixelColor(i-1, 255, 0, 0);
       }
     }
   }
@@ -54,15 +50,28 @@ int LedLib::getledNB(){
 }
 
 void LedLib::okBlink(){
-    this->strip->clear();
+  int tempR;
-    for(int i = 0; i < 3; i++){
+  int tempV;
-        for(int j = 0; j < 24; j++){
+  int tempB;
-            this->strip->setPixelColor(j, 0, 255, 0);
+
+  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();
-        delay(100);
-        this->strip->clear();
-        this->strip->show();
-        delay(100);
   }
 }

lib/SwitchableEncodeur/src/SwitchableEncodeur.cpp

@@ -1,13 +1,7 @@
 #include "../include/SwitchableEncodeur.h"
 
 IRAM_ATTR void switchEncoder() {
-    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;
@@ -48,9 +42,6 @@ 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,15 +32,6 @@ 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);
-
-    this->ledLib->okBlink();
-
 }
 
 void Program::sendTime(String timeEnd){
@@ -55,27 +46,27 @@ void Program::sendTime(String timeEnd){
 void Program::loop() {
     if(this->encoder->update()){
         Serial.print(this->encoder->getValue());
-        this->ledLib->actLed(this->encoder->getValue(), 5);
+        this->ledLib->actLed(this->encoder->getValue());
         Serial.print(" ");
         Serial.println(this->encoder->getMenu());
     }
-    // delay(1000);
+    delay(1000);
 
-    // this->timeClient->update();
+    this->timeClient->update();
 
-    // int currentHour = this->timeClient->getHours();
+    int currentHour = this->timeClient->getHours();
-    // Serial.print("Hour: ");
+    Serial.print("Hour: ");
-    // Serial.println(currentHour);
+    Serial.println(currentHour);
 
-    // int currentMinute = this->timeClient->getMinutes();
+    int currentMinute = this->timeClient->getMinutes();
-    // Serial.print("Minutes: ");
+    Serial.print("Minutes: ");
-    // Serial.println(currentMinute);
+    Serial.println(currentMinute);
 
-    // int currentSecond = this->timeClient->getSeconds();
+    int currentSecond = this->timeClient->getSeconds();
-    // Serial.print("Seconds: ");
+    Serial.print("Seconds: ");
-    // Serial.println(currentSecond);
+    Serial.println(currentSecond);
 
-    // int currentDayOfWeek = this->timeClient->getDay();
+    int currentDayOfWeek = this->timeClient->getDay();
-    // Serial.print("Day of week: ");
+    Serial.print("Day of week: ");
-    // Serial.println(currentDayOfWeek);
+    Serial.println(currentDayOfWeek);
 }