- added newline
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user