diff --git a/brewpi.py b/brewpi.py index 036c7c0..095a256 100644 --- a/brewpi.py +++ b/brewpi.py @@ -242,15 +242,6 @@ if __name__ == '__main__': taskmgr.add(TempSensorTask(sensor, DT_CTRL, dispatcher.msgio_get("Sensor"))) # Plant - pot_params = { - "theta" : 20, - "C" : 4190, - "M" : 20, - "L" : 0.05, - "Td" : 12, - "kn" : 0.2 - } - pot_params = config['Plant'] if "sim" in config['Controller']['plant_name']: pot = Pot(pot_params, 20) @@ -265,28 +256,6 @@ if __name__ == '__main__': taskmgr.add(heater_task) # Temperature Controller - tc_params = { - "dt": 1.0, - "Kalman": { - "dt" : 1.0, - "var_P" : 1.0, - "var_Q" : 0.0001, - "var_R" : 1.0 - }, - "Hold": { - "kp": 1.0, - "ki": 0.0, - "kd": 0.0, - "kt": 0.0 - }, - "Heat": { - "kp": 0.1, - "ki": 0.01, - "kd": 0.0, - "kt": 1.0 - } - } - tc_params = config['TempCtrl'] tc = TempController(tc_params) tc.set_on_changed("y", heater_task.actor)