Merge commit '5e86674e6832d25ee053b1c03e85c372cad42547' into feat/main-algo

Co-authored-by: Clement <c.boesmier@aptatio.com>
Reviewed-on: #7

.gitignore

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

include/Program.h

@@ -40,7 +40,15 @@ private:
     WiFiUDP* ntpUDP;
     NTPClient* timeClient;
 
-    ulong lastMillis;
+    /**
+     * @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

lib/LedLib/scr/LedLib.cpp

@@ -26,14 +26,19 @@ 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; 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 (i-start%2 == 0) {
+      if (j%2 == 0) {
-        this->strip->setPixelColor(i-1, 255, 255, 255);
+        this->strip->setPixelColor(j, 255, 255, 255);
       }else{
-        this->strip->setPixelColor(i-1, 255, 0, 0);
+        this->strip->setPixelColor(j, 255, 0, 0);
       }
     }
   }
@@ -48,30 +53,17 @@ void LedLib::actLed(int nb, int start){
 int LedLib::getledNB(){
   return this->ledNb;
 }
-
+//FIXME: this function is broken
 void LedLib::okBlink(){
-  int tempR;
+    this->strip->clear();
-  int tempV;
+    for(int i = 0; i < 3; i++){
-  int tempB;
+        for(int j = 0; j < 24; j++){
-
+            this->strip->setPixelColor(j, 0, 255, 0);
-  for (int i = 0; i < 3*2; i++) {
+        }
-      if(i%2 == 0){
+        this->strip->show();
-        tempR = 0;
+        delay(100);
-        tempV = 0;
+        this->strip->clear();
-        tempB = 0;
+        this->strip->show();
-
+        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,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;
@@ -11,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);//FIXME: maybe change to FALLING
+    attachInterrupt(digitalPinToInterrupt(pinSW), switchEncoder, RISING);
     this->oldPosition = -999;
     this->oldMenu = -999;
 }
@@ -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,15 @@ 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){
@@ -44,61 +53,75 @@ 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()) {
+        switch (this->encoder->getMenu()){
-        case 1:
+        case 1:{
-            this->encoder->resetValue();
+            if(!this->ntpUpdated){
-            this->timeClient->update();
+                this->timeClient->update();
-            int day = this->timeClient->getDay();
+                this->encoder->resetMenu();
-            int hour = this->timeClient->getHours();
+                this->ntpUpdated = true;
-            int halfHourNb = hour > 12 ? hour - 12 : hour;
-            halfHourNb *= 2;
-            int minute = this->timeClient->getMinutes();
-            if(minute > 30){
-                halfHourNb++;
             }
-            if(day == 2 ||  day == 5){
+            int currentHour = this->timeClient->getHours();
-                //TODO: mettre l'heure d'envoie par defaut a 22h
+            if(currentHour > 12){
+                currentHour -= 12;
             }
-            int openTime = this->encoder->getValue();
+            //TODO: debug this shit
-            this->ledLib->actLed(openTime,halfHourNb);
+            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:
+        }case 2:{
-            this->encoder->resetValue();
+            int finalEncValue = this->encoder->getValue();
-            //this->sendTime();
+            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;
-        }
+        }}
-    }
-    if(this->encoder->update()){
         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);
 
-    this->timeClient->update();
+    // delay(1000);
 
-    int currentHour = this->timeClient->getHours();
+    // this->timeClient->update();
-    Serial.print("Hour: ");
-    Serial.println(currentHour);
 
-    int currentMinute = this->timeClient->getMinutes();
+    // int currentHour = this->timeClient->getHours();
-    Serial.print("Minutes: ");
+    // Serial.print("Hour: ");
-    Serial.println(currentMinute);
+    // Serial.println(currentHour);
 
-    int currentSecond = this->timeClient->getSeconds();
+    // int currentMinute = this->timeClient->getMinutes();
-    Serial.print("Seconds: ");
+    // Serial.print("Minutes: ");
-    Serial.println(currentSecond);
+    // Serial.println(currentMinute);
 
-    int currentDayOfWeek = this->timeClient->getDay();
+    // int currentSecond = this->timeClient->getSeconds();
-    Serial.print("Day of week: ");
+    // Serial.print("Seconds: ");
-    Serial.println(currentDayOfWeek);
+    // Serial.println(currentSecond);
+
+    // int currentDayOfWeek = this->timeClient->getDay();
+    // Serial.print("Day of week: ");
+    // Serial.println(currentDayOfWeek);
 }