Gestion de l'heure d'été

Reviewed-on: #9

README.md

@@ -1,18 +1,6 @@
-# Nom du projet
+# Bouton Discord Ouverture LabOuest
 
-Description du projet
-
-_note: voir le fichier SETUP.md pour setup le template dans un nouveau repo_
-
-## Getting Started
-
-### Installation
-
-Description sur la façon dont on installe le logiciel/lib
-
-### Usage
-
-Description rapide de l'usage du logiciel
+Code du bouton Lier au Bot D'ouverture du discord du fablab
 
 ## Règles de contributions
 

config.ini

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

docs/.gitignore

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

include/Program.h

@@ -4,13 +4,19 @@
 #include <Arduino.h>
 #include <ESP8266WiFi.h>
 #include <NTPClient.h>
+#include <Timezone.h>
 #include <WiFiUdp.h>
 
 #include "DiscordAPI.h"
 #include "SwitchableEncodeur.h"
 #include "LedLib.h"
 
-
+enum MainMenu{
+    INITIAL_STATE,
+    GET_START_HOUR,
+    SELECT_END_HOUR,
+    SEND_TO_DISCORD
+};
 
 class Program {
 public:
@@ -39,6 +45,12 @@ private:
     LedLib* ledLib;
     WiFiUDP* ntpUDP;
     NTPClient* timeClient;
+    Timezone* timezone;
+
+    /**
+     * Synchronize local using NTP client
+     */
+    void syncTime();
 
     /**
      * @brief Send time to discord
@@ -46,6 +58,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

lib/LedLib/scr/LedLib.cpp

@@ -28,7 +28,7 @@ void LedLib::actLed(int nb, int start){
     // Loop in LEDs
     for (int i = start; i <= nb+start-1; i++) {
         int j = i;
-        if(j > 24){
+        if(j >= 24){
             j -= 24;
         }
 
@@ -54,28 +54,15 @@ int LedLib::getledNB(){
 }
 
 void LedLib::okBlink(){
-  int tempR;
-  int tempV;
-  int tempB;
-
-  for (int i = 0; i < 3*2; i++) {
-      if(i%2 == 0){
-        tempR = 0;
-        tempV = 0;
-        tempB = 0;
-
-      }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();
-  }
+    this->strip->clear();
+    for(int i = 0; i < 3; i++){
+        for(int j = 0; j < 24; j++){
+            this->strip->setPixelColor(j, 0, 255, 0);
+        }
+        this->strip->show();
+        delay(100);
+        this->strip->clear();
+        this->strip->show();
+        delay(100);
+    }
 }

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

@@ -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);
 }

platformio.ini

@@ -54,6 +54,8 @@ lib_deps =
 ;    erropix/ESP32 AnalogWrite@0.2
     adafruit/Adafruit NeoPixel@^1.11.0
     arduino-libraries/NTPClient@^3.2.1
+	paulstoffregen/Time @ ^1.6.1
+	jchristensen/Timezone@^1.2.5
 
 ; Checker settings
 check_tool = clangtidy, cppcheck

src/Program.cpp

@@ -1,5 +1,7 @@
 #include "Program.h"
-
+#include <TimeLib.h>
+#include <time.h>
+#include <Timezone.h>
 
 Program::Program() {
 
@@ -28,10 +30,15 @@ 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");
 
-    this->timeClient->update();
-    //this->sendTime("18h12");
+    // setup Timezone
+    TimeChangeRule CEST = {"CEST", Last, Sun, Mar, 2, 120};     // Central European Summer Time
+    TimeChangeRule CET = {"CET ", Last, Sun, Oct, 3, 60};       // Central European Standard Time
+    this->timezone = new Timezone(CEST, CET);
+
+    // define local time
+    this->syncTime();
 
     // Startup Rotary
     this->encoder = new SwitchableEncodeur(ENCODER_DT, ENCODER_CLK, ENCODER_SWITCH, 3);
@@ -39,39 +46,115 @@ Program::Program() {
     // 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){
-    String start = (String)this->timeClient->getHours() + "h";
-    int startQuater = this->timeClient->getMinutes()/15;
+void Program::syncTime() {
+    if (this->timeClient->update()) {
+        setTime(
+            this->timezone->toLocal(
+                this->timeClient->getEpochTime()
+            )
+        );
+    }
+}
+
+void Program::sendTime(String timeEnd) {
+    String start = (String)hour() + "h";
+    int startQuater = minute()/15;
     if (startQuater != 0){
         start += (String)(startQuater * 15);
     }
     this->discord->sendHeure(start, timeEnd);
+    this->nLedStart = 0;
+    this->pm = false;
 }
 
 void Program::loop() {
-    if(this->encoder->update()){
-        Serial.print(this->encoder->getValue());
-        this->ledLib->actLed(this->encoder->getValue(), 5);
-        Serial.print(" ");
-        Serial.println(this->encoder->getMenu());
+    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
+            this->syncTime();
+            int _hour = hour();
+            int _min = minute();
+            int _day = day();
+            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;
     }
-    // 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);
+    // 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->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();
     // Serial.print("Day of week: ");