Labouest/bouton_ouverture_V2
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

feat: ajout start led on led lib (#5)

Browse Source
This commit is contained in:
Clement 2023-10-22 00:34:20 +02:00
parent 470abe2804
commit 92943ff3e9
4 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/LedLib/include/LedLib.h
View File

@ -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); void actLed(int nb, int start = 0);
// 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

14
lib/LedLib/scr/LedLib.cpp
View File

@ -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){ void LedLib::actLed(int nb, int start){
this->ledNb = nb; this->ledNb = nb;
// On éteint tout // On éteint tout
@ -26,14 +26,18 @@ void LedLib::actLed(int nb){
// Boucle dans les LEDs // Boucle dans les LEDs
// Loop in LEDs // Loop in LEDs
for (int i = 0; i < nb+1; i++) { 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 // 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%2 == 0) { if (j%2 == 0) {
this->strip->setPixelColor(i-1, 255, 255, 255); this->strip->setPixelColor(j, 255, 255, 255);
}else{ }else{
this->strip->setPixelColor(i-1, 255, 0, 0); this->strip->setPixelColor(j, 255, 0, 0);
} }
} }
} }

11
lib/SwitchableEncodeur/src/SwitchableEncodeur.cpp
View File

@ -1,7 +1,13 @@
#include "../include/SwitchableEncodeur.h" #include "../include/SwitchableEncodeur.h"
IRAM_ATTR void switchEncoder() { 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; SwitchableEncodeur* SwitchableEncodeur::instance = nullptr;
@ -42,6 +48,9 @@ bool SwitchableEncodeur::update() {
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){
this->oldPosition = 0;
}
sortie = true; sortie = true;
} }
return sortie; return sortie;

37
src/Program.cpp
View File

@ -32,6 +32,13 @@ Program::Program() {
this->timeClient->update(); this->timeClient->update();
//this->sendTime("18h12"); //this->sendTime("18h12");
// Startup Rotary
this->encoder = new SwitchableEncodeur(ENCODER_DT, ENCODER_CLK, ENCODER_SWITCH, 3);
// Startup LEDs
this->ledLib = new LedLib(PIXEL_COUNT, PIXEL_PIN, 255);
} }
void Program::sendTime(String timeEnd){ void Program::sendTime(String timeEnd){
@ -46,27 +53,27 @@ void Program::sendTime(String timeEnd){
void Program::loop() { void Program::loop() {
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(), 5);
Serial.print(" "); Serial.print(" ");
Serial.println(this->encoder->getMenu()); Serial.println(this->encoder->getMenu());
} }
delay(1000); // delay(1000);
this->timeClient->update(); // this->timeClient->update();
int currentHour = this->timeClient->getHours(); // int currentHour = this->timeClient->getHours();
Serial.print("Hour: "); // Serial.print("Hour: ");
Serial.println(currentHour); // Serial.println(currentHour);
int currentMinute = this->timeClient->getMinutes(); // int currentMinute = this->timeClient->getMinutes();
Serial.print("Minutes: "); // Serial.print("Minutes: ");
Serial.println(currentMinute); // Serial.println(currentMinute);
int currentSecond = this->timeClient->getSeconds(); // int currentSecond = this->timeClient->getSeconds();
Serial.print("Seconds: "); // Serial.print("Seconds: ");
Serial.println(currentSecond); // Serial.println(currentSecond);
int currentDayOfWeek = this->timeClient->getDay(); // int currentDayOfWeek = this->timeClient->getDay();
Serial.print("Day of week: "); // Serial.print("Day of week: ");
Serial.println(currentDayOfWeek); // Serial.println(currentDayOfWeek);
} }