backup

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

include/Program.h

@@ -3,9 +3,12 @@
 
 #include <Arduino.h>
 #include <ESP8266WiFi.h>
+#include <NTPClient.h>
+#include <WiFiUdp.h>
 
 #include "DiscordAPI.h"
 #include "SwitchableEncodeur.h"
+#include "LedLib.h"
 
 
 
@@ -32,6 +35,19 @@ private:
     long oldPosition;
 
     DiscordAPI* discord;
+
+    LedLib* ledLib;
+    WiFiUDP* ntpUDP;
+    NTPClient* timeClient;
+
+    ulong lastMillis;
+
+    /**
+     * @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);
 };
 
 #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,77 @@
+#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 < start+nb+1; i++) {
+
+      // 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 (i-start%2 == 0) {
+        this->strip->setPixelColor(i-1, 255, 255, 255);
+      }else{
+        this->strip->setPixelColor(i-1, 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(){
+  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();
+  }
+}

lib/SwitchableEncodeur/include/SwitchableEncodeur.h

@@ -68,6 +68,11 @@ private:
      */
     int oldPosition = -999;
 
+    /**
+     * @brief old menu number
+     */
+    int oldMenu = -999;
+
     /**
      * @brief nombre de menu
      */

lib/SwitchableEncodeur/src/SwitchableEncodeur.cpp

@@ -13,6 +13,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,7 +39,8 @@ SwitchableEncodeur* SwitchableEncodeur::getInstance() {
 bool SwitchableEncodeur::update() {
     bool sortie = false;
     long newPosition = this->read()/4;
-    if (newPosition != this->oldPosition) {
+    if (newPosition != this->oldPosition || this->menu != this->oldMenu) {
+        this->oldMenu = this->menu;
         this->oldPosition = newPosition;
         sortie = true;
     }

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,79 @@ Program::Program() {
 
     // Startup Discord API
     this->discord = new DiscordAPI(DISCORD_HOOK);
-    delay(1000);
+    // startup NTP
-    //Serial.println(this->discord->sendHeure("10h", "18h"));
+    this->ntpUDP = new WiFiUDP();
+    this->timeClient = new NTPClient(*this->ntpUDP, "pool.ntp.org", 3600*2);//*2 = gnt+2
 
-    // Startup Encoder
+    this->timeClient->update();
-    this->encoder = new SwitchableEncodeur(ENCODER_DT, ENCODER_CLK, ENCODER_SWITCH, 3);
+    //this->sendTime("18h12");
+}
+
+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);
 }
 
 void Program::loop() {
+    ulong currentMillis = millis();
+    if (currentMillis + 1000 > this->lastMillis) {
+        this->lastMillis = currentMillis;
+        this->encoder->resetMenu();
+        this->encoder->resetValue();
+        this->ledLib->actLed(0);
+    }
+    if(this->encoder->update()){
+        switch (this->encoder->getMenu()) {
+        case 1:
+            this->encoder->resetValue();
+            this->timeClient->update();
+            int day = this->timeClient->getDay();
+            int hour = this->timeClient->getHours();
+            int halfHourNb = hour > 12 ? hour - 12 : hour;
+            halfHourNb *= 2;
+            int minute = this->timeClient->getMinutes();
+            if(minute > 30){
+                halfHourNb++;
+            }
+            if(day == 2 ||  day == 5){
+                //TODO: mettre l'heure d'envoie par defaut a 22h
+            }
+            int openTime = this->encoder->getValue();
+            this->ledLib->actLed(openTime,halfHourNb);
+        break;
+        case 2:
+            this->encoder->resetValue();
+            //this->sendTime();
+        break;
+        }
+    }
     if(this->encoder->update()){
         Serial.print(this->encoder->getValue());
+        this->ledLib->actLed(this->encoder->getValue());
         Serial.print(" ");
         Serial.println(this->encoder->getMenu());
     }
+    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);
+
+    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();
 }
+
+