diff --git a/FW/leo_muziekdoos_esp32/data/settings.json b/FW/leo_muziekdoos_esp32/data/settings.json index dfd3493..cf2fb43 100644 --- a/FW/leo_muziekdoos_esp32/data/settings.json +++ b/FW/leo_muziekdoos_esp32/data/settings.json @@ -25,7 +25,7 @@ "AudioGain": 0.5, "ScanTimeout": 50, "HardwareVersion": 2, - "GameTimeout": 10000, + "GameTimeout": 20000, "PowerTimeout": 420000, "PowerOTADelay": 4000, "Brightness": 20 diff --git a/FW/leo_muziekdoos_esp32/platformio.ini b/FW/leo_muziekdoos_esp32/platformio.ini index 1a326e2..788dd12 100644 --- a/FW/leo_muziekdoos_esp32/platformio.ini +++ b/FW/leo_muziekdoos_esp32/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [env] -src_filter = +<*> -<.git/> -<.svn/> - - - - +build_src_filter = +<*> -<.git/> -<.svn/> - - - - [env:esp32-pico] @@ -22,7 +22,7 @@ lib_deps = fastled/FastLED@^3.5.0 #robtillaart/AS5600 @ ^0.3.4 robtillaart/AS5600 @ ^0.3.6 -src_filter = ${env.build_src_filter} +build_src_filter = ${env.build_src_filter} lib_ldf_mode = deep+ build_flags = -DHARDWARE=2 diff --git a/FW/leo_muziekdoos_esp32/src/game.cpp b/FW/leo_muziekdoos_esp32/src/game.cpp index 507160c..6953619 100644 --- a/FW/leo_muziekdoos_esp32/src/game.cpp +++ b/FW/leo_muziekdoos_esp32/src/game.cpp @@ -4,6 +4,7 @@ bool newState = true; uint32_t idleTime = 0; +uint32_t gameTimeout = 0; @@ -24,6 +25,7 @@ GameStates gameState = GameStates::stateInit; void initGame(void) { + gameTimeout = GetIntparam("GameTimeout", TIMEOUT_ARMED); log_i("Game: init: done"); } @@ -151,7 +153,7 @@ void handleGame(void) else { uint32_t now = millis(); - if(now - idleTime > TIMEOUT_ARMED) + if(now - idleTime > gameTimeout) { log_i("Armed timed-out, clear current UID and go back to Idle"); clearRFIDlastUID(); diff --git a/FW/leo_muziekdoos_esp32/src/game.h b/FW/leo_muziekdoos_esp32/src/game.h index 32a7079..280cc47 100644 --- a/FW/leo_muziekdoos_esp32/src/game.h +++ b/FW/leo_muziekdoos_esp32/src/game.h @@ -9,7 +9,7 @@ #include "power.h" #define TIMEOUT_IDLE 20000 -#define TIMEOUT_ARMED 10000 +#define TIMEOUT_ARMED 20000 typedef enum{ stateInit,