Skip to content

Commit

Permalink
Top state logic out of engage_brain, and improving from_node in relay…
Browse files Browse the repository at this point in the history 
… change functions
  • Loading branch information
@thdfw
thdfw committed Jan 7, 2025
1 parent 7d9f5d0 commit 640d6ec
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 144 deletions.
141 changes: 17 additions & 124 deletions gw_spaceheat/actors/home_alone.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@
from gwproto.named_types import Alert

from actors.scada_actor import ScadaActor
from named_types import(
FsmEvent, GoDormant, Ha1Params,
NewCommandTree, SingleMachineState, WakeUp
)
from named_types import GoDormant, Ha1Params, NewCommandTree, SingleMachineState, WakeUp
from enums import HomeAloneTopState
from pydantic import ValidationError

Expand Down Expand Up @@ -321,14 +318,21 @@ async def main(self):
self.log(f"Top state: {self.top_state}")
self.log(f"State: {self.state}")

# Update top state
if self.top_state == HomeAloneTopState.Normal:
if self.house_is_cold_onpeak() and self.is_buffer_empty(really_empty=True) and self.is_storage_empty():
self.trigger_house_cold_onpeak_event()
elif self.top_state == HomeAloneTopState.UsingBackupOnpeak and not self.is_onpeak():
self.trigger_just_offpeak()
elif self.top_state == HomeAloneTopState.ScadaBlind and self.weather and self.temperatures_available:
self.trigger_data_available()
elif self.top_state == HomeAloneTopState.ScadaBlind:
if self.weather and self.temperatures_available:
self.trigger_data_available()
elif self.is_onpeak():
self.aquastat_ctrl_switch_to_boiler(from_node=self.scada_blind_node)
else:
self.aquastat_ctrl_switch_to_scada(from_node=self.scada_blind_node)

# Update state
self.engage_brain()
await asyncio.sleep(self.MAIN_LOOP_SLEEP_SECONDS)

Expand All @@ -337,12 +341,6 @@ def engage_brain(self) -> None:
if self.state == HomeAloneState.Initializing:
self.initialize_relays()

if self.top_state==HomeAloneTopState.ScadaBlind and self.state==HomeAloneState.Dormant:
if self.is_onpeak():
self.aquastat_ctrl_switch_to_boiler(from_handle=self.scada_blind_node.handle)
else:
self.aquastat_ctrl_switch_to_scada(from_handle=self.scada_blind_node.handle)

if self.state != HomeAloneState.Dormant:
previous_state = self.state

Expand Down Expand Up @@ -502,132 +500,27 @@ def trigger_data_available(self):
self.trigger_normal_event(HomeAloneEvent.WakeUp)

def scada_blind_actuator_actions(self) -> None:
self.hp_failsafe_switch_to_aquastat(from_handle=self.scada_blind_node.handle)
self.hp_failsafe_switch_to_aquastat(from_node=self.scada_blind_node)

def leaving_scada_blind_actuator_actions(self) -> None:
self.hp_failsafe_switch_to_scada(from_handle=self.scada_blind_node.handle)
self.hp_failsafe_switch_to_scada(from_node=self.scada_blind_node)

def leaving_onpeak_backup_actuator_actions(self) -> None:
"""
If using oil boiler for onpeak backup, hp_failsafe_relay deos the following
- hp_failsafe_switch_to_scada
- aquastat_ctrl_switch_to_scada
Otherwise:
- do nothing (heat pump will likely stay on during offpeak)
"""
if self.settings.oil_boiler_for_onpeak_backup:
try:
event = FsmEvent(
FromHandle=self.onpeak_backup_node.handle,
ToHandle=self.hp_failsafe_relay.handle,
EventType=ChangeHeatPumpControl.enum_name(),
EventName=ChangeHeatPumpControl.SwitchToScada,
SendTimeUnixMs=int(time.time() * 1000),
TriggerId=str(uuid.uuid4()),
)
self.services.send(Message(Src=self.onpeak_backup_node.name,
Dst=self.hp_failsafe_relay.name,
Payload=event))

