diff --git a/Control/brewpi/brewpi.json.templ b/Control/brewpi/brewpi.json.templ index 57db560..61652a6 100644 --- a/Control/brewpi/brewpi.json.templ +++ b/Control/brewpi/brewpi.json.templ @@ -4,7 +4,7 @@ { "dt" : 1.0, "P_min" : 0, - "P_max" : 3000, + "P_max" : 3500, "sim_warp_factor" : 1000.0, "stirrer_name" : "Stirrer", "plant_name" : "Mass", @@ -38,7 +38,7 @@ }, "Heat" : { "Acqu": { - "thresh_leave" : -100.25, + "thresh_leave" : -100.0, "Pid" : { "kp" : 0.2, "ki" : 0.004, @@ -61,11 +61,11 @@ "WaterSim" : { "dt" : 1.0, - "theta_amb" : 20, + "theta_amb" : 15, "C" : 4190, - "M" : 20, - "L" : 0.3, - "Td" : 30, + "M" : 25, + "L" : 0.15, + "Td" : 20, "kn" : 0.2 }, diff --git a/Control/brewpi/brewpi.py b/Control/brewpi/brewpi.py index cd34c84..d00fe70 100755 --- a/Control/brewpi/brewpi.py +++ b/Control/brewpi/brewpi.py @@ -68,7 +68,7 @@ if __name__ == '__main__': signal.signal(signal.SIGCONT, handler) signal.signal(signal.SIGHUP, handler) - fp = open("brewpi_sprung.json") + fp = open("brewpi.json") configJson = json.load(fp) plant_class = globals()[configJson["Controller"]['plant_name']] @@ -78,7 +78,7 @@ if __name__ == '__main__': ablauf = Controller(configJson["Controller"], plant, ruehrer) - fp = open("Rezept-Sprung.json") + fp = open("Rezept-001.json") recipeJson = json.load(fp) ablauf.start(recipeJson) diff --git a/Control/brewpi/mass.py b/Control/brewpi/mass.py index 13e948c..27a2654 100644 --- a/Control/brewpi/mass.py +++ b/Control/brewpi/mass.py @@ -11,7 +11,7 @@ class Mass(APlant): self.e = 0 self.x = 0 - self.gain = 0.95 + self.gain = 0.999 self.C = params['C'] self.M = params['M']