From f78f3c5eaa5666d03c7cd4753b07aaf7db6946ae Mon Sep 17 00:00:00 2001
From: Willem Oldemans <willem@oldemans.nl>
Date: Sun, 10 Jan 2021 14:58:17 +0100
Subject: [PATCH] bugfixes, release 1.1

---
 src/chainGame.cpp | 17 +++++++++++------
 src/main.cpp      |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/chainGame.cpp b/src/chainGame.cpp
index a7200d8..abb3f50 100644
--- a/src/chainGame.cpp
+++ b/src/chainGame.cpp
@@ -45,22 +45,27 @@ void ResetChainGame(void)
   patternIndex = 0;
   patternFlag = false;
   firstpattern = false;
-  cheatbutton = NONE;
+  cheatbutton = 0;
   cheatButtonFlag = false;
 }
 
 void HandleChainGame(void)
 {
-  if (buttonIsPressed(ledpattern[patternIndex]) && !cheatButtonFlag)
+  if (buttonIsPressed(ledpattern[patternIndex]) && !patternFlag && !cheatButtonFlag)
   {
     turnOnLed(ledpattern[patternIndex]);
     patternFlag = true;
+    cheatbutton = 0;
   }
   else if (buttonIsPressed(cheatbutton) && !patternFlag && !cheatButtonFlag)
   {
     turnOnLed(cheatbutton);
     cheatButtonFlag = true;
   }
+  else if (anybutton() && !patternFlag && !cheatButtonFlag )
+  {
+    cheatbutton = 0;
+  }
 
   if (!buttonIsPressed(ledpattern[patternIndex]))
   {
@@ -71,7 +76,7 @@ void HandleChainGame(void)
   {
     turnOffLed(cheatbutton);
     cheatButtonFlag = false;
-    cheatbutton = NONE;
+    cheatbutton = 0;
   }
 
   if (!anybutton())
@@ -85,15 +90,15 @@ void HandleChainGame(void)
   }
   
   //check cheatbuttons
-  if (buttonIsPressed(1) && (cheatbutton == NONE))
+  if (buttonIsPressed(4) && (cheatbutton == 0))
   {
     cheatbutton = 1;
   }
-  else if (buttonIsPressed(2) && (cheatbutton == NONE))
+  else if (buttonIsPressed(5) && (cheatbutton == 0))
   {
     cheatbutton = 2;
   }
-  else if (buttonIsPressed(3) && (cheatbutton == NONE))
+  else if (buttonIsPressed(6) && (cheatbutton == 0))
   {
     cheatbutton = 3;
   }
diff --git a/src/main.cpp b/src/main.cpp
index 3df5bf9..9e8bf26 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -8,7 +8,7 @@
 #include "led.h"
 
 #define TIMEOUT 15000          // 15sec * 1000ms
-#define GAMESELECTTIMEOUT 7000 // 7sec * 1000ms
+#define GAMESELECTTIMEOUT 5000 // 7sec * 1000ms
 
 typedef enum
 {