feat: V1 fonctionnel OK (#8)

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

.gitignore

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

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,22 +45,25 @@ 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
      * @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,9 +26,8 @@ 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 = start; i <= nb+start-1; i++) {
         int j = i;
-        //TODO: géré le cas ou j > 24
         if(j >= 24){
             j -= 24;
         }
@@ -53,7 +52,7 @@ void LedLib::actLed(int nb, int start){
 int LedLib::getledNB(){
   return this->ledNb;
 }
-//FIXME: this function is broken
+
 void LedLib::okBlink(){
     this->strip->clear();
     for(int i = 0; i < 3; i++){

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

@@ -17,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);
+    attachInterrupt(digitalPinToInterrupt(pinSW), switchEncoder, RISING);//FIXME: maybe change to FALLING
     this->oldPosition = -999;
     this->oldMenu = -999;
 }
@@ -45,10 +45,14 @@ 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){
+        if(this->oldPosition <= 0){
             this->oldPosition = 0;
         }
         sortie = true;
@@ -62,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,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,76 +51,93 @@ void Program::sendTime(String timeEnd){
         start += (String)(startQuater * 15);
     }
     this->discord->sendHeure(start, timeEnd);
+    this->nLedStart = 0;
+    this->pm = false;
 }
 
 void Program::loop() {
-    if(this->encoder->update()){
-        switch (this->encoder->getMenu()){
-        case 1:{
-            if(!this->ntpUpdated){
+    switch (this->menu){
+        case MainMenu::INITIAL_STATE: // default 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();
-                this->encoder->resetMenu();
-                this->ntpUpdated = true;
+            int hour = this->timeClient->getHours();
+            int min = this->timeClient->getMinutes();
+            int day = this->timeClient->getDay();
+            if(hour >= 12){
+                hour -= 12;
+                this->pm = true;
+            }else{
+                this->pm = false;
             }
-            int currentHour = this->timeClient->getHours();
-            if(currentHour > 12){
-                currentHour -= 12;
+            this->nLedStart = hour*2;
+            if(min >= 30){
+                this->nLedStart++;
             }
-            //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->menu=MainMenu::SELECT_END_HOUR;
             this->resetMillis = millis();
-        break;
-        }}
-        Serial.print(this->encoder->getValue());
-        Serial.print(" ");
-        Serial.println(this->encoder->getMenu());
-        //this->ledLib->actLed(this->encoder->getValue(), 5);
+            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 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->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;
+        }
+    }
+    // Reseteur
     if(this->resetMillis + RESET_TIME == millis()){
         this->encoder->resetMenu();
         this->resetMillis = millis();
-        this->ntpUpdated = false;
+        this->menu = MainMenu::INITIAL_STATE;
     }
-
-    // delay(1000);
-
-    // this->timeClient->update();
-
-    // int currentHour = this->timeClient->getHours();
-    // 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);
+    //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)
 
     // int currentDayOfWeek = this->timeClient->getDay();
     // Serial.print("Day of week: ");