Compare commits

..

2 Commits

Author SHA1 Message Date
21d139465d add blink at end setup 2023-10-27 20:53:28 +02:00
0a6aafd362 Fix led OK 2023-10-27 20:52:04 +02:00
7 changed files with 24 additions and 125 deletions

View File

@ -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

1
docs/.gitignore vendored
View File

@ -1 +0,0 @@
output

View File

@ -10,12 +10,7 @@
#include "SwitchableEncodeur.h" #include "SwitchableEncodeur.h"
#include "LedLib.h" #include "LedLib.h"
enum MainMenu{
INITIAL_STATE,
GET_START_HOUR,
SELECT_END_HOUR,
SEND_TO_DISCORD
};
class Program { class Program {
public: public:
@ -51,19 +46,6 @@ private:
* @param[in] timeEnd LabOuest closing time * @param[in] timeEnd LabOuest closing time
*/ */
void sendTime(String timeEnd); 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 #endif

View File

@ -28,7 +28,7 @@ void LedLib::actLed(int nb, int start){
// Loop in LEDs // Loop in LEDs
for (int i = start; i <= nb+start-1; i++) { for (int i = start; i <= nb+start-1; i++) {
int j = i; int j = i;
if(j >= 24){ if(j > 24){
j -= 24; j -= 24;
} }

View File

@ -39,13 +39,6 @@ public:
*/ */
int getValue(); int getValue();
/**
* @brief set the encodeur value
*
* @param val the new encodeur value
*/
void setValue(int val);
/** /**
* @brief update the encodeur value * @brief update the encodeur value
* *

View File

@ -45,14 +45,10 @@ SwitchableEncodeur* SwitchableEncodeur::getInstance() {
bool SwitchableEncodeur::update() { bool SwitchableEncodeur::update() {
bool sortie = false; bool sortie = false;
long newPosition = this->read()/4; long newPosition = this->read()/4;
if(newPosition < 0){
newPosition = 0;
this->readAndReset();
}
if (newPosition != this->oldPosition || this->menu != this->oldMenu) { if (newPosition != this->oldPosition || this->menu != this->oldMenu) {
this->oldMenu = this->menu; this->oldMenu = this->menu;
this->oldPosition = newPosition; this->oldPosition = newPosition;
if(this->oldPosition <= 0){ if(this->oldPosition < 0){
this->oldPosition = 0; this->oldPosition = 0;
} }
sortie = true; sortie = true;
@ -66,9 +62,4 @@ int SwitchableEncodeur::getValue() {
void SwitchableEncodeur::resetValue() { void SwitchableEncodeur::resetValue() {
this->oldPosition = 0; this->oldPosition = 0;
this->readAndReset();
}
void SwitchableEncodeur::setValue(int val){
this->write(val*4);
} }

View File

@ -28,9 +28,10 @@ Program::Program() {
this->discord = new DiscordAPI(DISCORD_HOOK); this->discord = new DiscordAPI(DISCORD_HOOK);
// startup NTP // startup NTP
this->ntpUDP = new WiFiUDP(); 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->timeClient->update();
//this->sendTime("18h12");
// Startup Rotary // Startup Rotary
this->encoder = new SwitchableEncodeur(ENCODER_DT, ENCODER_CLK, ENCODER_SWITCH, 3); this->encoder = new SwitchableEncodeur(ENCODER_DT, ENCODER_CLK, ENCODER_SWITCH, 3);
@ -40,8 +41,6 @@ Program::Program() {
this->ledLib->okBlink(); this->ledLib->okBlink();
this->menu=MainMenu::INITIAL_STATE;
this->resetMillis = 0;
} }
void Program::sendTime(String timeEnd){ void Program::sendTime(String timeEnd){
@ -51,93 +50,30 @@ void Program::sendTime(String timeEnd){
start += (String)(startQuater * 15); start += (String)(startQuater * 15);
} }
this->discord->sendHeure(start, timeEnd); this->discord->sendHeure(start, timeEnd);
this->nLedStart = 0;
this->pm = false;
} }
void Program::loop() { 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->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(), 5);
Serial.print(" ");
Serial.println(this->encoder->getMenu());
} }
if(this->encoder->getMenu() == 2 && this->menu == MainMenu::SELECT_END_HOUR){//validation du choix de l'heure // delay(1000);
this->menu = MainMenu::SEND_TO_DISCORD;
} // this->timeClient->update();
}
// Reseteur // int currentHour = this->timeClient->getHours();
if(this->resetMillis + RESET_TIME == millis()){ // Serial.print("Hour: ");
this->encoder->resetMenu(); // Serial.println(currentHour);
this->resetMillis = millis();
this->menu = MainMenu::INITIAL_STATE; // int currentMinute = this->timeClient->getMinutes();
} // Serial.print("Minutes: ");
//TODO: gestion cas d'erreur (pas de wifi, discord down,...) // Serial.println(currentMinute);
//TODO: gestion d'une ouverture de plus de 12h avec les led (chagement de couleur)
// int currentSecond = this->timeClient->getSeconds();
// Serial.print("Seconds: ");
// Serial.println(currentSecond);
// int currentDayOfWeek = this->timeClient->getDay(); // int currentDayOfWeek = this->timeClient->getDay();
// Serial.print("Day of week: "); // Serial.print("Day of week: ");