diff --git a/cbpi/controller/basic_controller2.py b/cbpi/controller/basic_controller2.py index 67d7b87..750bc73 100644 --- a/cbpi/controller/basic_controller2.py +++ b/cbpi/controller/basic_controller2.py @@ -107,14 +107,14 @@ class BasicController: logging.error("{} Cant start {} - {}".format(self.name, id, e)) def get_types(self): - logging.info("{} Get Types".format(self.name)) +# logging.info("{} Get Types".format(self.name)) result = {} for key, value in self.types.items(): result[key] = dict(name=value.get("name"), properties=value.get("properties"), actions=value.get("actions")) return result def get_state(self): - logging.info("{} Get State".format(self.name)) +# logging.info("{} Get State".format(self.name)) return {"data": list(map(lambda x: x.to_dict(), self.data)), "types":self.get_types()} async def add(self, item): diff --git a/cbpi/controller/upload_controller.py b/cbpi/controller/upload_controller.py index 4451d4c..d559572 100644 --- a/cbpi/controller/upload_controller.py +++ b/cbpi/controller/upload_controller.py @@ -312,7 +312,7 @@ class UploadController: step_string = { "name": step_name, "props": { - "AutoMode": "Yes" if step_type == "MashInStep" else "No", + "AutoMode": "Yes" if step_type == "MashInStep" or step_type == "MashStep" else "No", "Kettle": self.id, "Sensor": self.kettle.sensor, "Temp": step_temp, @@ -459,7 +459,7 @@ class UploadController: step_string = { "name": step_name, "props": { - "AutoMode": "Yes" if step_type == "MashInStep" else "No", + "AutoMode": "Yes" if step_type == "MashInStep" or step_type == "MashStep" else "No", "Kettle": self.id, "Sensor": self.kettle.sensor, "Temp": step_temp,