From c01d14699700f6a533ae7378b460304b3c1e1bc7 Mon Sep 17 00:00:00 2001 From: Rhuan Costa Date: Sat, 3 Feb 2018 22:28:08 -0200 Subject: [PATCH 1/3] Fixed hop alert GUI Fixed typos and GUI hints on hop time alert - boiling step. --- modules/base_plugins/brew_steps/__init__.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/base_plugins/brew_steps/__init__.py b/modules/base_plugins/brew_steps/__init__.py index 16dd65b..0c21341 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 (minutes before finish)") hop_1_added = Property.Number("",default_value=None) - hop_2 = Property.Number("Hop 2 Addition", configurable=True, description="Second Hop alert") + hop_2 = Property.Number("Hop 2 Addition", configurable=True, description="Second Hop alert (minutes before finish)") 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="Fives Hop alert") + hop_3 = Property.Number("Hop 3 Addition", configurable=True, description="Third Hop alert (minutes before finish)") + hop_3_added = Property.Number("", default_value=None) + hop_4 = Property.Number("Hop 4 Addition", configurable=True, description="Fourth Hop alert (minutes before finish)") + hop_4_added = Property.Number("", default_value=None) + hop_5 = Property.Number("Hop 5 Addition", configurable=True, description="Fifth Hop alert (minutes before finish)") + hop_5_added = Property.Number("", default_value=None) def init(self): ''' From 28b1bca5f67f91902770ff0a4ed11569c6bc34c0 Mon Sep 17 00:00:00 2001 From: Rhuan Costa Date: Sat, 3 Feb 2018 22:41:32 -0200 Subject: [PATCH 2/3] Fixed bug when not all hop times are filled When hop times were left blank on boiling configuration, step timer didn't appear on GUI, neither the alert. Alert time also fixed to be shown the entered amount of minutes before the end of boiling process. Not after the boiling start. --- modules/base_plugins/brew_steps/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/base_plugins/brew_steps/__init__.py b/modules/base_plugins/brew_steps/__init__.py index 0c21341..fdd4962 100644 --- a/modules/base_plugins/brew_steps/__init__.py +++ b/modules/base_plugins/brew_steps/__init__.py @@ -201,9 +201,9 @@ 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 (value != "" + and self.__getattribute__("hop_%s_added" % number) is not True + and (time.time() > (self.timer_end - int(value)*60))): self.__setattr__("hop_%s_added" % number, True) self.notify("Hop Alert", "Please add Hop %s" % number, timeout=None) From f14c2b66399aff65ac9b32a5e6e0b19edbb64d0e Mon Sep 17 00:00:00 2001 From: Rhuan Costa Date: Sat, 3 Feb 2018 22:51:35 -0200 Subject: [PATCH 3/3] Fixed hop time not checked if temperature dropped below setpoint Hop time was not being checked in case the temperature dropped below the setpoint, even when into the offset margin. Now it's being checked every iteration after the timer starts. --- modules/base_plugins/brew_steps/__init__.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/base_plugins/brew_steps/__init__.py b/modules/base_plugins/brew_steps/__init__.py index fdd4962..4ebe832 100644 --- a/modules/base_plugins/brew_steps/__init__.py +++ b/modules/base_plugins/brew_steps/__init__.py @@ -217,12 +217,15 @@ class BoilStep(StepBase): # Check if Timer is Running if self.is_timer_finished() is None: 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_hop_timer(4, self.hop_4) - self.check_hop_timer(5, self.hop_5) + + # Check if hop time reached + if self.is_timer_finished() == False: + 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) + # 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)