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

.gitignore

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

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/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,19 +26,14 @@ 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 = 0; i < nb+1; i++) {
-        int j = i;
-        //TODO: géré le cas ou j > 24
-        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);
       }
     }
   }
@@ -53,17 +48,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();
+  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++) {
-        this->strip->show();
+      if(i%2 == 0){
-        delay(100);
+        tempR = 0;
-        this->strip->clear();
+        tempV = 0;
-        this->strip->show();
+        tempB = 0;
-        delay(100);
+
-    }
+      }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

@@ -1,13 +1,7 @@
 #include "../include/SwitchableEncodeur.h"
 
 IRAM_ATTR void switchEncoder() {
-    static unsigned long last_interrupt_time = 0;
+    SwitchableEncodeur::getInstance()->addMenu();
-    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;
@@ -17,7 +11,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;
 }
@@ -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){
@@ -54,74 +45,28 @@ 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());
         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);
 
-    // delay(1000);
+    this->timeClient->update();
 
-    // this->timeClient->update();
+    int currentHour = this->timeClient->getHours();
+    Serial.print("Hour: ");
+    Serial.println(currentHour);
 
-    // int currentHour = this->timeClient->getHours();
+    int currentMinute = this->timeClient->getMinutes();
-    // Serial.print("Hour: ");
+    Serial.print("Minutes: ");
-    // Serial.println(currentHour);
+    Serial.println(currentMinute);
 
-    // int currentMinute = this->timeClient->getMinutes();
+    int currentSecond = this->timeClient->getSeconds();
-    // Serial.print("Minutes: ");
+    Serial.print("Seconds: ");
-    // Serial.println(currentMinute);
+    Serial.println(currentSecond);
 
-    // int currentSecond = this->timeClient->getSeconds();
+    int currentDayOfWeek = this->timeClient->getDay();
-    // Serial.print("Seconds: ");
+    Serial.print("Day of week: ");
-    // Serial.println(currentSecond);
+    Serial.println(currentDayOfWeek);
-
-    // int currentDayOfWeek = this->timeClient->getDay();
-    // Serial.print("Day of week: ");
-    // Serial.println(currentDayOfWeek);
 }