From a95f5195d10f15fa5850388162e7c73b2fd74f64 Mon Sep 17 00:00:00 2001 From: jens Date: Thu, 12 Aug 2021 09:32:02 +0200 Subject: [PATCH] - made on-methods private - added AStirrer::_on_process() for monitoring --- components/actor/stirrerpololu1376.py | 7 ++++--- components/actor/stirrersim.py | 5 ++++- components/astirrer.py | 13 +++++++++---- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/components/actor/stirrerpololu1376.py b/components/actor/stirrerpololu1376.py index 87e5f23..747914b 100644 --- a/components/actor/stirrerpololu1376.py +++ b/components/actor/stirrerpololu1376.py @@ -11,12 +11,10 @@ class StirrerPololu1376(AStirrer): def __init__(self, dt, params): AStirrer.__init__(self, dt) - self.isMasterOn = 0 ser = serial.Serial(params['port'], params['speed']) ser.set_output_flow_control(False) self.drv = Pololu1376(ser) - self.activate(False) @contextmanager def remote_open(self): @@ -38,10 +36,13 @@ class StirrerPololu1376(AStirrer): else: self.drv.stop() - def on_set_speed(self, speed): + def _on_set_speed(self, speed): self.drv.motor_forward(speed) print("Set speed to {} %".format(speed)) + def _on_process(self): + print("STATUS = OK!") + if __name__ == '__main__': s = StirrerPololu1376(dt=1.0, params={'port': "/dev/ttyACM0", 'speed': 115200}) diff --git a/components/actor/stirrersim.py b/components/actor/stirrersim.py index 8404122..21f4263 100644 --- a/components/actor/stirrersim.py +++ b/components/actor/stirrersim.py @@ -14,9 +14,12 @@ class StirrerSim(AStirrer): return self.speed return 0 - def on_set_speed(self, speed): + def _on_set_speed(self, speed): print("Set speed to {} %".format(speed)) + def _on_process(self): + print("STATUS = OK!") + if __name__ == '__main__': s = StirrerSim(1.0) diff --git a/components/astirrer.py b/components/astirrer.py index 687d1ea..9d5dc14 100644 --- a/components/astirrer.py +++ b/components/astirrer.py @@ -26,16 +26,17 @@ class AStirrer(AttributeChange): if self.isOn != isOn: if isOn: - self.on_set_speed(self.speed) + self._on_set_speed(self.speed) else: - self.on_set_speed(0) + self._on_set_speed(0) self.isOn = isOn + self._on_process() def set_speed(self, speed): self.speed = speed if self.isOn or self.dutyCycle == 1: - self.on_set_speed(speed) + self._on_set_speed(speed) def set_cycle_time(self, time): self.cycleTime = time @@ -48,7 +49,11 @@ class AStirrer(AttributeChange): return None @abc.abstractmethod - def on_set_speed(self, speed): + def _on_set_speed(self, speed): + pass + + @abc.abstractmethod + def _on_process(self): pass @contextmanager