Airsoft/DarkEmergency-Timer
Airsoft/DarkEmergency-Timer
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

changed Pinning of Triggers because of boot-gpios

Browse Source
This commit is contained in:
Marcel Peterkau 2021-06-10 23:40:11 +02:00
parent 243f5ce1c8
commit 763affded1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main.cpp
View File

@ -17,14 +17,14 @@
#include "defaults.h" #include "defaults.h"
// Module connection pins (ESP GPIO-Nums) // Module connection pins (ESP GPIO-Nums)
#define CLK 2 #define CLK 16
#define DIO_FAC_1_7SEG 0 #define DIO_FAC_1_7SEG 14
#define DIO_FAC_2_7SEG 5 #define DIO_FAC_2_7SEG 12
#define DIO_FAC_3_7SEG 4 #define DIO_FAC_3_7SEG 13
#define DIO_FAC_1_TRG 12 #define DIO_FAC_1_TRG 0
#define DIO_FAC_2_TRG 13 #define DIO_FAC_2_TRG 2
#define DIO_FAC_3_TRG 14 #define DIO_FAC_3_TRG 15
enum Factions enum Factions
{ {
@ -260,7 +260,7 @@ void inputGetterTicker_callback()
{ {
activeFaction = NONE; activeFaction = NONE;
if (digitalRead(DIO_FAC_1_TRG) + digitalRead(DIO_FAC_2_TRG) + digitalRead(DIO_FAC_3_TRG) < 2) if (digitalRead(DIO_FAC_1_TRG) + digitalRead(DIO_FAC_2_TRG) + !digitalRead(DIO_FAC_3_TRG) < 2)
{ {
Serial.println("ERROR: More than one Flag active"); Serial.println("ERROR: More than one Flag active");
return; return;
@ -272,7 +272,7 @@ void inputGetterTicker_callback()
if (digitalRead(DIO_FAC_2_TRG) == LOW) if (digitalRead(DIO_FAC_2_TRG) == LOW)
activeFaction = FACTION_2; activeFaction = FACTION_2;
if (digitalRead(DIO_FAC_3_TRG) == LOW) if (digitalRead(DIO_FAC_3_TRG) == HIGH)
activeFaction = FACTION_3; activeFaction = FACTION_3;
} }
@ -280,7 +280,7 @@ void setup()
{ {
pinMode(DIO_FAC_1_TRG, INPUT_PULLUP); pinMode(DIO_FAC_1_TRG, INPUT_PULLUP);
pinMode(DIO_FAC_2_TRG, INPUT_PULLUP); pinMode(DIO_FAC_2_TRG, INPUT_PULLUP);
pinMode(DIO_FAC_3_TRG, INPUT_PULLUP); pinMode(DIO_FAC_3_TRG, INPUT);
Serial.begin(9600); Serial.begin(9600);
Serial.print("\n\n\n"); Serial.print("\n\n\n");