5 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
92943ff3e9 feat: ajout start led on led lib (#5) 2023-10-22 00:34:20 +02:00
470abe2804 feat: add-ntp-support (#4) 2023-10-21 19:14:00 +02:00
8edae04556 feat: led-lib (#3) 2023-10-20 20:51:54 +02:00
9 changed files with 179 additions and 5 deletions

View File

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

View File

@ -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,17 @@ private:
long oldPosition;
DiscordAPI* discord;
LedLib* ledLib;
WiFiUDP* ntpUDP;
NTPClient* timeClient;
/**
* @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

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

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

@ -0,0 +1,68 @@
#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 <= 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
// One LED out of two is white: whole hour, the other red for 30m
if (j%2 == 0) {
this->strip->setPixelColor(j, 255, 255, 255);
}else{
this->strip->setPixelColor(j, 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(){
this->strip->clear();
for(int i = 0; i < 3; i++){
for(int j = 0; j < 24; j++){
this->strip->setPixelColor(j, 0, 255, 0);
}
this->strip->show();
delay(100);
this->strip->clear();
this->strip->show();
delay(100);
}
}

View File

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

View File

@ -1,7 +1,13 @@
#include "../include/SwitchableEncodeur.h"
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;
@ -13,6 +19,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,8 +45,12 @@ 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;
if(this->oldPosition < 0){
this->oldPosition = 0;
}
sortie = true;
}
return sortie;

View File

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

View File

@ -26,17 +26,56 @@ Program::Program() {
// Startup Discord API
this->discord = new DiscordAPI(DISCORD_HOOK);
delay(1000);
//Serial.println(this->discord->sendHeure("10h", "18h"));
// startup NTP
this->ntpUDP = new WiFiUDP();
this->timeClient = new NTPClient(*this->ntpUDP, "pool.ntp.org", 3600*2);//*2 = gnt+2
// Startup Encoder
this->timeClient->update();
//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);
this->ledLib->okBlink();
}
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() {
if(this->encoder->update()){
Serial.print(this->encoder->getValue());
this->ledLib->actLed(this->encoder->getValue(), 5);
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);
}

View File

@ -9,3 +9,5 @@ void setup() {
void loop() {
program->loop();
}