From a20de855ac7bc03b10bae3becbae35c4c4694cd1 Mon Sep 17 00:00:00 2001 From: jens Date: Sat, 19 Dec 2020 16:47:01 +0100 Subject: [PATCH] - set heater power to zero at startup --- components/actor/heater_hendi.py | 2 +- components/actor/heater_sim.py | 9 +-------- components/aheater.py | 5 +++-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/components/actor/heater_hendi.py b/components/actor/heater_hendi.py index 719f563..a634dac 100644 --- a/components/actor/heater_hendi.py +++ b/components/actor/heater_hendi.py @@ -6,7 +6,7 @@ class HeaterHendi(AHeater): def __init__(self, params): AHeater.__init__(self) self.hendi = HendiCtrl(params['port'], params['speed']) - self.power_set = self.get_power_min() + self.power_set = 0 self.power_eff = 0 def get_power_min(self): diff --git a/components/actor/heater_sim.py b/components/actor/heater_sim.py index a212bfe..ec013e2 100644 --- a/components/actor/heater_sim.py +++ b/components/actor/heater_sim.py @@ -4,8 +4,7 @@ from components.aheater import AHeater class HeaterSim(AHeater): def __init__(self): AHeater.__init__(self) - self.power_set = self.get_power_min() - self.is_active = False + self.power_set = 0 self.power_eff = 0 def get_power_min(self): @@ -14,12 +13,6 @@ class HeaterSim(AHeater): def get_power_max(self): return 3500 - def activate(self, enable): - self.is_active = enable - - def is_activated(self): - return self.is_active - def process(self): power = 100*round(self.power_set/100, 0) self.power_eff = power if self.power_set > 0 else 0 diff --git a/components/aheater.py b/components/aheater.py index 48de37b..427187c 100644 --- a/components/aheater.py +++ b/components/aheater.py @@ -6,6 +6,7 @@ from contextlib import contextmanager class AHeater(AttributeChange): def __init__(self): AttributeChange.__init__(self) + self.is_active = False @abc.abstractmethod def get_power_min(self): @@ -27,11 +28,11 @@ class AHeater(AttributeChange): @abc.abstractmethod def activate(self, enable): - return None + self.is_active = enable @abc.abstractmethod def is_activated(self): - return None + return self.is_active @abc.abstractmethod def process(self):