Giovanni-Josserand/SAE-morpion-lumineux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix reset btn

Browse Source
This commit is contained in:
Pyramond 2025-06-17 11:22:37 +02:00
parent 638b01db24
commit a7b42f70b1
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
localMode.cpp
View File

@ -28,6 +28,10 @@ bool btns[9] = { false, false, false, false, false, false, false, false, false }
bool joueur1 = true; bool joueur1 = true;
bool isBtnSet = false; bool isBtnSet = false;
unsigned long lastDebounceReset = 0;
const unsigned long debounceDelayReset = 200;
uint8_t btnPrev = LOW;
uint8_t btn;
void setBtn(Adafruit_MPR121& cap, uint16_t& lasttouched, uint16_t& currtouched){ void setBtn(Adafruit_MPR121& cap, uint16_t& lasttouched, uint16_t& currtouched){
display.clearDisplay(); display.clearDisplay();
@ -100,7 +104,6 @@ void afficheGrille() {
} }
void reset() { void reset() {
if(digitalRead(A2) == HIGH) {
Serial.println("Reset"); Serial.println("Reset");
for(int i = 0; i < 3; i++) { for(int i = 0; i < 3; i++) {
@ -110,14 +113,22 @@ void reset() {
} }
joueur1 = true; joueur1 = true;
afficheGrille(); afficheGrille();
}
void readButtonReset() {
btn = digitalRead(A2);
if (btn == LOW && btnPrev == HIGH && (millis() - lastDebounceReset > debounceDelayReset)) {
lastDebounceReset = millis();
reset();
} }
btnPrev = btn;
} }
void localModeDuo(Adafruit_MPR121& cap, uint16_t& lasttouched, uint16_t& currtouched) { void localModeDuo(Adafruit_MPR121& cap, uint16_t& lasttouched, uint16_t& currtouched) {
currtouched = cap.touched(); currtouched = cap.touched();
reset(); readButtonReset();
for (int i = 0; i < numKeys; i++) { for (int i = 0; i < numKeys; i++) {
uint8_t t = keys[i].touchID; uint8_t t = keys[i].touchID;
@ -149,7 +160,7 @@ void localModeDuo(Adafruit_MPR121& cap, uint16_t& lasttouched, uint16_t& currtou
void localModeSolo(Adafruit_MPR121& cap, uint16_t& lasttouched, uint16_t& currtouched) { void localModeSolo(Adafruit_MPR121& cap, uint16_t& lasttouched, uint16_t& currtouched) {
currtouched = cap.touched(); currtouched = cap.touched();
reset(); readButtonReset();
for (int i = 0; i < numKeys; i++) { for (int i = 0; i < numKeys; i++) {
uint8_t t = keys[i].touchID; uint8_t t = keys[i].touchID;

1
localMode.h
View File

@ -35,6 +35,7 @@ bool allInit();
void afficheGrille(); void afficheGrille();
void reset(); void reset();
void setBtn(Adafruit_MPR121& cap, uint16_t& lasttouched, uint16_t& currtouched); void setBtn(Adafruit_MPR121& cap, uint16_t& lasttouched, uint16_t& currtouched);
void readButtonReset();
void localModeDuo(Adafruit_MPR121& cap, uint16_t& lasttouched, uint16_t& currtouched); void localModeDuo(Adafruit_MPR121& cap, uint16_t& lasttouched, uint16_t& currtouched);
void localModeSolo(Adafruit_MPR121& cap, uint16_t& lasttouched, uint16_t& currtouched); void localModeSolo(Adafruit_MPR121& cap, uint16_t& lasttouched, uint16_t& currtouched);