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

config.ini

@@ -26,5 +26,3 @@ build_flags =
 
     -D PIXEL_PIN=4
     -D PIXEL_COUNT=24
-
-    -D RESET_TIME=60000

docs/.gitignore

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

include/Program.h

@@ -10,12 +10,7 @@
 #include "SwitchableEncodeur.h"
 #include "LedLib.h"
 
-enum MainMenu{
+
-    INITIAL_STATE,
-    GET_START_HOUR,
-    SELECT_END_HOUR,
-    SEND_TO_DISCORD
-};
 
 class Program {
 public:
@@ -51,19 +46,6 @@ 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

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,18 +26,14 @@ void LedLib::actLed(int nb, int start){
 
     // Boucle dans les LEDs
     // Loop in LEDs
-    for (int i = start; i <= nb+start-1; i++) {
+    for (int i = 0; i < nb+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 (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);
       }
     }
   }
@@ -54,15 +50,28 @@ int LedLib::getledNB(){
 }
 
 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/include/SwitchableEncodeur.h

@@ -39,13 +39,6 @@ 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,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;
@@ -45,16 +39,9 @@ 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;
@@ -66,9 +53,4 @@ int SwitchableEncodeur::getValue() {
 
 void SwitchableEncodeur::resetValue() {
     this->oldPosition = 0;
-    this->readAndReset();
-}
-
-void SwitchableEncodeur::setValue(int val){
-    this->write(val*4);
 }

src/Program.cpp

@@ -28,20 +28,10 @@ Program::Program() {
     this->discord = new DiscordAPI(DISCORD_HOOK);
     // startup NTP
     this->ntpUDP = new WiFiUDP();
-    this->timeClient = new NTPClient(*this->ntpUDP, "pool.ntp.org", 3600*1);//*2 = gnt+2
+    this->timeClient = new NTPClient(*this->ntpUDP, "pool.ntp.org", 3600*2);//*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){
@@ -51,95 +41,32 @@ 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: // 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();
-            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;
-            }
-            this->nLedStart = hour*2;
-            if(min >= 30){
-                this->nLedStart++;
-            }
-            this->menu=MainMenu::SELECT_END_HOUR;
-            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 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
+        Serial.print(this->encoder->getValue());
-            this->menu = MainMenu::GET_START_HOUR;
+        this->ledLib->actLed(this->encoder->getValue());
-        }
+        Serial.print(" ");
-        if(this->encoder->getMenu() == 2 && this->menu == MainMenu::SELECT_END_HOUR){//validation du choix de l'heure
+        Serial.println(this->encoder->getMenu());
-            this->menu = MainMenu::SEND_TO_DISCORD;
-        }
     }
-    // Reseteur
+    delay(1000);
-    if(this->resetMillis + RESET_TIME == millis()){
-        this->encoder->resetMenu();
-        this->resetMillis = millis();
-        this->menu = MainMenu::INITIAL_STATE;
-    }
-    //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();
+    this->timeClient->update();
-    // Serial.print("Day of week: ");
+
-    // Serial.println(currentDayOfWeek);
+    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);
+
+    int currentDayOfWeek = this->timeClient->getDay();
+    Serial.print("Day of week: ");
+    Serial.println(currentDayOfWeek);
 }