From 3eee952a04272655cc7d7be56e97e1c824856aab Mon Sep 17 00:00:00 2001 From: swimIan Date: Tue, 8 Aug 2017 22:48:23 -0700 Subject: [PATCH 1/5] Add mashinstep, import mashin temp(infuse_temp) from beerxml, and put boil step ahead of whirlpool and chill steps. --- modules/recipe_import/beerxml.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/recipe_import/beerxml.py b/modules/recipe_import/beerxml.py index e9f17e0..91335d4 100644 --- a/modules/recipe_import/beerxml.py +++ b/modules/recipe_import/beerxml.py @@ -51,6 +51,8 @@ class BeerXMLImport(FlaskView): name = self.getRecipeName(id) self.api.set_config_parameter("brew_name", name) boil_time = self.getBoilTime(id) + infuse = self.getMashinTemp(id) + mashinstep_type = cbpi.get_config_parameter("step_mashin", "MashInStep") mashstep_type = cbpi.get_config_parameter("step_mash", "MashStep") mash_kettle = cbpi.get_config_parameter("step_mash_kettle", None) @@ -64,6 +66,8 @@ class BeerXMLImport(FlaskView): try: + ## Add Mashin step + Step.insert(**{"name": "MashIn", "type": mashinstep_type, "config": {"kettle": mash_kettle, "temp": infuse}}) for row in steps: Step.insert(**{"name": row.get("name"), "type": mashstep_type, "config": {"kettle": mash_kettle, "temp": float(row.get("temp")), "timer": row.get("timer")}}) Step.insert(**{"name": "ChilStep", "type": "ChilStep", "config": {"timer": 15}}) @@ -87,6 +91,14 @@ class BeerXMLImport(FlaskView): e = xml.etree.ElementTree.parse(self.BEER_XML_FILE).getroot() return float(e.find('./RECIPE[%s]/BOIL_TIME' % (str(id))).text) +def getMashinTemp(self, id): + e = xml.etree.ElementTree.parse(self.BEER_XML_FILE).getroot() + tempstr = e.find('./RECIPE[%s]/MASH/MASH_STEPS/MASH_STEP/INFUSE_TEMP' % (str(id))).text + val = tempstr[:-1] + infuse = float(val.rstrip()) + + return infuse + def getSteps(self, id): From ae7e3a2e7b13cdc753b12e9535b2c33458f12f79 Mon Sep 17 00:00:00 2001 From: swimIan Date: Tue, 8 Aug 2017 23:36:18 -0700 Subject: [PATCH 2/5] Adjust check_hop_timer function to alert the user to add the hops at the expected values in the boil process (ex. 60= bittering, 20=aroma, etc), instead of the reverse (ex. 0=bittering, 40=aroma, etc). --- modules/base_plugins/brew_steps/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/base_plugins/brew_steps/__init__.py b/modules/base_plugins/brew_steps/__init__.py index f46da69..8dcd82f 100644 --- a/modules/base_plugins/brew_steps/__init__.py +++ b/modules/base_plugins/brew_steps/__init__.py @@ -198,8 +198,8 @@ class BoilStep(StepBase): def check_hop_timer(self, number, value): - if self.__getattribute__("hop_%s_added" % number) is not True and time.time() > ( - self.timer_end - (int(self.timer) * 60 - int(value) * 60)): + if self.__getattribute__("hop_%s_added" % number) is not True and (int(value) * 60) == ( + self.timer_end - int(time.time())): self.__setattr__("hop_%s_added" % number, True) self.notify("Hop Alert", "Please add Hop %s" % number, timeout=None) From 5fc5684e5624781c837fb665e68804b81d43fd89 Mon Sep 17 00:00:00 2001 From: swimIan Date: Sat, 9 Sep 2017 10:51:37 -0700 Subject: [PATCH 3/5] update boilstep and reorder steps in beerxml recipe import --- modules/base_plugins/brew_steps/__init__.py | 13 ++++++++++++- modules/recipe_import/beerxml.py | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/base_plugins/brew_steps/__init__.py b/modules/base_plugins/brew_steps/__init__.py index 8dcd82f..fb7c2b6 100644 --- a/modules/base_plugins/brew_steps/__init__.py +++ b/modules/base_plugins/brew_steps/__init__.py @@ -165,7 +165,9 @@ class BoilStep(StepBase): hop_2 = Property.Number("Hop 2 Addition", configurable=True, description="Second Hop alert") hop_2_added = Property.Number("", default_value=None) hop_3 = Property.Number("Hop 3 Addition", configurable=True) - hop_3_added = Property.Number("", default_value=None, description="Second Hop alert") + hop_3_added = Property.Number("", default_value=None, description="Third Hop alert") + fining = Property.Number("Fining Addition", configurable=True, default_value=15) + fining_added = Property.Number("",default_value=None, description="Fining Agent Alert") def init(self): ''' @@ -203,6 +205,13 @@ class BoilStep(StepBase): self.__setattr__("hop_%s_added" % number, True) self.notify("Hop Alert", "Please add Hop %s" % number, timeout=None) + def check_fining_timer(self, value): + + if self.__getattribute__("fining_added") is not True and (int(value) * 60) == ( + self.timer_end - int(time.time())): + self.__setattr__("fining_added", True) + self.notify("Fining Alert", "Please add fining agent", timeout=None) + def execute(self): ''' This method is execute in an interval @@ -212,11 +221,13 @@ class BoilStep(StepBase): if self.get_kettle_temp(self.kettle) >= float(self.temp): # Check if Timer is Running if self.is_timer_finished() is None: + self.notify("Boil Temp Reached", "Starting the boil timer") self.start_timer(int(self.timer) * 60) else: self.check_hop_timer(1, self.hop_1) self.check_hop_timer(2, self.hop_2) self.check_hop_timer(3, self.hop_3) + self.check_fining_timer(self.fining) # Check if timer finished and go to next step if self.is_timer_finished() == True: self.notify("Boil Step Completed!", "Starting the next step", timeout=None) diff --git a/modules/recipe_import/beerxml.py b/modules/recipe_import/beerxml.py index 91335d4..8883cb3 100644 --- a/modules/recipe_import/beerxml.py +++ b/modules/recipe_import/beerxml.py @@ -70,9 +70,9 @@ class BeerXMLImport(FlaskView): Step.insert(**{"name": "MashIn", "type": mashinstep_type, "config": {"kettle": mash_kettle, "temp": infuse}}) for row in steps: Step.insert(**{"name": row.get("name"), "type": mashstep_type, "config": {"kettle": mash_kettle, "temp": float(row.get("temp")), "timer": row.get("timer")}}) - Step.insert(**{"name": "ChilStep", "type": "ChilStep", "config": {"timer": 15}}) ## Add cooking step Step.insert(**{"name": "Boil", "type": boilstep_type, "config": {"kettle": boil_kettle, "temp": boil_temp, "timer": boil_time}}) + Step.insert(**{"name": "ChilStep", "type": "ChilStep", "config": {"timer": 15}}) ## Add Whirlpool step Step.insert(**{"name": "Whirlpool", "type": "ChilStep", "config": {"timer": 15}}) self.api.emit("UPDATE_ALL_STEPS", Step.get_all()) From d637c08eba91d67be08666aab38693225db71e89 Mon Sep 17 00:00:00 2001 From: swimIan Date: Fri, 29 Sep 2017 13:12:03 -0700 Subject: [PATCH 4/5] update to reflect changes in the master branch --- modules/base_plugins/brew_steps/__init__.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/base_plugins/brew_steps/__init__.py b/modules/base_plugins/brew_steps/__init__.py index fb7c2b6..d674817 100644 --- a/modules/base_plugins/brew_steps/__init__.py +++ b/modules/base_plugins/brew_steps/__init__.py @@ -166,6 +166,10 @@ class BoilStep(StepBase): hop_2_added = Property.Number("", default_value=None) hop_3 = Property.Number("Hop 3 Addition", configurable=True) hop_3_added = Property.Number("", default_value=None, description="Third Hop alert") + hop_4 = Property.Number("Hop 4 Addition", configurable=True) + hop_4_added = Property.Number("", default_value=None, description="Fourth Hop alert") + hop_5 = Property.Number("Hop 5 Addition", configurable=True) + hop_5_added = Property.Number("", default_value=None, description="Fifth Hop alert") fining = Property.Number("Fining Addition", configurable=True, default_value=15) fining_added = Property.Number("",default_value=None, description="Fining Agent Alert") @@ -227,6 +231,8 @@ class BoilStep(StepBase): self.check_hop_timer(1, self.hop_1) self.check_hop_timer(2, self.hop_2) self.check_hop_timer(3, self.hop_3) + self.check_hop_timer(4, self.hop_4) + self.check_hop_timer(5, self.hop_5) self.check_fining_timer(self.fining) # Check if timer finished and go to next step if self.is_timer_finished() == True: From 8d2c5c916a16ce5f16c7c1c384e367b9cace3a0c Mon Sep 17 00:00:00 2001 From: swimIan Date: Fri, 29 Sep 2017 13:40:55 -0700 Subject: [PATCH 5/5] Updated again --- modules/base_plugins/brew_steps/__init__.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/base_plugins/brew_steps/__init__.py b/modules/base_plugins/brew_steps/__init__.py index d674817..d534746 100644 --- a/modules/base_plugins/brew_steps/__init__.py +++ b/modules/base_plugins/brew_steps/__init__.py @@ -160,16 +160,16 @@ class BoilStep(StepBase): temp = Property.Number("Temperature", configurable=True, default_value=100, description="Target temperature for boiling") kettle = StepProperty.Kettle("Kettle", description="Kettle in which the boiling step takes place") timer = Property.Number("Timer in Minutes", configurable=True, default_value=90, description="Timer is started when target temperature is reached") - hop_1 = Property.Number("Hop 1 Addition", configurable=True, description="Fist Hop alert") + hop_1 = Property.Number("Hop 1 Addition", configurable=True, description="First Hop alert") hop_1_added = Property.Number("",default_value=None) hop_2 = Property.Number("Hop 2 Addition", configurable=True, description="Second Hop alert") hop_2_added = Property.Number("", default_value=None) - hop_3 = Property.Number("Hop 3 Addition", configurable=True) - hop_3_added = Property.Number("", default_value=None, description="Third Hop alert") - hop_4 = Property.Number("Hop 4 Addition", configurable=True) - hop_4_added = Property.Number("", default_value=None, description="Fourth Hop alert") - hop_5 = Property.Number("Hop 5 Addition", configurable=True) - hop_5_added = Property.Number("", default_value=None, description="Fifth Hop alert") + hop_3 = Property.Number("Hop 3 Addition", configurable=True, description="Third Hop alert") + hop_3_added = Property.Number("", default_value=None) + hop_4 = Property.Number("Hop 4 Addition", configurable=True, description="Fourth Hop alert") + hop_4_added = Property.Number("", default_value=None) + hop_5 = Property.Number("Hop 5 Addition", configurable=True, description="Fifth Hop alert") + hop_5_added = Property.Number("", default_value=None) fining = Property.Number("Fining Addition", configurable=True, default_value=15) fining_added = Property.Number("",default_value=None, description="Fining Agent Alert")