jens/brewpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- refactored temp controllers

Browse Source
This commit is contained in:
jens
2020-12-22 10:51:38 +01:00
parent 4c93e85dd8
commit f2aff73f40
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/pid/temp_controller.py
+1 -1
View File
@@ -169,7 +169,7 @@ if __name__ == '__main__':
hold_counter -= 1
ctrl.process()
plant.process()
temp_ist = plant.get_temperature_delayed() + 0.0 * np.random.randn()
temp_ist = plant.get_temperature() + 0.0 * np.random.randn()
ctrl.set_theta_ist(temp_ist)
y = 3500*ctrl.get_power()
components/pid/temp_controller_smith.py
+2 -2
View File
@@ -52,7 +52,7 @@ class TempController(AttributeChange):
def process(self):
# Process Kalman of Model
Z_model = self.kalman_model.process_measurement((self.model.get_temperature(), 0), 0.0)
Z_model = self.kalman_model.process_measurement((self.model.get_temperature_intermediate(), 0), 0.0)
xp_model = self.kalman_model.process(Z_model)
theta_ist_model = xp_model[0, 0]
heatrate_ist_model = xp_model[1, 0] * 60
@@ -195,7 +195,7 @@ if __name__ == '__main__':
hold_counter -= 1
ctrl.process()
plant.process()
temp_ist = plant.get_temperature_delayed()
temp_ist = plant.get_temperature()
ctrl.set_theta_ist(temp_ist)
y = 3500*ctrl.get_power()