Fixes #2728: edge switch could trigger right after the logicalSwitchesReset() was called

2015-08-18 20:03:54 +02:00
parent b10276bb34
commit 537d7e089f
1 changed files with 7 additions and 0 deletions
@@ -835,6 +835,13 @@ void logicalSwitchesTimerTick()
 #if defined(CPUARM)
      else if (ls->func == LS_FUNC_EDGE) {
        ls_stay_struct & lastValue = (ls_stay_struct &)LS_LAST_VALUE(fm, i);
+        // if this ls was reset by the logicalSwitchesReset() the lastValue will be set to CS_LAST_VALUE_INIT(0x8000)
+        // when it is unpacked into ls_stay_struct the lastValue.duration will have a value of 0x4000
+        // this will produce an instant true for edge logical switch if the second parameter is big enough.
+        // So we reset it here.
+        if (LS_LAST_VALUE(fm, i) == CS_LAST_VALUE_INIT) {
+          lastValue.duration = 0;
+        }
        lastValue.state = false;
        bool state = getSwitch(ls->v1);
        if (state) {