From 4c6b4dd0610a0ce057ea033ad5a41d520e625acf Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Sun, 27 Jan 2013 21:58:34 +0000
Subject: [PATCH] [ARM] Custom switches delays and durations reworked. Not
 tested.

---
 src/open9x.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/open9x.cpp b/src/open9x.cpp
index c7fa38fdf..a891f713d 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -711,8 +711,9 @@ volatile GETSWITCH_RECURSIVE_TYPE s_last_switch_value;
 /* recursive function. stack as of today (16/03/2012) grows by 8bytes at each call, which is ok! */
 
 #if defined(CPUARM)
-uint32_t delays[NUM_CSW];
-uint32_t durations[NUM_CSW];
+uint32_t cswDelays[NUM_CSW];
+uint32_t cswDurations[NUM_CSW];
+uint8_t  cswStates[NUM_CSW];
 #endif
 
 int16_t csLastValue[NUM_CSW];
@@ -862,22 +863,19 @@ bool __getSwitch(int8_t swtch)
 #if defined(CPUARM)
     if (cs->delay) {
       if (result) {
-        if (delays[cs_idx] > get_tmr10ms())
+        if (cswDelays[cs_idx] > get_tmr10ms())
           result = false;
       }
       else {
-        delays[cs_idx] = get_tmr10ms() + (cs->delay*50);
+        cswDelays[cs_idx] = get_tmr10ms() + (cs->delay*50);
       }
     }
     if (cs->duration) {
-      if (!result) {
-        if (durations[cs_idx] > get_tmr10ms()) {
-          result = true;
-          if (cs->delay) delays[cs_idx] = get_tmr10ms() + (cs->delay*50);
-        }
-      }
-      else {
-        durations[cs_idx] = get_tmr10ms() + (cs->duration*50);
+      if (result && !cswStates[cs_idx])
+        cswDurations[cs_idx] = get_tmr10ms() + (cs->duration*50);
+      if (cswDurations[cs_idx] > get_tmr10ms()) {
+        result = true;
+        if (cs->delay) cswDelays[cs_idx] = get_tmr10ms() + (cs->delay*50);
       }
     }