From 5e5ff8350675d87f6207c675f91fefa49b6650bd Mon Sep 17 00:00:00 2001 From: Robin Cerny Date: Sun, 20 Apr 2025 03:09:39 +0200 Subject: [PATCH] prevent Team buttons being pushed in a running fight --- ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino b/ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino index 02fd850..a8d65a5 100644 --- a/ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino +++ b/ROFLS_Arena_Controller/ROFLS_Arena_Controller.ino @@ -165,7 +165,9 @@ void OnDataRecv(const uint8_t * mac, const uint8_t *incomingData, int len) { // RED team button // ignore button input if in rumble mode if (!switchRUMBLE.on()) { - buttonREDTEAMvar = receiveDATA.buttonREDTEAM; + if (!FightCountDown.isRunning()) { + buttonREDTEAMvar = receiveDATA.buttonREDTEAM; + } buttonREDTEAMtapout = receiveDATA.buttonREDTEAMtapout; } break; @@ -173,7 +175,9 @@ void OnDataRecv(const uint8_t * mac, const uint8_t *incomingData, int len) { // BLUE team button // ignore button input if in rumble mode if (!switchRUMBLE.on()) { - buttonBLUETEAMvar = receiveDATA.buttonBLUETEAM; + if (!FightCountDown.isRunning()) { + buttonBLUETEAMvar = receiveDATA.buttonBLUETEAM; + } buttonBLUETEAMtapout = receiveDATA.buttonBLUETEAMtapout; } break;