From deed622dfeb45963c122c6125a1fe2489453b1c8 Mon Sep 17 00:00:00 2001 From: Geens Date: Sat, 3 Aug 2024 20:42:30 +0200 Subject: [PATCH] Modified state machine --- src/buttons_timers_and_relays.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/buttons_timers_and_relays.py b/src/buttons_timers_and_relays.py index 76ed0cf..506d29a 100644 --- a/src/buttons_timers_and_relays.py +++ b/src/buttons_timers_and_relays.py @@ -36,16 +36,22 @@ class ButtonsTimersAndRelays: case self.State.RELAY_1_HIGH_1: if hardware.get_button_0(): next_state = self.State.RELAY_0_HIGH + elif hardware.get_button_1(): + next_state = self.State.BUTTON_1_PRESSED elif self.time_in_current_state > 1: next_state = self.State.RELAY_1_LOW case self.State.RELAY_1_LOW: if hardware.get_button_0(): next_state = self.State.RELAY_0_HIGH + elif hardware.get_button_1(): + next_state = self.State.BUTTON_1_PRESSED elif self.time_in_current_state > 1: next_state = self.State.RELAY_1_HIGH_2 case self.State.RELAY_1_HIGH_2: if hardware.get_button_0(): next_state = self.State.RELAY_0_HIGH + elif hardware.get_button_1(): + next_state = self.State.BUTTON_1_PRESSED elif self.time_in_current_state > 1: next_state = self.State.RELAY_0_LOW @@ -67,7 +73,7 @@ class ButtonsTimersAndRelays: hardware.set_relay_1(False) case self.State.BUTTON_1_PRESSED: hardware.set_relay_0(False) - hardware.set_relay_1(False) + hardware.set_relay_1(True) case self.State.RELAY_1_HIGH_1: hardware.set_relay_0(False) hardware.set_relay_1(True)