- added stirrer

- many other improvements git-svn-id: http://moon:8086/svn/projects/HendiControl@116 fda53097-d464-4ada-af97-ba876c37ca34
2019-03-21 17:55:37 +00:00
parent 75b920047a
commit 08d8c32106
10 changed files with 213 additions and 71 deletions
@@ -6,20 +6,20 @@ import configparser
 from pid import Pid
 from controller import Controller
 from mass import Mass
-
+from stirrer import Stirrer

 if __name__ == '__main__':

 	fp = open("brewpi.cfg.json")
 	configJson = json.load(fp)

-	plant = Mass(configJson["Simulation"])
-	temp = plant.getTemperature()
+	plant = Mass(configJson["WaterSim"])
+	ruehrer = Stirrer(configJson["Stirrer"])
+	ablauf = Controller(configJson["Controller"], plant, ruehrer)

 	fp = open("Rezept-001.json")
 	recipeJson = json.load(fp)

-	ablauf = Controller(configJson["Controller"], plant)
 	ablauf.start(recipeJson)
 	ablauf.stop()