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

- better parameter for water sim, fewer losses

Browse Source 
- max power is 3500 W

git-svn-id: http://moon:8086/svn/projects/HendiControl@242 fda53097-d464-4ada-af97-ba876c37ca34
This commit is contained in:
jens
2019-04-15 20:59:20 +00:00
parent ead1f69be6
commit 2d538f3384
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Control/brewpi/brewpi.json.templ
+6 -6
View File
@@ -4,7 +4,7 @@
{ {
"dt" : 1.0, "dt" : 1.0,
"P_min" : 0, "P_min" : 0,
"P_max" : 3000, "P_max" : 3500,
"sim_warp_factor" : 1000.0, "sim_warp_factor" : 1000.0,
"stirrer_name" : "Stirrer", "stirrer_name" : "Stirrer",
"plant_name" : "Mass", "plant_name" : "Mass",
@@ -38,7 +38,7 @@
}, },
"Heat" : { "Heat" : {
"Acqu": { "Acqu": {
"thresh_leave" : -100.25, "thresh_leave" : -100.0,
"Pid" : { "Pid" : {
"kp" : 0.2, "kp" : 0.2,
"ki" : 0.004, "ki" : 0.004,
@@ -61,11 +61,11 @@
"WaterSim" : "WaterSim" :
{ {
"dt" : 1.0, "dt" : 1.0,
"theta_amb" : 20, "theta_amb" : 15,
"C" : 4190, "C" : 4190,
"M" : 20, "M" : 25,
"L" : 0.3, "L" : 0.15,
"Td" : 30, "Td" : 20,
"kn" : 0.2 "kn" : 0.2
}, },
Control/brewpi/brewpi.py
+2 -2
View File
@@ -68,7 +68,7 @@ if __name__ == '__main__':
signal.signal(signal.SIGCONT, handler) signal.signal(signal.SIGCONT, handler)
signal.signal(signal.SIGHUP, handler) signal.signal(signal.SIGHUP, handler)
fp = open("brewpi_sprung.json") fp = open("brewpi.json")
configJson = json.load(fp) configJson = json.load(fp)
plant_class = globals()[configJson["Controller"]['plant_name']] plant_class = globals()[configJson["Controller"]['plant_name']]
@@ -78,7 +78,7 @@ if __name__ == '__main__':
ablauf = Controller(configJson["Controller"], plant, ruehrer) ablauf = Controller(configJson["Controller"], plant, ruehrer)
fp = open("Rezept-Sprung.json") fp = open("Rezept-001.json")
recipeJson = json.load(fp) recipeJson = json.load(fp)
ablauf.start(recipeJson) ablauf.start(recipeJson)
Control/brewpi/mass.py
+1 -1
View File
@@ -11,7 +11,7 @@ class Mass(APlant):
self.e = 0 self.e = 0
self.x = 0 self.x = 0
self.gain = 0.95 self.gain = 0.999
self.C = params['C'] self.C = params['C']
self.M = params['M'] self.M = params['M']