Merge branch 'master' into patch-1

modules/buzzer/__init__.py

@@ -9,7 +9,7 @@ except Exception as e:
 
 class Buzzer(object):
 
-    sound = ["H", 0.1, "L", "H", 0.1, "L", "H", 0.1, "L", "H", 0.1, "L"]
+    sound = ["H", 0.1, "L", 0.1, "H", 0.1, "L", 0.1, "H", 0.1, "L"]
     def __init__(self, gpio):
         try:
             cbpi.app.logger.info("INIT BUZZER NOW GPIO%s" % gpio)

modules/recipe_import/beerxml.py

@@ -51,8 +51,6 @@ class BeerXMLImport(FlaskView):
         name = self.getRecipeName(id)
         self.api.set_config_parameter("brew_name", name)
         boil_time = self.getBoilTime(id)
-        mashin_temp = 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)
 
@@ -65,8 +63,7 @@ class BeerXMLImport(FlaskView):
         StepView().reset()
 
         try:
-            ## Add Mashin step
-            Step.insert(**{"name": "MashIn", "type": mashinstep_type, "config": {"kettle": mash_kettle, "temp": mashin_temp}})
+
             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}})
@@ -90,10 +87,6 @@ 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()
-        return float('./RECIPE[%s]/MASH/MASH_STEPS/INFUSE_TEMP' % (str(id))).text)
-
     def getSteps(self, id):