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

- better template

Browse Source 
git-svn-id: http://moon:8086/svn/projects/HendiControl@261 fda53097-d464-4ada-af97-ba876c37ca34
This commit is contained in:
jens
2019-04-23 15:41:24 +00:00
parent c4ea00bd93
commit 7f3a3cf99a
2 changed files with 18 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Control/brewpi/controller.py
+3 -3
View File
@@ -229,11 +229,11 @@ class Controller(TimerListener):
ovenStateNext = ovenStates.NOP
if self.ovenState != ovenStates.NOP:
self.pid_hold.process(self.dt, self.params['Hold']['Acqu']['Pid'], ctrl_theta_err)
self.pid_rate.process(self.dt, self.params['Heat']['Acqu']['Pid'], ctrl_heatrate_err)
self.pid_hold.process(self.dt, self.params['Hold']['Pid'], ctrl_theta_err)
self.pid_rate.process(self.dt, self.params['Heat']['Pid'], ctrl_heatrate_err)
power_hold = max(self.params['P_min'], min(self.params['P_max'], self.params['P_max'] * self.pid_hold.get_y()))
power_heat = max(self.params['P_min'], min(self.params['P_max'], self.params['P_max']*self.pid_rate.get_y()))
power_heat = max(self.params['P_min'], min(self.params['P_max'], self.params['P_max'] * self.pid_rate.get_y()))
power_soll = min(power_hold, power_heat)
self.plant.setPower(power_soll)
power_ist = self.plant.getPower()