self.log(
f"{self.onpeak_backup_node.handle} sending SwitchToTankAquastat to Hp Failsafe {H0N.hp_failsafe_relay}"
)
except ValidationError as e:
self.log(f"Tried to change HpFailsafe relay to TankAquastat but did not have authority: {e}")

try:
event = FsmEvent(
FromHandle=self.onpeak_backup_node.handle,
ToHandle=self.aquastat_control_relay.handle,
EventType=ChangeAquastatControl.enum_name(),
EventName=ChangeAquastatControl.SwitchToScada,
SendTimeUnixMs=int(time.time() * 1000),
TriggerId=str(uuid.uuid4()),
)
self.services.send(Message(Src=self.onpeak_backup_node.name,
Dst=self.hp_failsafe_relay.name,
Payload=event))

self.log(
f"{self.node.handle} sending SwitchToScada to Boiler Ctrl {H0N.aquastat_ctrl_relay}"
)
except ValidationError as e:
self.log(f"Tried to switch AquastatCtrl relay to Boiler but didn't have the rights: {e}")
self.hp_failsafe_switch_to_scada(from_node=self.onpeak_backup_node)
self.aquastat_ctrl_switch_to_scada(from_node=self.onpeak_backup_node)

def onpeak_backup_actuator_actions(self) -> None:
"""
If using oil boiler for onpeak backup, hp_failsafe_relay deos the following:
- hp failsafe (relay 5) switch to aquastat
- aquastat ctrl (relay 8) switch to boiler
Otherwise:
- turn on heat pump
Expects set_onpeak_backup_command_tree already called, with self.onpeak_backup_node as boss
WEAKNESS: SENDS MESSAGES TO RELAY ONLY VIA INTERNAL python QUEUE. WILL FAIL
IF HOME ALONE IS PUT IN A DIFFERENT PROCESS THAN THE ACTUATORS
"""

if self.settings.oil_boiler_for_onpeak_backup:

# hp failsafe (relay 5) switch to aquastat
# then aquastat ctrl (relay 8) switch to boiler
try:
event = FsmEvent(
FromHandle=self.onpeak_backup_node.handle,
ToHandle=self.hp_failsafe_relay.handle,
EventType=ChangeHeatPumpControl.enum_name(),
EventName=ChangeHeatPumpControl.SwitchToTankAquastat,
SendTimeUnixMs=int(time.time() * 1000),
TriggerId=str(uuid.uuid4()),
)
# CANNOT USE _send_to because that sends a message from the actor's node
# and this message needs to come from onpeak_backup_node
# NOTE: THIS ASSUMES THE RELAY IS IN THE SAME CODEBASE AS
# HOMEALONE.
self.services.send(Message(Src=self.onpeak_backup_node.name,
Dst=self.hp_failsafe_relay.name,
Payload=event))

self.log(
f"{self.onpeak_backup_node.handle} sending SwitchToTankAquastat to Hp Failsafe {H0N.hp_failsafe_relay}"
)
except ValidationError as e:
self.log(f"Tried to change HpFailsafe relay to TankAquastat but did not have authority: {e}")

try:
event = FsmEvent(
FromHandle=self.onpeak_backup_node.handle,
ToHandle=self.aquastat_control_relay.handle,
EventType=ChangeAquastatControl.enum_name(),
EventName=ChangeAquastatControl.SwitchToBoiler,
SendTimeUnixMs=int(time.time() * 1000),
TriggerId=str(uuid.uuid4()),
)
self.services.send(Message(Src=self.onpeak_backup_node.name,
Dst=self.aquastat_control_relay.name,
Payload=event))
self.log(
f"{self.onpeak_backup_node.handle} sending SwitchToBoiler to Boiler Ctrl {H0N.aquastat_ctrl_relay}"
)
except ValidationError as e:
self.log(f"Tried to switch AquastatCtrl relay to Boiler but didn't have the rights: {e}")
self.hp_failsafe_switch_to_aquastat(from_node=self.onpeak_backup_node)
self.aquastat_ctrl_switch_to_boiler(from_node=self.onpeak_backup_node)
else:
# self.settings.oil_boiler_for_onpeak_backup -> turn on heat pump
try:
event = FsmEvent(
FromHandle=self.onpeak_backup_node.handle,
ToHandle=self.hp_scada_ops_relay.handle,
EventType=ChangeRelayState.enum_name(),
EventName=ChangeRelayState.CloseRelay,
SendTimeUnixMs=int(time.time() * 1000),
TriggerId=str(uuid.uuid4()),
)
self._send_to(self.hp_scada_ops_relay, event)
self.log(
f"{self.node.handle} sending CloseRelay to Hp ScadaOps {H0N.hp_scada_ops_relay}"
)
except ValidationError as e:
self.log(f"Tried to change a relay but didn't have the rights: {e}")
self.turn_on_HP(from_node=self.onpeak_backup_node)

