From a5d5959ff5c215ac31cf7c35bfb85a0de74c6ecf Mon Sep 17 00:00:00 2001
From: jens <jens.ahrensfeld@gmx.de>
Date: Sat, 28 Nov 2020 12:19:12 +0100
Subject: [PATCH] - added newline

---
 brewpi.py      | 24 ++++++++++++++++--------
 utils/value.py |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/brewpi.py b/brewpi.py
index 0550893..3592a69 100644
--- a/brewpi.py
+++ b/brewpi.py
@@ -6,7 +6,8 @@ from components.sensor.tempSensorSim import TempSensorSim, ATemperatureSensor
 from components.plant.pot import Pot, APlant
 from components.actor.heater import Heater, AHeater
 from components.pid import kalman
-from ws.message import MsgIo, MessageDispatcher, Value
+from ws.message import MsgIo, MessageDispatcher
+from utils.value import Value, ValueChanged
 
 
 class ATask:
@@ -27,6 +28,13 @@ class TempSensorTask(ATask):
 		self.sensor = sensor
 		self.kalman = kalman
 
+	def on_temp_changed(self, value):
+		print("Sensor temp {}".format(value))
+
+	def on_temp_changed_kalman(self, value):
+		print("Kalman temp {}".format(value))
+		asyncio.create_task(self.send({'Temp': value}))
+
 	async def recv(self, data):
 		print(data)
 
@@ -35,17 +43,17 @@ class TempSensorTask(ATask):
 
 	async def on_process(self):
 		print("{}: Started with interval {} s".format(self.msg_handler.get_key(), self.interval))
-		temp = Value(self.sensor.temperature())
-		self.kalman.initial((temp.get(), 0))
+		self.kalman.initial((self.sensor.temperature(), 0))
+		temp = ValueChanged(self.on_temp_changed, prec=1)
+		temp_kalman = ValueChanged(self.on_temp_changed_kalman, prec=1)
+		self.sensor.set_on_changed(temp)
 		while True:
+			self.sensor.process()
 			Z = self.kalman.process_measurement((self.sensor.temperature(), 0), 0)
 			xp = self.kalman.process(Z)
 			theta_ist = xp[0, 0]
-			# heatrate_ist = xp[1, 0] * 60
-			temp.set(round(theta_ist, 1))
-			if temp.is_changed():
-				print("Sensor temp {}".format(self.sensor.temperature()))
-				await self.send({'Temp': temp.get()})
+			heatrate_ist = xp[1, 0] * 60
+			temp_kalman.set(theta_ist)
 			await asyncio.sleep(self.interval)
 
 
diff --git a/utils/value.py b/utils/value.py
index 762baae..8eb334f 100644
--- a/utils/value.py
+++ b/utils/value.py
@@ -29,4 +29,4 @@ class ValueChanged(object):
 
 		self.value = value_rounded
 		if has_changed:
-			self.on_changed(value_rounded)
\ No newline at end of file
+			self.on_changed(value_rounded)