Compare commits
5 Commits
main-code
...
add--led-l
Author | SHA1 | Date | |
---|---|---|---|
19ca769294 | |||
e30902a5cf | |||
e3f98963bb | |||
aa2cb1fb4c | |||
f5e79c6405 |
@ -26,5 +26,3 @@ build_flags =
|
|||||||
|
|
||||||
-D PIXEL_PIN=4
|
-D PIXEL_PIN=4
|
||||||
-D PIXEL_COUNT=24
|
-D PIXEL_COUNT=24
|
||||||
|
|
||||||
-D RESET_TIME=60000
|
|
||||||
|
@ -3,8 +3,6 @@
|
|||||||
|
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
#include <ESP8266WiFi.h>
|
#include <ESP8266WiFi.h>
|
||||||
#include <NTPClient.h>
|
|
||||||
#include <WiFiUdp.h>
|
|
||||||
|
|
||||||
#include "DiscordAPI.h"
|
#include "DiscordAPI.h"
|
||||||
#include "SwitchableEncodeur.h"
|
#include "SwitchableEncodeur.h"
|
||||||
@ -37,17 +35,6 @@ private:
|
|||||||
DiscordAPI* discord;
|
DiscordAPI* discord;
|
||||||
|
|
||||||
LedLib* ledLib;
|
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
|
#endif
|
||||||
|
@ -11,7 +11,7 @@ public :
|
|||||||
|
|
||||||
// Fonction pour allumer correctement les LEDs en fonction du Rotary
|
// Fonction pour allumer correctement les LEDs en fonction du Rotary
|
||||||
// Function to manage LEDs colors according to the 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
|
// Fonction qui renvoie le nombre de LEDs allumées
|
||||||
// Function that returns the number of LEDs lit
|
// Function that returns the number of LEDs lit
|
||||||
|
@ -13,7 +13,7 @@ LedLib::LedLib(int pixelCount, int pixelPin, int bright){
|
|||||||
|
|
||||||
// Fonction pour allumer correctement les LEDs en fonction du Rotary
|
// Fonction pour allumer correctement les LEDs en fonction du Rotary
|
||||||
// Function to manage LEDs colors according to the 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;
|
this->ledNb = nb;
|
||||||
|
|
||||||
// On éteint tout
|
// On éteint tout
|
||||||
@ -26,11 +26,11 @@ void LedLib::actLed(int nb, int start){
|
|||||||
|
|
||||||
// Boucle dans les LEDs
|
// Boucle dans les LEDs
|
||||||
// Loop in LEDs
|
// Loop in LEDs
|
||||||
for (int i = start; i < start+nb+1; i++) {
|
for (int i = 0; i < nb+1; i++) {
|
||||||
|
|
||||||
// Une LED sur deux est blanche : heure entière, l'autre rouge pour 30m
|
// 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
|
// One LED out of two is white: whole hour, the other red for 30m
|
||||||
if (i-start%2 == 0) {
|
if (i%2 == 0) {
|
||||||
this->strip->setPixelColor(i-1, 255, 255, 255);
|
this->strip->setPixelColor(i-1, 255, 255, 255);
|
||||||
}else{
|
}else{
|
||||||
this->strip->setPixelColor(i-1, 255, 0, 0);
|
this->strip->setPixelColor(i-1, 255, 0, 0);
|
||||||
|
@ -53,7 +53,6 @@ lib_deps =
|
|||||||
; example:
|
; example:
|
||||||
; erropix/ESP32 AnalogWrite@0.2
|
; erropix/ESP32 AnalogWrite@0.2
|
||||||
adafruit/Adafruit NeoPixel@^1.11.0
|
adafruit/Adafruit NeoPixel@^1.11.0
|
||||||
arduino-libraries/NTPClient@^3.2.1
|
|
||||||
|
|
||||||
; Checker settings
|
; Checker settings
|
||||||
check_tool = clangtidy, cppcheck
|
check_tool = clangtidy, cppcheck
|
||||||
|
@ -26,79 +26,21 @@ Program::Program() {
|
|||||||
|
|
||||||
// Startup Discord API
|
// Startup Discord API
|
||||||
this->discord = new DiscordAPI(DISCORD_HOOK);
|
this->discord = new DiscordAPI(DISCORD_HOOK);
|
||||||
// startup NTP
|
delay(1000);
|
||||||
this->ntpUDP = new WiFiUDP();
|
//Serial.println(this->discord->sendHeure("10h", "18h"));
|
||||||
this->timeClient = new NTPClient(*this->ntpUDP, "pool.ntp.org", 3600*2);//*2 = gnt+2
|
|
||||||
|
|
||||||
this->timeClient->update();
|
// Startup Encoder
|
||||||
//this->sendTime("18h12");
|
this->encoder = new SwitchableEncodeur(ENCODER_DT, ENCODER_CLK, ENCODER_SWITCH, 3);
|
||||||
}
|
|
||||||
|
|
||||||
void Program::sendTime(String timeEnd){
|
// Startup LEDs
|
||||||
String start = (String)this->timeClient->getHours() + "h";
|
this->ledLib = new LedLib(PIXEL_COUNT, PIXEL_PIN, 255);
|
||||||
int startQuater = this->timeClient->getMinutes()/15;
|
|
||||||
if (startQuater != 0){
|
|
||||||
start += (String)(startQuater * 15);
|
|
||||||
}
|
|
||||||
this->discord->sendHeure(start, timeEnd);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Program::loop() {
|
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()){
|
if(this->encoder->update()){
|
||||||
Serial.print(this->encoder->getValue());
|
Serial.print(this->encoder->getValue());
|
||||||
this->ledLib->actLed(this->encoder->getValue());
|
this->ledLib->actLed(this->encoder->getValue());
|
||||||
Serial.print(" ");
|
Serial.print(" ");
|
||||||
Serial.println(this->encoder->getMenu());
|
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);
|
|
||||||
}
|
}
|
||||||
|
@ -9,5 +9,3 @@ void setup() {
|
|||||||
void loop() {
|
void loop() {
|
||||||
program->loop();
|
program->loop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user