From d3bdc4a550391c99240f1a5ae3facd30497443d4 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Fri, 3 May 2019 18:22:28 +0000 Subject: [PATCH] [BrewPi] - added command line arguments for receipe and config file - added receipe "sud_0010" git-svn-id: http://moon:8086/svn/projects/HendiControl@282 fda53097-d464-4ada-af97-ba876c37ca34 --- Control/brewpi/brewpi.py | 20 +++++++++++++++--- Control/brewpi/sud_0010.json | 40 ++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 Control/brewpi/sud_0010.json diff --git a/Control/brewpi/brewpi.py b/Control/brewpi/brewpi.py index e667482..e898f8c 100755 --- a/Control/brewpi/brewpi.py +++ b/Control/brewpi/brewpi.py @@ -1,5 +1,5 @@ #!/usr/bin/python3 - +import argparse import signal import json from controller import Controller, commands @@ -49,6 +49,20 @@ def results_plot(self): if __name__ == '__main__': + parser = argparse.ArgumentParser(description='Brew some beer.') + parser.add_argument('--receipe', help='the name of the receipe') + parser.add_argument('--config', help='the name of the configuration file') + + args = parser.parse_args() + + if args.receipe is None: + raise Exception("Invalid receipe") + + config = "brewpi.json" + if args.config is not None: + config = args.config + + stirr_isOn = False def handler(signum, frame): @@ -75,7 +89,7 @@ if __name__ == '__main__': signal.signal(signal.SIGUSR1, handler) signal.signal(signal.SIGHUP, handler) - fp = open("brewpi.json") + fp = open(config) configJson = json.load(fp) plant_class = globals()[configJson["Controller"]['plant_name']] @@ -85,7 +99,7 @@ if __name__ == '__main__': ablauf = Controller(configJson["Controller"], plant, ruehrer) - fp = open("Rezept-001.json") + fp = open(args.receipe) recipeJson = json.load(fp) ablauf.setRecipe(recipeJson) diff --git a/Control/brewpi/sud_0010.json b/Control/brewpi/sud_0010.json new file mode 100644 index 0000000..11efe3e --- /dev/null +++ b/Control/brewpi/sud_0010.json @@ -0,0 +1,40 @@ +{ + "Name" : "Sud-0010", + "Description" : "Rotfränkisch, Dunkles Lager", + "pot_weight_kg" : 5.960, + "pot_material" : "Edelstahl 18/10", + "Schuettung_kg" : 5.21, + "Wasser_kg" : 22, + "stirrSpeedHeat" : 30, + "stirrSpeedRast" : 30, + "stirrDutyRast" : 1.0, + "stirrCycleTime" : 120, + "Rasten" : + [ + { + "time" : 0, + "temp" : 57.0, + "heatRate" : 2.00, + "waitForUser" : true + }, + { + "time" : 40, + "temp" : 63.0, + "heatRate" : 1.00, + "waitForUser" : false + }, + { + "time" : 30, + "temp" : 72.0, + "heatRate" : 1.00, + "waitForUser" : false + }, + { + "time" : 0, + "temp" : 76.0, + "heatRate" : 1.00, + "waitForUser" : true + } + ] +} +