feat: V1 fonctionnel OK (#8)

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

config.ini

@@ -23,3 +23,8 @@ build_flags =
     -D ENCODER_SWITCH=D5
     -D ENCODER_DT=D6
     -D ENCODER_CLK=D7
+
+    -D PIXEL_PIN=4
+    -D PIXEL_COUNT=24
+
+    -D RESET_TIME=60000

docs/.gitignore

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

include/Program.h

@@ -3,11 +3,19 @@
 
 #include <Arduino.h>
 #include <ESP8266WiFi.h>
+#include <NTPClient.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:
@@ -32,6 +40,30 @@ private:
     long oldPosition;
 
     DiscordAPI* discord;
+
+    LedLib* ledLib;
+    WiFiUDP* ntpUDP;
+    NTPClient* timeClient;
+
+    /**
+     * @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/include/LedLib.h

@@ -0,0 +1,30 @@
+#ifndef NEOLED_H
+#define NEOLED_H 0
+
+#include <Adafruit_NeoPixel.h>
+
+// Classe LedLib : Gestion de l'allumage des LEDs en fonction du Rotary
+// Class LedLib : Manages LEDs colors according to the Rotary
+class LedLib{
+public :
+    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 actLed(int nb, int start = 0);
+
+    // Fonction qui renvoie le nombre de LEDs allumées
+    // Function that returns the number of LEDs lit
+    int getledNB();
+
+    void okBlink();
+
+private :
+    // Le nombre de LEDs allumées
+    // Amount of LEDs lit
+    int ledNb;
+
+    Adafruit_NeoPixel* strip;
+};
+
+#endif

lib/LedLib/scr/LedLib.cpp

@@ -0,0 +1,68 @@
+#include "../include/LedLib.h"
+
+// Initialisation
+// Initialization
+LedLib::LedLib(int pixelCount, int pixelPin, int bright){
+    this->ledNb = 0;
+    this->strip = new Adafruit_NeoPixel(PIXEL_COUNT, PIXEL_PIN, NEO_GRB + NEO_KHZ800);
+
+    this->strip->begin();
+    this->strip->show();
+    this->strip->setBrightness(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){
+  this->ledNb = nb;
+
+  // On éteint tout
+  // We shut everything up
+  this->strip->clear();
+
+  // Allumer 0 LED ? Inutile
+  // Useless to light up 0 LED
+  if (nb != 0) {
+
+    // Boucle dans les LEDs
+    // Loop in LEDs
+    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 (j%2 == 0) {
+        this->strip->setPixelColor(j, 255, 255, 255);
+      }else{
+        this->strip->setPixelColor(j, 255, 0, 0);
+      }
+    }
+  }
+
+  // Maintenant on allume
+  // Then light everything up
+  this->strip->show();
+}
+
+// Fonction qui renvoie le nombre de LEDs allumées
+// Function that returns the number of LEDs lit
+int LedLib::getledNB(){
+  return this->ledNb;
+}
+
+void LedLib::okBlink(){
+    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
      *
@@ -68,6 +75,11 @@ private:
      */
     int oldPosition = -999;
 
+    /**
+     * @brief old menu number
+     */
+    int oldMenu = -999;
+
     /**
      * @brief nombre de menu
      */

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;
@@ -13,6 +19,7 @@ SwitchableEncodeur::SwitchableEncodeur(uint8_t pin1, uint8_t pin2, uint8_t pinSW
     pinMode(pinSW, INPUT_PULLUP);
     attachInterrupt(digitalPinToInterrupt(pinSW), switchEncoder, RISING);//FIXME: maybe change to FALLING
     this->oldPosition = -999;
+    this->oldMenu = -999;
 }
 
 
@@ -38,8 +45,16 @@ SwitchableEncodeur* SwitchableEncodeur::getInstance() {
 bool SwitchableEncodeur::update() {
     bool sortie = false;
     long newPosition = this->read()/4;
-    if (newPosition != this->oldPosition) {
+    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;
@@ -51,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

@@ -52,6 +52,8 @@ upload_speed = 921600
 lib_deps =
 ;    example:
 ;    erropix/ESP32 AnalogWrite@0.2
+    adafruit/Adafruit NeoPixel@^1.11.0
+    arduino-libraries/NTPClient@^3.2.1
 
 ; Checker settings
 check_tool = clangtidy, cppcheck

src/Program.cpp

@@ -26,17 +26,120 @@ Program::Program() {
 
     // Startup Discord API
     this->discord = new DiscordAPI(DISCORD_HOOK);
-    delay(1000);
-    //Serial.println(this->discord->sendHeure("10h", "18h"));
+    // startup NTP
+    this->ntpUDP = new WiFiUDP();
+    this->timeClient = new NTPClient(*this->ntpUDP, "pool.ntp.org", 3600*1);//*2 = gnt+2
 
-    // Startup Encoder
+    this->timeClient->update();
+
+    // 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){
+    String start = (String)this->timeClient->getHours() + "h";
+    int startQuater = this->timeClient->getMinutes()/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());
-        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
+            //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
+            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: ");
+    // Serial.println(currentDayOfWeek);
 }

src/main.cpp

@@ -9,3 +9,5 @@ void setup() {
 void loop() {
     program->loop();
 }
+
+