first alog fonctionnel

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:
@@ -46,6 +51,19 @@ private:
      * @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

src/Program.cpp

@@ -28,10 +28,9 @@ 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);
@@ -41,6 +40,8 @@ Program::Program() {
 
     this->ledLib->okBlink();
 
+    this->menu=MainMenu::INITIAL_STATE;
+    this->resetMillis = 0;
 }
 
 void Program::sendTime(String timeEnd){
@@ -50,14 +51,98 @@ void Program::sendTime(String timeEnd){
         start += (String)(startQuater * 15);
     }
     this->discord->sendHeure(start, timeEnd);
+    this->nLedStart = 0;
+    this->pm = false;
 }
 
 void Program::loop() {
+    switch (this->menu){
+        case MainMenu::INITIAL_STATE: // feault state
+            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 hour = this->timeClient->getHours();
+            int min = this->timeClient->getMinutes();
+            if(hour >= 12){
+                hour -= 12;
+                this->pm = true;
+            }else{
+                this->pm = false;
+            }
+            this->nLedStart = hour*2;
+            if(min >= 30){
+                this->nLedStart++;
+            }
+            this->menu=MainMenu::SELECT_END_HOUR;
+            this->resetMillis = millis();
+            //TODO: géré les mardi et jeudi
+            Serial.print("hour :");
+            Serial.print(hour);
+            Serial.print(" min :");
+            Serial.println(min);
+        break;}
+
+        case MainMenu::SELECT_END_HOUR: // select Close hour
+            this->ledLib->actLed(this->encoder->getValue(), this->nLedStart);
+        break;
+
+        case MainMenu::SEND_TO_DISCORD:{ // send value to discord
+            String strTime = "";
+            int endLed = this->encoder->getValue();
+            int hour = (this->nLedStart + endLed)/2;
+            if(this->pm){
+                hour += 12;
+            }
+            strTime += hour;
+            strTime += "h";
+            if(this->nLedStart % 2 == 1){
+                if(endLed % 2 == 1){
+                    strTime += "30";
+                }
+            }else{
+                if(endLed % 2 == 0){
+                    strTime += "30";
+                }
+            }
+            Serial.println(strTime);
+            Serial.print("Start : ");
+            Serial.print(this->nLedStart);
+            Serial.print(" End : ");
+            Serial.print(endLed);
+            Serial.print(" hour : ");
+            Serial.print(hour);
+            Serial.println();
+
+            this->sendTime(strTime);
+            this->menu = MainMenu::INITIAL_STATE;
+        }
+        break;
+
+        default:
+        break;
+    }
+    // MAJ encodeur
     if(this->encoder->update()){
-        Serial.print(this->encoder->getValue());
+        if(this->encoder->getMenu() == 1 && this->menu == MainMenu::INITIAL_STATE){//passage de l'état initial au 1er état
-        this->ledLib->actLed(this->encoder->getValue(), 5);
+            this->menu = MainMenu::GET_START_HOUR;
-        Serial.print(" ");
+        }
-        Serial.println(this->encoder->getMenu());
+        if(this->encoder->getMenu() == 2 && this->menu == MainMenu::SELECT_END_HOUR){//validation du choix de l'heure
+            this->menu = MainMenu::SEND_TO_DISCORD;
+        }
+        // Serial.print(this->encoder->getValue());
+        // this->ledLib->actLed(this->encoder->getValue(), 10);
+        // Serial.print(" ");
+        // Serial.println(this->encoder->getMenu());
+    }
+    // Reseteur
+    if(this->resetMillis + RESET_TIME == millis()){
+        this->encoder->resetMenu();
+        this->resetMillis = millis();
+        this->menu = MainMenu::INITIAL_STATE;
     }
     // delay(1000);