From b975cd9c6f037fa71a10651cf1138fd642a917c8 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Wed, 3 Apr 2019 05:52:51 +0000 Subject: [PATCH] - fixed scaling git-svn-id: http://moon:8086/svn/projects/HendiControl@212 fda53097-d464-4ada-af97-ba876c37ca34 --- Control/brewpi/controller.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Control/brewpi/controller.py b/Control/brewpi/controller.py index ca66f34..bbfb76e 100644 --- a/Control/brewpi/controller.py +++ b/Control/brewpi/controller.py @@ -152,7 +152,7 @@ class Controller(): # The loop # ------------------------------ doLoop = True - useKalman = True + useKalman = False while(doLoop): time_start = time.time() @@ -186,10 +186,8 @@ class Controller(): ctrl_theta = theta_ist_k ctrl_dtheta = dtheta_ist_k else: - theta_err = theta_soll - theta_ist - dtheta_err = heatrate_soll - dtheta_ist - ctrl_theta_err = self.theta_err_sm.process(theta_err) - ctrl_heatrate_err = self.heatrate_err_sm.process(60/self.dt * dtheta_err) + ctrl_theta_err = self.theta_err_sm.process(theta_soll - theta_ist) + ctrl_heatrate_err = self.heatrate_err_sm.process(heatrate_soll - 60/self.dt * dtheta_ist) ctrl_theta = theta_ist ctrl_dtheta = dtheta_ist