- reworked

git-svn-id: http://moon:8086/svn/projects/HendiControl@113 fda53097-d464-4ada-af97-ba876c37ca34

Control/brewpi/brewpi.cfg.json

@@ -1,32 +1,59 @@
 {
-	"Global" : 
-	{
-		"samplerate_Hz" : 1.0
-	},
 
 	"Controller" :
 	{
-		"cont_ctrl"				: true,
-		"P_min_W"				: 0,
-		"P_max_W"				: 3000,	
-		"P_q_W"					: 100,
-		"theta_lock_K"			: 0.5,
-		"kp"					: 2,
-		"ki"					: 0.02,
-		"kd"					: 400,
-		"pid_rho"				: 0.999,
-		"heatrate_KPerMin"		: 0.5
+		"dt"			: 1.0,
+		"cont_ctrl"		: true,
+		"P_min"			: 0,
+		"P_max"			: 3000,
+		"P_q_W"			: 100,
+		"theta_lock_K"	: 0.5,
+		"Hold" : {
+			"Acqu": {
+				"Pid" : {
+					"kp"	: 2,
+					"ki"	: 0.02,
+					"kd"	: 400,
+					"rho"	: 0.999
+				}
+			},
+			"Track": {
+				"Pid" : {
+					"kp"	: 2,
+					"ki"	: 0.02,
+					"kd"	: 400,
+					"rho"	: 0.999
+				}
+			}
+		},
+		"Heat" : {
+			"Acqu": {
+				"Pid" : {
+					"kp"	: 4,
+					"ki"	: 0.02,
+					"kd"	: 4,
+					"rho"	: 0.999
+				}
+			},
+			"Track": {
+				"Pid" : {
+					"kp"	: 8,
+					"ki"	: 0.03,
+					"kd"	: 8,
+					"rho"	: 0.999
+				}
+			}
+		}
 	},
 
 	"Simulation" :
 	{
-		"theta_amb_degC"		: 20,
-		"C_joulePerKperkg"		: 4190,
-		"M_kg"					: 20,
-		"mass_kleak"			: 0.5,
-		"mass_delay_s"			: 60,
-		"Td_s"					: 10,
-		"k_noise"				: 0
+		"theta_amb"		: 20,
+		"C"				: 4190,
+		"M"				: 20,
+		"L"				: 0.5,
+		"Td"			: 10,
+		"kn"			: 0
 	}
 }