def start(self) -> None:
self.services.add_task(
Expand Down
70 changes: 50 additions & 20 deletions gw_spaceheat/actors/scada_actor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,65 +340,83 @@ def valved_to_charge_store(self) -> None:
except ValidationError as e:
self.log(f"Tried to change a relay but didn't have the rights: {e}")

def hp_failsafe_switch_to_aquastat(self, from_handle=None) -> None:
def hp_failsafe_switch_to_aquastat(self, from_node=None) -> None:
"""
Set the hp control to Aquastat by de-energizing hp_failsafe_relay (5)
Will log an error and do nothing if not the boss of this relay
"""
try:
event = FsmEvent(
FromHandle=self.node.handle if from_handle is None else from_handle,
FromHandle=self.node.handle if from_node is None else from_node.handle,
ToHandle=self.hp_failsafe_relay.handle,
EventType=ChangeHeatPumpControl.enum_name(),
EventName=ChangeHeatPumpControl.SwitchToTankAquastat,
SendTimeUnixMs=int(time.time() * 1000),
TriggerId=str(uuid.uuid4()),
)
self._send_to(self.hp_failsafe_relay, event)
if from_node is None:
self._send_to(self.hp_failsafe_relay, event)
else:
self.services.send(
Message(Src=from_node.name,
Dst=self.hp_failsafe_relay.name,
Payload=event))
self.log(
f"{self.node.handle if from_handle is None else from_handle} sending SwitchToTankAquastat to Hp Failsafe {H0N.hp_failsafe_relay}"
f"{self.node.handle if from_node is None else from_node.handle} sending SwitchToTankAquastat to Hp Failsafe {H0N.hp_failsafe_relay}"
)
except ValidationError as e:
self.log(f"Tried to change a relay but didn't have the rights: {e}")

def hp_failsafe_switch_to_scada(self, from_handle=None) -> None:
def hp_failsafe_switch_to_scada(self, from_node=None) -> None:
"""
Set the hp control to Scada by energizing hp_failsafe_relay (5)
Will log an error and do nothing if not the boss of this relay
"""
try:
event = FsmEvent(
FromHandle=self.node.handle if from_handle is None else from_handle,
FromHandle=self.node.handle if from_node is None else from_node.handle,
ToHandle=self.hp_failsafe_relay.handle,
EventType=ChangeHeatPumpControl.enum_name(),
EventName=ChangeHeatPumpControl.SwitchToScada,
SendTimeUnixMs=int(time.time() * 1000),
TriggerId=str(uuid.uuid4()),
)
self._send_to(self.hp_failsafe_relay, event)
if from_node is None:
self._send_to(self.hp_failsafe_relay, event)
else:
self.services.send(
Message(Src=from_node.name,
Dst=self.hp_failsafe_relay.name,
Payload=event))
self.log(
f"{self.node.handle if from_handle is None else from_handle} sending SwitchToScada to Hp Failsafe {H0N.hp_failsafe_relay}"
f"{self.node.handle if from_node is None else from_node.handle} sending SwitchToScada to Hp Failsafe {H0N.hp_failsafe_relay}"
)
except ValidationError as e:
self.log(f"Tried to change a relay but didn't have the rights: {e}")

def turn_on_HP(self) -> None:
def turn_on_HP(self, from_node=None) -> None:
"""
Turn on heat pump by closing (de-energizing) hp_scada_ops_relay (6).
Will log an error and do nothing if not the boss of this relay
"""
try:
event = FsmEvent(
FromHandle=self.node.handle,
FromHandle=self.node.handle if from_node is None else from_node.handle,
ToHandle=self.hp_scada_ops_relay.handle,
EventType=ChangeRelayState.enum_name(),
EventName=ChangeRelayState.CloseRelay,
SendTimeUnixMs=int(time.time() * 1000),
TriggerId=str(uuid.uuid4()),
)
self._send_to(self.hp_scada_ops_relay, event)
if from_node is None:
self._send_to(self.hp_scada_ops_relay, event)
else:
self.services.send(
Message(Src=from_node.name,
Dst=self.hp_scada_ops_relay.name,
Payload=event))
self.log(
f"{self.node.handle} sending CloseRelay to Hp ScadaOps {H0N.hp_scada_ops_relay}"
f"{self.node.handle if from_node is None else from_node.handle} sending CloseRelay to Hp ScadaOps {H0N.hp_scada_ops_relay}"
)
except ValidationError as e:
self.log(f"Tried to change a relay but didn't have the rights: {e}")
Expand All @@ -425,44 +443,56 @@ def turn_off_HP(self) -> None:
except ValidationError as e:
self.log(f"Tried to change a relay but didn't have the rights: {e}")

def aquastat_ctrl_switch_to_boiler(self, from_handle=None) -> None:
def aquastat_ctrl_switch_to_boiler(self, from_node=None) -> None:
"""
Switch Aquastat ctrl from Scada to boiler by de-energizing aquastat_control_relay (8).
Will log an error and do nothing if not the boss of this relay
"""
try:
event = FsmEvent(
FromHandle=self.node.handle if from_handle is None else from_handle,
FromHandle=self.node.handle if from_node is None else from_node.handle,
ToHandle=self.aquastat_control_relay.handle,
EventType=ChangeAquastatControl.enum_name(),
EventName=ChangeAquastatControl.SwitchToBoiler,
SendTimeUnixMs=int(time.time() * 1000),
TriggerId=str(uuid.uuid4()),
)
self._send_to(self.aquastat_control_relay, event)
if from_node is None:
self._send_to(self.aquastat_control_relay, event)
else:
self.services.send(
Message(Src=from_node.name,
Dst=self.aquastat_control_relay.name,
Payload=event))
self.log(
f"{self.node.handle if from_handle is None else from_handle} sending SwitchToScada to Boiler Ctrl {H0N.aquastat_ctrl_relay}"
f"{self.node.handle if from_node is None else from_node.handle} sending SwitchToScada to Boiler Ctrl {H0N.aquastat_ctrl_relay}"
)
except ValidationError as e:
self.log(f"Tried to change a relay but didn't have the rights: {e}")

def aquastat_ctrl_switch_to_scada(self, from_handle=None) -> None:
def aquastat_ctrl_switch_to_scada(self, from_node=None) -> None:
"""
Switch Aquastat ctrl from boiler to Scada by energizing aquastat_control_relay (8).
Will log an error and do nothing if not the boss of this relay
"""
try:
event = FsmEvent(
FromHandle=self.node.handle if from_handle is None else from_handle,
FromHandle=self.node.handle if from_node is None else from_node.handle,
ToHandle=self.aquastat_control_relay.handle,
EventType=ChangeAquastatControl.enum_name(),
EventName=ChangeAquastatControl.SwitchToScada,
SendTimeUnixMs=int(time.time() * 1000),
TriggerId=str(uuid.uuid4()),
)
self._send_to(self.aquastat_control_relay, event)
if from_node is None:
self._send_to(self.aquastat_control_relay, event)
else:
self.services.send(
Message(Src=from_node.name,
Dst=self.aquastat_control_relay.name,
Payload=event))
self.log(
f"{self.node.handle if from_handle is None else from_handle} sending SwitchToScada to Aquastat Ctrl {H0N.aquastat_ctrl_relay}"
f"{self.node.handle if from_node is None else from_node.handle} sending SwitchToScada to Aquastat Ctrl {H0N.aquastat_ctrl_relay}"
)
except ValidationError as e:
self.log(f"Tried to change a relay but didn't have the rights: {e}")
Expand Down

0 comments on commit 640d6ec

Please sign in to comment.