- refactored
- created TempSensorFactory
This commit is contained in:
@@ -2,10 +2,11 @@ import asyncio
|
||||
from time import sleep
|
||||
import abc
|
||||
from ws.server.ws_server_multi_user import WsServerMultiUser
|
||||
from components.sensor.tempSensorSim import TempSensorSim, ATemperatureSensor
|
||||
from components.plant.pot import Pot, APlant
|
||||
from components import ATemperatureSensor
|
||||
from components.sensor import TempSensorFactory
|
||||
from components.pid import TempController
|
||||
from components.plant import Pot, APlant
|
||||
from components.actor.heater import Heater, AHeater
|
||||
from components.pid import kalman, temp_controller
|
||||
from ws.message import MsgIo, MessageDispatcher
|
||||
from utils.value import Value, ChangedFloat, ChangedInteger
|
||||
|
||||
@@ -148,7 +149,7 @@ class PotTask(ATask):
|
||||
|
||||
|
||||
class TcTask(ATask):
|
||||
def __init__(self, tc: temp_controller.TempController, interval, msg_handler: MsgIo):
|
||||
def __init__(self, tc: TempController, interval, msg_handler: MsgIo):
|
||||
ATask.__init__(self, interval)
|
||||
|
||||
self.tc = tc
|
||||
@@ -242,7 +243,7 @@ if __name__ == '__main__':
|
||||
taskmgr = TaskManager()
|
||||
|
||||
# Sensor
|
||||
sensor = TempSensorSim()
|
||||
sensor = TempSensorFactory.create("sim")
|
||||
taskmgr.add(TempSensorTask(sensor, DT_CTRL, dispatcher.msgio_get("Sensor")))
|
||||
|
||||
# Plant
|
||||
@@ -291,7 +292,7 @@ if __name__ == '__main__':
|
||||
"var_R" : 1
|
||||
}
|
||||
|
||||
tc = temp_controller.TempController(tc_params, kalman_params)
|
||||
tc = TempController(tc_params, kalman_params)
|
||||
tc.set_on_changed("y", heater_task.actor)
|
||||
tc_task = TcTask(tc, DT_CTRL, dispatcher.msgio_get("TempCtrl"))
|
||||
taskmgr.add(tc_task)
|
||||
|
||||
Reference in New Issue
Block a user