Mirrors/cartreader
2
0
Fork 0
mirror of https://github.com/sanni/cartreader.git synced 2024-11-30 00:14:15 +01:00
Code Issues Projects Releases Wiki Activity

remove duplicate code for checking pin number

Browse Source
This commit is contained in:
smesgr9000 2024-05-11 23:44:40 +02:00
parent 74352c6e31
commit 7ba32d24fc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cart_Reader/Cart_Reader.ino
View File

@ -1361,6 +1361,10 @@ void mainMenu() {
Self Test Self Test
*****************************************/ *****************************************/
#ifdef ENABLE_SELFTEST #ifdef ENABLE_SELFTEST
// Check if given pin number is one of pins 2-9, 14-17, 22-37, 42-49, 54-69
bool isPin_2t9_14t17_22t37_42t49_54t69(byte pinNumber) {
return ((2 <= pinNumber) && (pinNumber <= 9)) || ((14 <= pinNumber) && (pinNumber <= 17)) || ((22 <= pinNumber) && (pinNumber <= 37)) || ((42 <= pinNumber) && (pinNumber <= 49)) || ((54 <= pinNumber) && (pinNumber <= 69));
}
void selfTest() { void selfTest() {
#ifdef ENABLE_VSELECT #ifdef ENABLE_VSELECT
@ -1412,14 +1416,14 @@ void selfTest() {
// Set pins 2-9, 14-17, 22-37, 42-49, 54-69 to input and activate internal pull-up resistors // Set pins 2-9, 14-17, 22-37, 42-49, 54-69 to input and activate internal pull-up resistors
for (byte pinNumber = 2; pinNumber <= 69; pinNumber++) { for (byte pinNumber = 2; pinNumber <= 69; pinNumber++) {
if (((2 <= pinNumber) && (pinNumber <= 9)) || ((14 <= pinNumber) && (pinNumber <= 17)) || ((22 <= pinNumber) && (pinNumber <= 37)) || ((42 <= pinNumber) && (pinNumber <= 49)) || ((54 <= pinNumber) && (pinNumber <= 69))) { if (isPin_2t9_14t17_22t37_42t49_54t69(pinNumber)) {
pinMode(pinNumber, INPUT_PULLUP); pinMode(pinNumber, INPUT_PULLUP);
} }
} }
// Tests pins 2-9, 14-17, 22-37, 42-49, 54-69 for short to GND // Tests pins 2-9, 14-17, 22-37, 42-49, 54-69 for short to GND
for (byte pinNumber = 2; pinNumber <= 69; pinNumber++) { for (byte pinNumber = 2; pinNumber <= 69; pinNumber++) {
if (((2 <= pinNumber) && (pinNumber <= 9)) || ((14 <= pinNumber) && (pinNumber <= 17)) || ((22 <= pinNumber) && (pinNumber <= 37)) || ((42 <= pinNumber) && (pinNumber <= 49)) || ((54 <= pinNumber) && (pinNumber <= 69))) { if (isPin_2t9_14t17_22t37_42t49_54t69(pinNumber)) {
if (!digitalRead(pinNumber)) { if (!digitalRead(pinNumber)) {
setColor_RGB(255, 0, 0); setColor_RGB(255, 0, 0);
errorLvl = 1; errorLvl = 1;
@ -1445,11 +1449,11 @@ void selfTest() {
// Test for short between pins 2-9, 14-17, 22-37, 42-49, 54-69 // Test for short between pins 2-9, 14-17, 22-37, 42-49, 54-69
for (byte pinNumber = 2; pinNumber <= 69; pinNumber++) { for (byte pinNumber = 2; pinNumber <= 69; pinNumber++) {
if (((2 <= pinNumber) && (pinNumber <= 9)) || ((14 <= pinNumber) && (pinNumber <= 17)) || ((22 <= pinNumber) && (pinNumber <= 37)) || ((42 <= pinNumber) && (pinNumber <= 49)) || ((54 <= pinNumber) && (pinNumber <= 69))) { if (isPin_2t9_14t17_22t37_42t49_54t69(pinNumber)) {
pinMode(pinNumber, OUTPUT); pinMode(pinNumber, OUTPUT);
digitalWrite(pinNumber, LOW); digitalWrite(pinNumber, LOW);
for (byte pinNumber2 = 2; pinNumber2 <= 69; pinNumber2++) { for (byte pinNumber2 = 2; pinNumber2 <= 69; pinNumber2++) {
if ((((2 <= pinNumber2) && (pinNumber2 <= 9)) || ((14 <= pinNumber2) && (pinNumber2 <= 17)) || ((22 <= pinNumber2) && (pinNumber2 <= 37)) || ((42 <= pinNumber2) && (pinNumber2 <= 49)) || ((54 <= pinNumber2) && (pinNumber2 <= 69))) && (pinNumber != pinNumber2)) { if (isPin_2t9_14t17_22t37_42t49_54t69(pinNumber2) && (pinNumber != pinNumber2)) {
pinMode(pinNumber2, INPUT_PULLUP); pinMode(pinNumber2, INPUT_PULLUP);
if (!digitalRead(pinNumber2)) { if (!digitalRead(pinNumber2)) {
setColor_RGB(255, 0, 0); setColor_RGB(255, 0, 0);