From 4c663ad0da08cfbaf009cc42be51c376675a5d3e Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Mon, 8 Apr 2019 10:41:44 +0000
Subject: [PATCH] - updated template

git-svn-id: http://moon:8086/svn/projects/HendiControl@236 fda53097-d464-4ada-af97-ba876c37ca34
---
 Control/brewpi/brewpi.json.templ | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/Control/brewpi/brewpi.json.templ b/Control/brewpi/brewpi.json.templ
index d80833d..57db560 100644
--- a/Control/brewpi/brewpi.json.templ
+++ b/Control/brewpi/brewpi.json.templ
@@ -4,26 +4,26 @@
 	{
 		"dt"				: 1.0,
 		"P_min"				: 0,
-		"P_max"				: 3500,
-		"sim_warp_factor"	: 1.0,
+		"P_max"				: 3000,
+		"sim_warp_factor"	: 1000.0,
 		"stirrer_name"      : "Stirrer",
 		"plant_name"        : "Mass",
 		"useKalman"			: true,
 		"kalman" 			: {
 			"dt"				: 1,
-			"var_P"				: 0,
-			"var_Q"				: 0.000001,
-			"var_R"				: 1,
-			"var_Z"				: 0.0
+			"var_P"				: 0.0,
+			"var_Q"				: 0.0000001,
+			"var_R"				: 0.5,
+			"var_Z"				: 0.1
 			},
 		"Hold" : {
 			"Acqu": {
-				"thresh_leave"	: 1.0,
+				"thresh_leave"	: -100.0,
 				"Pid" : {
-					"kp"	: 0.4,
-					"ki"	: 0.002,
-					"kd"	: 0.1,
-					"rho"	: 0.9999
+					"kp"	: 0.2,
+					"ki"	: 0.001,
+					"kd"	: 0.2,
+					"rho"	: 0.99999
 					}
 				},
 			"Track": {
@@ -38,12 +38,12 @@
 		},
 		"Heat" : {
 			"Acqu": {
-				"thresh_leave"	: 0.25,
+				"thresh_leave"	: -100.25,
 				"Pid" : {
-					"kp"	: 0.4,
+					"kp"	: 0.2,
 					"ki"	: 0.004,
-					"kd"	: 0.05,
-					"rho"	: 0.9999
+					"kd"	: 4.0,
+					"rho"	: 0.99999
 				}
 			},
 			"Track": {