K/minuteur-esp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: K:dc76d0fad23185da8785d11ca3e80183b979f60c
Branches Tags
K:main
K:dev_D1Mini
..
compare: K:ecf8711e54e4d3f93908062651636fb818088fc1
Branches Tags
K:main
K:dev_D1Mini

2 Commits
dc76d0fad2 ... ecf8711e54

Author SHA1 Message Date
Laurent Claude
ecf8711e54 ajustement première seconde de décompte, 
reprise au temps en cours,
temps par défaut à l'allumage 12 sec
 2023-09-05 11:19:42 +02:00
Laurent Claude
ffa4c5b006 #fix action BP 2023-09-03 20:36:52 +02:00
1 changed files with 32 additions and 21 deletions
Show Stats Expand all files Collapse all files

53
src/main.cpp
View File

@ -14,16 +14,13 @@
#define SCREEN_ADDRESS 0x3C ///< See datasheet for Address; 0x3D for 128x64, 0x3C for 128x32 #define SCREEN_ADDRESS 0x3C ///< See datasheet for Address; 0x3D for 128x64, 0x3C for 128x32
Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET); Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);
#define SDA 4 //#define SDA 4
#define SCL 5 //#define SCL 5
#define SORTIE_RELAIS 1 #define SORTIE_RELAIS 16
#define LED_FLASH 4 #define ENCROT_A 12
//#define LED_BUILTIN 33 #define ENCROT_B 13
#define ENCROT_BP 14
#define ENCROT_A 2
#define ENCROT_B 0
#define ENCROT_BP 3
// Setup a RotaryEncoder with 2 steps per latch for the 2 signal input pins: // Setup a RotaryEncoder with 2 steps per latch for the 2 signal input pins:
RotaryEncoder encoder(ENCROT_A, ENCROT_B, RotaryEncoder::LatchMode::TWO03); RotaryEncoder encoder(ENCROT_A, ENCROT_B, RotaryEncoder::LatchMode::TWO03);
@ -31,8 +28,8 @@ RotaryEncoder encoder(ENCROT_A, ENCROT_B, RotaryEncoder::LatchMode::TWO03);
// durée par défaut en secondes // durée par défaut en secondes
int count = 12; int count = 12;
bool decompteStatut = false; bool statutDecompte = 0;
unsigned long LastUpdate = 0; unsigned long LastUpdateTimer = 0;
unsigned long LastReadBP = 0; unsigned long LastReadBP = 0;
#define LOGO_HEIGHT 32 #define LOGO_HEIGHT 32
@ -66,6 +63,7 @@ void setup() {
for(;;); // Don't proceed, loop forever for(;;); // Don't proceed, loop forever
} }
encoder.setPosition(count);
// Clear the buffer // Clear the buffer
display.clearDisplay(); display.clearDisplay();
@ -83,13 +81,14 @@ void loop() {
display.setTextSize(6); display.setTextSize(6);
display.setTextColor(SSD1306_WHITE); // Draw white text display.setTextColor(SSD1306_WHITE); // Draw white text
unsigned long currentMillis = millis(); unsigned long currentMillis = millis();
int newPos;
if (decompteStatut) { if (statutDecompte) { // on est en mode de compte à rebours
if (count > 0) { if (count > 0) {
if (currentMillis - LastUpdate >= 1000) { if (currentMillis - LastUpdateTimer >= 1000) {
--count; LastUpdateTimer = currentMillis;
LastUpdate = currentMillis;
--count;
display.clearDisplay(); display.clearDisplay();
display.setCursor(0, 20); display.setCursor(0, 20);
display.println(count); display.println(count);
@ -97,14 +96,20 @@ void loop() {
} }
} }
else { else {
decompteStatut = 0; statutDecompte = 0;
count = encoder.getPosition();
display.clearDisplay();
display.setCursor(0, 20);
display.println(count);
display.display();
} }
} }
else { else { // on est en mode réglage / pause
static int pos = 0; static int pos = 0;
encoder.tick(); encoder.tick();
int newPos = encoder.getPosition(); newPos = encoder.getPosition();
if (pos != newPos) { if (pos != newPos) {
if (newPos < 0) { if (newPos < 0) {
newPos = 0; newPos = 0;
@ -119,10 +124,16 @@ void loop() {
} // if } // if
} }
if (!digitalRead(ENCROT_BP) && (LastReadBP - currentMillis > 250)){ if (digitalRead(ENCROT_BP) && (currentMillis - LastReadBP > 250)){
LastReadBP = currentMillis; LastReadBP = currentMillis;
decompteStatut = !decompteStatut; statutDecompte = !statutDecompte;
if (statutDecompte) {
LastUpdateTimer = currentMillis;
}
else {
encoder.setPosition(count);
}
} }
digitalWrite(SORTIE_RELAIS, decompteStatut); digitalWrite(SORTIE_RELAIS, statutDecompte);
} }