- refactored

- integrated stirrer
This commit is contained in:
jens
2020-12-17 16:28:50 +01:00
parent 311ff974cc
commit ddf8003f5c
14 changed files with 66 additions and 26 deletions
+8 -3
View File
@@ -6,8 +6,8 @@ from ws.server.ws_server_multi_user import WsServerMultiUser
from components.sensor import TempSensorFactory
from components.pid import TempController
from components.plant import Pot
from components.actor import HeaterFactory
from tasks import TaskManager, TempSensorTask, HeaterTask, PotTask, TcTask
from components.actor import HeaterFactory, StirrerFactory
from tasks import TaskManager, TempSensorTask, HeaterTask, PotTask, TcTask, StirrerTask
DT_CTRL = 0.1
@@ -32,7 +32,7 @@ if __name__ == '__main__':
taskmgr.add(PotTask(pot, DT_CTRL, dispatcher.msgio_get("Pot")))
# Heater
heater = HeaterFactory.create(config['Controller']['heater_name'])
heater = HeaterFactory.create(config['Controller']['heater_name'], config['Heater'])
heater.set_on_changed("power_eff", ChangedFloat(pot.set_power, prec=0).set)
heater_task = HeaterTask(heater, DT_CTRL, dispatcher.msgio_get("Heater"))
taskmgr.add(heater_task)
@@ -45,6 +45,11 @@ if __name__ == '__main__':
taskmgr.add(tc_task)
sensor.set_on_changed("temp", ChangedFloat(tc.set_theta_ist, prec=2).set)
# Stirrer
stirrer = StirrerFactory.create(config['Controller']['stirrer_name'], config['Stirrer'])
stirrer_task = StirrerTask(stirrer, DT_CTRL, dispatcher.msgio_get("Stirrer"))
taskmgr.add(stirrer_task)
# Message dispatcher
h_dispatcher = taskmgr.start()
h_server = server.listen("0.0.0.0", 8765)