adrian/pingpong-counter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: adrian:f78e734a5a4fdb01a80040a15e9177fcc5c4d957
Branches Tags
adrian:master
...
compare: adrian:master
Branches Tags
adrian:master

1 Commits
f78e734a5a ... master

Author SHA1 Message Date
Adrian Jaroszewski
70a41b3917 Fixed missing curly brace (wouldn't compile) 
Fixed bug where holding down button decreased score until 0
 2026-02-19 19:30:06 -05:00
1 changed files with 48 additions and 45 deletions
Expand all files Collapse all files

79
src/main.cpp
View File

@@ -92,28 +92,30 @@ void loop() {
if (digitalRead(B1_IN) == 0) { if (digitalRead(B1_IN) == 0) {
while (digitalRead(B1_IN) == 0) { while (digitalRead(B1_IN) == 0) {
while (digitalRead(B2_IN) == 0) {} // Only execute remove point on button release. if (digitalRead(B2_IN) == 0) {
while (digitalRead(B2_IN) == 0) {} // Only execute remove point on button release.
if (checkWin(score, 1) == 0) { if (checkWin(score, 1) == 0) {
removePoint(score, 1);
displayOut[2] = setServeChar(servingChar, score, serving);
game = true;
}
else {
if (checkWin(score, 0) == 0) {}
else {
removePoint(score, 1); removePoint(score, 1);
displayOut[2] = setServeChar(servingChar, score, serving);
if (checkWin(score, 0) == 0) { game = true;
displayOut[2] = servingChar;
game = false;
} }
else {} else {
} if (checkWin(score, 0) == 0) {}
} else {
removePoint(score, 1);
setDisplay(score, &matrix, displayOut); if (checkWin(score, 0) == 0) {
delay(500); // to avoid calling twice. displayOut[2] = servingChar;
game = false;
}
else {}
}
}
setDisplay(score, &matrix, displayOut);
delay(500); // to avoid calling twice.
}
} // Only execute add point on button release. Point removal if other button is pressed during while loop. } // Only execute add point on button release. Point removal if other button is pressed during while loop.
if (game == true) { if (game == true) {
@@ -135,28 +137,30 @@ void loop() {
if (digitalRead(B2_IN) == 0) { if (digitalRead(B2_IN) == 0) {
while (digitalRead(B2_IN) == 0) { while (digitalRead(B2_IN) == 0) {
while (digitalRead(B1_IN) == 0) {} // Only execute remove point on button release. if (digitalRead(B1_IN) == 0) {
while (digitalRead(B1_IN) == 0) {} // Only execute remove point on button release.
if (checkWin(score, 0) == 0) { if (checkWin(score, 0) == 0) {
removePoint(score, 0);
displayOut[2] = setServeChar(servingChar, score, serving);
game = true;
}
else {
if (checkWin(score, 1) == 0) {}
else {
removePoint(score, 0); removePoint(score, 0);
displayOut[2] = setServeChar(servingChar, score, serving);
if (checkWin(score, 1) == 0) { game = true;
displayOut[2] = servingChar;
game = false;
} }
else {} else {
} if (checkWin(score, 1) == 0) {}
} else {
removePoint(score, 0);
setDisplay(score, &matrix, displayOut); if (checkWin(score, 1) == 0) {
delay(500); // to avoid calling twice. displayOut[2] = servingChar;
game = false;
}
else {}
}
}
setDisplay(score, &matrix, displayOut);
delay(500); // to avoid calling twice.
}
} // Only execute add point on button release. Point removal if other button is pressed during while loop. } // Only execute add point on button release. Point removal if other button is pressed during while loop.
if (game == true) { if (game == true) {
@@ -174,7 +178,7 @@ void loop() {
delay(500); // to avoid calling twice delay(500); // to avoid calling twice
} }
} }
}
} }
// put function definitions here: // put function definitions here:
@@ -196,4 +200,3 @@ void setDisplay(int* score, MD_Parola* matrix, char* displayOut) {
matrix->print(displayOut); matrix->print(displayOut);
} }