Merge pull request #4 from Manuel83/master

Update

modules/base_plugins/brew_steps/__init__.py

@@ -21,7 +21,7 @@ class MashStep(StepBase):
     def init(self):
         '''
         Initialize Step. This method is called once at the beginning of the step
-        :return: 
+        :return:
         '''
         # set target tep
         self.set_target_temp(self.temp, self.kettle)
@@ -31,7 +31,7 @@ class MashStep(StepBase):
         '''
         Custom Action which can be execute form the brewing dashboard.
         All method with decorator @cbpi.action("YOUR CUSTOM NAME") will be available in the user interface
-        :return: 
+        :return:
         '''
         if self.is_timer_finished() is None:
             self.start_timer(int(self.timer) * 60)
@@ -46,7 +46,7 @@ class MashStep(StepBase):
     def execute(self):
         '''
         This method is execute in an interval
-        :return: 
+        :return:
         '''
 
         # Check if Target Temp is reached
@@ -57,6 +57,7 @@ class MashStep(StepBase):
 
         # Check if timer finished and go to next step
         if self.is_timer_finished() == True:
+            self.notify("Mash Step Completed!", "Starting the next step", timeout=None)
             self.next()
 
 
@@ -77,7 +78,7 @@ class MashInStep(StepBase):
     def init(self):
         '''
         Initialize Step. This method is called once at the beginning of the step
-        :return: 
+        :return:
         '''
         # set target tep
         self.s = False
@@ -88,7 +89,7 @@ class MashInStep(StepBase):
     def execute(self):
         '''
         This method is execute in an interval
-        :return: 
+        :return:
         '''
 
         # Check if Target Temp is reached
@@ -169,7 +170,7 @@ class BoilStep(StepBase):
     def init(self):
         '''
         Initialize Step. This method is called once at the beginning of the step
-        :return: 
+        :return:
         '''
         # set target tep
         self.set_target_temp(self.temp, self.kettle)
@@ -182,7 +183,7 @@ class BoilStep(StepBase):
         '''
         Custom Action which can be execute form the brewing dashboard.
         All method with decorator @cbpi.action("YOUR CUSTOM NAME") will be available in the user interface
-        :return: 
+        :return:
         '''
         if self.is_timer_finished() is None:
             self.start_timer(int(self.timer) * 60)
@@ -205,7 +206,7 @@ class BoilStep(StepBase):
     def execute(self):
         '''
         This method is execute in an interval
-        :return: 
+        :return:
         '''
         # Check if Target Temp is reached
         if self.get_kettle_temp(self.kettle) >= float(self.temp):
@@ -218,4 +219,5 @@ class BoilStep(StepBase):
                 self.check_hop_timer(3, self.hop_3)
         # 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)
             self.next()

modules/core/controller.py

@@ -74,6 +74,14 @@ class ControllerBase(object):
 
 class KettleController(ControllerBase, ActorController, SensorController):
 
+    @staticmethod
+    def chart(kettle):
+        result = []
+        result.append({"name": "Temp", "data_type": "sensor", "data_id": kettle.sensor})
+        result.append({"name": "Target Temp", "data_type": "kettle", "data_id": kettle.id})
+
+        return result
+
     def __init__(self, *args, **kwds):
         ControllerBase.__init__(self, *args, **kwds)
         self.kettle_id = kwds.get("kettle_id")
@@ -107,6 +115,13 @@ class KettleController(ControllerBase, ActorController, SensorController):
 
 class FermenterController(ControllerBase, ActorController, SensorController):
 
+    @staticmethod
+    def chart(fermenter):
+        result = []
+        result.append({"name": "Temp", "data_type": "sensor", "data_id": fermenter.sensor})
+        result.append({"name": "Target Temp", "data_type": "fermenter", "data_id": fermenter.id})
+        return result
+
     def __init__(self, *args, **kwds):
         ControllerBase.__init__(self, *args, **kwds)
         self.fermenter_id = kwds.get("fermenter_id")

modules/logs/endpoints.py

@@ -65,6 +65,8 @@ class LogView(FlaskView):
                     pass
         return array
 
+    def convert_chart_data_to_json(self, chart_data):
+        return {"name": chart_data["name"], "data": self.read_log_as_json(chart_data["data_type"], chart_data["data_id"])}
 
     @route('/<t>/<int:id>', methods=["POST"])
     def get_logs_as_json(self, t, id):
@@ -76,13 +78,12 @@ class LogView(FlaskView):
 
         if t == "k":
             kettle = cbpi.cache.get("kettle").get(id)
-            result.append({"name": "Temp", "data": self.read_log_as_json("sensor", kettle.sensor)})
-            result.append({"name": "Target Temp", "data": self.read_log_as_json("kettle", kettle.id)})
+            result = map(self.convert_chart_data_to_json, cbpi.get_controller(kettle.logic).get("class").chart(kettle))
 
         if t == "f":
             fermenter = cbpi.cache.get("fermenter").get(id)
-            result.append({"name": "Temp", "data": self.read_log_as_json("sensor", fermenter.sensor)})
-            result.append({"name": "Target Temp", "data": self.read_log_as_json("fermenter", fermenter.id)})
+            result = map(self.convert_chart_data_to_json, cbpi.get_fermentation_controller(fermenter.logic).get("class").chart(fermenter))
+
         return json.dumps(result)
 
     @route('/download/<file>')