feat: V1 fonctionnel OK (#8)

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

docs/.gitignore

@@ -0,0 +1 @@
+output

include/Program.h

@@ -10,7 +10,12 @@
 #include "SwitchableEncodeur.h"
 #include "LedLib.h"
 
-
+enum MainMenu{
+    INITIAL_STATE,
+    GET_START_HOUR,
+    SELECT_END_HOUR,
+    SEND_TO_DISCORD
+};
 
 class Program {
 public:
@@ -40,14 +45,25 @@ private:
     WiFiUDP* ntpUDP;
     NTPClient* timeClient;
 
-    ulong lastMillis;
-
     /**
      * @brief Send time to discord
      * the start time is automaticly set to the current time
      * @param[in] timeEnd LabOuest closing time
      */
     void sendTime(String timeEnd);
+
+    //state of the button
+    MainMenu menu;
+
+    //temps de reset in ms
+    ulong resetMillis;
+
+    //numéro de led de dépard
+    int nLedStart;
+
+    // apres midi
+    bool pm;
+
 };
 
 #endif

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) {
+      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);
       }
     }
   }
@@ -50,28 +54,15 @@ int LedLib::getledNB(){
 }
 
 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/include/SwitchableEncodeur.h

@@ -39,6 +39,13 @@ public:
      */
     int getValue();
 
+    /**
+     * @brief set the encodeur value
+     *
+     * @param val the new encodeur value
+     */
+    void setValue(int val);
+
     /**
      * @brief update the encodeur value
      *

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;
@@ -39,9 +45,16 @@ SwitchableEncodeur* SwitchableEncodeur::getInstance() {
 bool SwitchableEncodeur::update() {
     bool sortie = false;
     long newPosition = this->read()/4;
+    if(newPosition < 0){
+        newPosition = 0;
+        this->readAndReset();
+    }
     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;
@@ -53,4 +66,9 @@ int SwitchableEncodeur::getValue() {
 
 void SwitchableEncodeur::resetValue() {
     this->oldPosition = 0;
+    this->readAndReset();
+}
+
+void SwitchableEncodeur::setValue(int val){
+    this->write(val*4);
 }

src/Program.cpp

@@ -28,10 +28,20 @@ Program::Program() {
     this->discord = new DiscordAPI(DISCORD_HOOK);
     // startup NTP
     this->ntpUDP = new WiFiUDP();
-    this->timeClient = new NTPClient(*this->ntpUDP, "pool.ntp.org", 3600*2);//*2 = gnt+2
+    this->timeClient = new NTPClient(*this->ntpUDP, "pool.ntp.org", 3600*1);//*2 = gnt+2
 
     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();
+
+    this->menu=MainMenu::INITIAL_STATE;
+    this->resetMillis = 0;
 }
 
 void Program::sendTime(String timeEnd){
@@ -41,64 +51,95 @@ void Program::sendTime(String timeEnd){
         start += (String)(startQuater * 15);
     }
     this->discord->sendHeure(start, timeEnd);
+    this->nLedStart = 0;
+    this->pm = false;
 }
 
 void Program::loop() {
-    ulong currentMillis = millis();
+    switch (this->menu){
-    if (currentMillis + 1000 > this->lastMillis) {
+        case MainMenu::INITIAL_STATE: // default state
-        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->ledLib->actLed(0,0);
+        break;
+
+        case MainMenu::GET_START_HOUR:{ // get NTP Hour
+            //TODO: géré heure d'été et d'hiver
             this->timeClient->update();
-            int day = this->timeClient->getDay();
             int hour = this->timeClient->getHours();
-            int halfHourNb = hour > 12 ? hour - 12 : hour;
+            int min = this->timeClient->getMinutes();
-            halfHourNb *= 2;
+            int day = this->timeClient->getDay();
-            int minute = this->timeClient->getMinutes();
+            if(hour >= 12){
-            if(minute > 30){
+                hour -= 12;
-                halfHourNb++;
+                this->pm = true;
+            }else{
+                this->pm = false;
             }
-            if(day == 2 ||  day == 5){
+            this->nLedStart = hour*2;
-                //TODO: mettre l'heure d'envoie par defaut a 22h
+            if(min >= 30){
+                this->nLedStart++;
             }
-            int openTime = this->encoder->getValue();
+            this->menu=MainMenu::SELECT_END_HOUR;
-            this->ledLib->actLed(openTime,halfHourNb);
+            this->resetMillis = millis();
+            if(day == 2 || day == 5){
+                this->encoder->setValue(21-this->nLedStart);
+            }else{
+                this->encoder->setValue(1);
+            }
+        break;}
+        case MainMenu::SELECT_END_HOUR: // select Close hour
+            this->ledLib->actLed(this->encoder->getValue(), this->nLedStart);
         break;
-        case 2:
+        case MainMenu::SEND_TO_DISCORD:{ // send value to discord
+            String strTime = "";
+            bool min = false;
+            int endLed = this->encoder->getValue();
+            int hour = (this->nLedStart + endLed)/2;
+            if(this->pm)hour += 12;
+            if(this->nLedStart % 2 == 1){
+                if(endLed % 2 == 1){
+                    hour -=1;
+                    min = true;
+                }
+            }else{
+                if(endLed % 2 == 0){
+                    hour -=1;
+                    min = true;
+                }
+            }
+            if(hour >= 24)hour -= 24;
+            strTime += hour;
+            strTime += "h";
+            if(min)strTime += "30";
+            this->sendTime(strTime);
+            this->menu = MainMenu::INITIAL_STATE;
+            this->encoder->resetMenu();
             this->encoder->resetValue();
-            //this->sendTime();
+            this->ledLib->okBlink();
+        }
         break;
+
+        default:
+        break;
+    }
+    // MAJ encodeur
+    if(this->encoder->update()){
+        if(this->encoder->getMenu() == 1 && this->menu == MainMenu::INITIAL_STATE){//passage de l'état initial au 1er état
+            this->menu = MainMenu::GET_START_HOUR;
+        }
+        if(this->encoder->getMenu() == 2 && this->menu == MainMenu::SELECT_END_HOUR){//validation du choix de l'heure
+            this->menu = MainMenu::SEND_TO_DISCORD;
         }
     }
-    if(this->encoder->update()){
+    // Reseteur
-        Serial.print(this->encoder->getValue());
+    if(this->resetMillis + RESET_TIME == millis()){
-        this->ledLib->actLed(this->encoder->getValue());
+        this->encoder->resetMenu();
-        Serial.print(" ");
+        this->resetMillis = millis();
-        Serial.println(this->encoder->getMenu());
+        this->menu = MainMenu::INITIAL_STATE;
     }
-    delay(1000);
+    //TODO: gestion cas d'erreur (pas de wifi, discord down,...)
+    //TODO: gestion d'une ouverture de plus de 12h avec les led (chagement de couleur)
 
-    this->timeClient->update();
+    // int currentDayOfWeek = this->timeClient->getDay();
-
+    // Serial.print("Day of week: ");
-    int currentHour = this->timeClient->getHours();
+    // Serial.println(currentDayOfWeek);
-    Serial.print("Hour: ");
-    Serial.println(currentHour);
-
-    int currentMinute = this->timeClient->getMinutes();
-    Serial.print("Minutes: ");
-    Serial.println(currentMinute);
-
-    int currentSecond = this->timeClient->getSeconds();
-    Serial.print("Seconds: ");
-    Serial.println(currentSecond);
-
-    int currentDayOfWeek = this->timeClient->getDay();
-    Serial.print("Day of week: ");
-    Serial.println(currentDayOfWeek);
 }