Modified state machine

This commit is contained in:
Geens 2024-08-03 20:42:30 +02:00
parent 09ac0bda50
commit deed622dfe

View File

@ -36,16 +36,22 @@ class ButtonsTimersAndRelays:
case self.State.RELAY_1_HIGH_1: case self.State.RELAY_1_HIGH_1:
if hardware.get_button_0(): if hardware.get_button_0():
next_state = self.State.RELAY_0_HIGH 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: elif self.time_in_current_state > 1:
next_state = self.State.RELAY_1_LOW next_state = self.State.RELAY_1_LOW
case self.State.RELAY_1_LOW: case self.State.RELAY_1_LOW:
if hardware.get_button_0(): if hardware.get_button_0():
next_state = self.State.RELAY_0_HIGH 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: elif self.time_in_current_state > 1:
next_state = self.State.RELAY_1_HIGH_2 next_state = self.State.RELAY_1_HIGH_2
case self.State.RELAY_1_HIGH_2: case self.State.RELAY_1_HIGH_2:
if hardware.get_button_0(): if hardware.get_button_0():
next_state = self.State.RELAY_0_HIGH 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: elif self.time_in_current_state > 1:
next_state = self.State.RELAY_0_LOW next_state = self.State.RELAY_0_LOW
@ -67,7 +73,7 @@ class ButtonsTimersAndRelays:
hardware.set_relay_1(False) hardware.set_relay_1(False)
case self.State.BUTTON_1_PRESSED: case self.State.BUTTON_1_PRESSED:
hardware.set_relay_0(False) hardware.set_relay_0(False)
hardware.set_relay_1(False) hardware.set_relay_1(True)
case self.State.RELAY_1_HIGH_1: case self.State.RELAY_1_HIGH_1:
hardware.set_relay_0(False) hardware.set_relay_0(False)
hardware.set_relay_1(True) hardware.set_relay_1(True)