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

#fix action BP

Browse Source
This commit is contained in:
Laurent Claude 2023-09-03 20:36:52 +02:00
parent dc76d0fad2
commit ffa4c5b006
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
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
@ -84,12 +81,12 @@ void loop() {
display.setTextColor(SSD1306_WHITE); // Draw white text display.setTextColor(SSD1306_WHITE); // Draw white text
unsigned long currentMillis = millis(); unsigned long currentMillis = millis();
if (decompteStatut) { if (statutDecompte) {
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,7 +94,7 @@ void loop() {
} }
} }
else { else {
decompteStatut = 0; statutDecompte = 0;
} }
} }
else { else {
@ -119,10 +116,10 @@ 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;
} }
digitalWrite(SORTIE_RELAIS, decompteStatut); digitalWrite(SORTIE_RELAIS, statutDecompte);
} }