- made on-methods private
- added AStirrer::_on_process() for monitoring
This commit is contained in:
@@ -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})
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user