- refactored

This commit is contained in:
jens
2020-11-28 11:52:11 +01:00
parent 337da017b0
commit 625535d1fb
4 changed files with 49 additions and 20 deletions
+6
View File
@@ -15,4 +15,10 @@ class ATemperatureSensor:
def temperature(self):
return None
@abc.abstractmethod
def process(self):
pass
@abc.abstractmethod
def set_on_changed(self, on_changed):
pass
+11 -3
View File
@@ -1,4 +1,5 @@
from components.atemperatureSensor import ATemperatureSensor
from utils.value import Value, ValueChanged
import math
@@ -10,12 +11,19 @@ class TempSensorSim(ATemperatureSensor):
self.count = 0
self.freq = 0.2
self.log("Created")
self.temp = 22.37
self.temp = Value(22.37)
self.temp_set = self.temp.get()
def set_fake_temp(self, temp):
self.temp = temp
self.temp_set = temp
def temperature(self):
self.count += 1
return self.temp + 0.1*math.sin(2*math.pi*self.count*self.freq)
return self.temp_set + 0.1*math.sin(2*math.pi*self.count*self.freq)
def process(self):
temp = self.temperature()
self.temp.set(temp)
def set_on_changed(self, on_changed: ValueChanged):
self.temp = on_changed
+32
View File
@@ -0,0 +1,32 @@
class Value:
def __init__(self, initial=None):
self.value = initial
self.has_changed = True
def set(self, value):
self.has_changed = self.value != value
self.value = value
def is_changed(self):
return self.has_changed
def get(self):
self.has_changed = False
return self.value
class ValueChanged(object):
def __init__(self, on_changed, prec=2, initial=None):
self.on_changed = on_changed
self.prec = prec
self.value = initial
def set(self, value):
has_changed = True
value_rounded = round(value, self.prec)
if self.value is not None:
has_changed = self.value != value_rounded
self.value = value_rounded
if has_changed:
self.on_changed(value_rounded)
-17
View File
@@ -31,23 +31,6 @@ class MsgIo:
return self.key
class Value:
def __init__(self, initial=None):
self.value = initial
self.has_changed = True
def set(self, value):
self.has_changed = self.value != value
self.value = value
def is_changed(self):
return self.has_changed
def get(self):
self.has_changed = False
return self.value
class MessageDispatcher(IConnection):
def __init__(self, auto_subscribe=False, loop=None):
self.msg_handlers: MsgIo = []