mperror.c: Move noticing of the next heartbeat transition (#236)

The place at which the time for the next transition is noticed moves from the start of the respective block to it's end, when the RGB led has switched. Co-authored-by: robert-hh <[email protected]>
pycom · Apr 10, 2021 · da8c822 · da8c822
1 parent e6f4eb6
commit da8c822
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/esp32/util/mperror.c b/esp32/util/mperror.c
@@ -130,16 +130,18 @@ bool mperror_heartbeat_signal (void) {
         mperror_heart_beat.do_disable = false;
     } else if (mperror_heart_beat.enabled) {
         if (!mperror_heart_beat.beating) {
-            if ((mperror_heart_beat.on_time = mp_hal_ticks_ms_non_blocking()) - mperror_heart_beat.off_time > MPERROR_HEARTBEAT_OFF_MS) {
+            if (mp_hal_ticks_ms_non_blocking() > mperror_heart_beat.off_time) {
                 led_info.color.value = MPERROR_HEARTBEAT_COLOR;
-                led_set_color(&led_info, false, false);
+                led_set_color(&led_info, true, false);
                 mperror_heart_beat.beating = true;
+                mperror_heart_beat.on_time = mp_hal_ticks_ms_non_blocking() + MPERROR_HEARTBEAT_ON_MS;
             }
         } else {
-            if ((mperror_heart_beat.off_time = mp_hal_ticks_ms_non_blocking()) - mperror_heart_beat.on_time > MPERROR_HEARTBEAT_ON_MS) {
+            if (mp_hal_ticks_ms_non_blocking() > mperror_heart_beat.on_time) {
                 led_info.color.value = 0;
-                led_set_color(&led_info, false, false);
+                led_set_color(&led_info, true, false);
                 mperror_heart_beat.beating = false;
+                mperror_heart_beat.off_time = mp_hal_ticks_ms_non_blocking() + MPERROR_HEARTBEAT_OFF_MS;
             }
         }
     }