- removed setReceipe()
git-svn-id: http://moon:8086/svn/projects/HendiControl@375 fda53097-d464-4ada-af97-ba876c37ca34
This commit is contained in:
@@ -95,19 +95,17 @@ if __name__ == '__main__':
|
||||
signal.signal(signal.SIGHUP, handler)
|
||||
|
||||
fp = open(config)
|
||||
configJson = json.load(fp)
|
||||
config = json.load(fp)
|
||||
|
||||
plant_class = globals()[configJson["Controller"]['plant_name']]
|
||||
plant = plant_class(configJson["Plant"])
|
||||
ruehrer_class = globals()[configJson["Controller"]['stirrer_name']]
|
||||
ruehrer = ruehrer_class(configJson["Stirrer"])
|
||||
|
||||
ablauf = Controller(configJson["Controller"], plant, ruehrer)
|
||||
plant_class = globals()[config["Controller"]['plant_name']]
|
||||
plant = plant_class(config["Plant"])
|
||||
ruehrer_class = globals()[config["Controller"]['stirrer_name']]
|
||||
ruehrer = ruehrer_class(config["Stirrer"])
|
||||
|
||||
fp = open(args.receipe)
|
||||
recipeJson = json.load(fp)
|
||||
recipe = json.load(fp)
|
||||
|
||||
ablauf.setRecipe(recipeJson)
|
||||
ablauf = Controller(config["Controller"], plant, ruehrer, recipe)
|
||||
ablauf.wait_finished()
|
||||
|
||||
results_plot(ablauf)
|
||||
|
||||
Reference in New Issue
Block a user