feat: led-lib #3

Merged
Clement merged 5 commits from add--led-lib into master 2023-10-20 18:51:55 +00:00
8 changed files with 126 additions and 1 deletions

View File

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

View File

@ -6,6 +6,7 @@
#include "DiscordAPI.h" #include "DiscordAPI.h"
#include "SwitchableEncodeur.h" #include "SwitchableEncodeur.h"
#include "LedLib.h"
@ -32,6 +33,8 @@ private:
long oldPosition; long oldPosition;
DiscordAPI* discord; DiscordAPI* discord;
LedLib* ledLib;
}; };
#endif #endif

View File

@ -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);
// 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

77
lib/LedLib/scr/LedLib.cpp Normal file
View File

@ -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){
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 = 0; i < 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%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();
}
}

View File

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

View File

@ -13,6 +13,7 @@ SwitchableEncodeur::SwitchableEncodeur(uint8_t pin1, uint8_t pin2, uint8_t pinSW
pinMode(pinSW, INPUT_PULLUP); pinMode(pinSW, INPUT_PULLUP);
attachInterrupt(digitalPinToInterrupt(pinSW), switchEncoder, RISING);//FIXME: maybe change to FALLING attachInterrupt(digitalPinToInterrupt(pinSW), switchEncoder, RISING);//FIXME: maybe change to FALLING
this->oldPosition = -999; this->oldPosition = -999;
this->oldMenu = -999;
} }
@ -38,7 +39,8 @@ 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 != this->oldPosition) { if (newPosition != this->oldPosition || this->menu != this->oldMenu) {
this->oldMenu = this->menu;
this->oldPosition = newPosition; this->oldPosition = newPosition;
sortie = true; sortie = true;
} }

View File

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

View File

@ -31,11 +31,15 @@ Program::Program() {
// Startup Encoder // Startup Encoder
this->encoder = new SwitchableEncodeur(ENCODER_DT, ENCODER_CLK, ENCODER_SWITCH, 3); this->encoder = new SwitchableEncodeur(ENCODER_DT, ENCODER_CLK, ENCODER_SWITCH, 3);
// Startup LEDs
this->ledLib = new LedLib(PIXEL_COUNT, PIXEL_PIN, 255);
} }
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());
Serial.print(" "); Serial.print(" ");
Serial.println(this->encoder->getMenu()); Serial.println(this->encoder->getMenu());
} }