mirror of
https://github.com/PiBrewing/craftbeerpi4.git
synced 2024-11-21 22:48:16 +01:00
Some fixes
- Different names for fermentersteps as Notificationstep caused an issue (steps not yot implemented for fermentation) - Reverted back item based mqtt as this may require further testing -> will be activated in dev branch later
This commit is contained in:
parent
a8f7f2d92f
commit
dfa5df2ef1
5 changed files with 16 additions and 11 deletions
|
@ -1 +1 @@
|
|||
__version__ = "4.0.1.a7"
|
||||
__version__ = "4.0.1.0"
|
||||
|
|
|
@ -55,8 +55,9 @@ class BasicController:
|
|||
|
||||
async def push_udpate(self):
|
||||
self.cbpi.ws.send(dict(topic=self.update_key, data=list(map(lambda item: item.to_dict(), self.data))))
|
||||
for item in self.data:
|
||||
self.cbpi.push_update("cbpi/{}/{}".format(self.update_key,item.id), item.to_dict())
|
||||
self.cbpi.push_update("cbpi/{}".format(self.update_key), list(map(lambda item: item.to_dict(), self.data)))
|
||||
#for item in self.data:
|
||||
# self.cbpi.push_update("cbpi/{}/{}".format(self.update_key,item.id), item.to_dict())
|
||||
|
||||
def find_by_id(self, id):
|
||||
return next((item for item in self.data if item.id == id), None)
|
||||
|
|
|
@ -111,8 +111,10 @@ class FermentationController:
|
|||
|
||||
def push_update(self):
|
||||
self.cbpi.ws.send(dict(topic=self.update_key, data=list(map(lambda item: item.to_dict(), self.data))))
|
||||
for item in self.data:
|
||||
self.cbpi.push_update("cbpi/{}/{}".format(self.update_key,item.id), item.to_dict())
|
||||
self.cbpi.push_update("cbpi/{}".format(self.update_key), list(map(lambda item: item.to_dict(), self.data)))
|
||||
|
||||
#for item in self.data:
|
||||
# self.cbpi.push_update("cbpi/{}/{}".format(self.update_key,item.id), item.to_dict())
|
||||
pass
|
||||
|
||||
async def shutdown(self, app=None):
|
||||
|
|
|
@ -72,7 +72,7 @@ class StepController:
|
|||
self._loop.create_task(self.start_step(active_step))
|
||||
|
||||
async def add(self, item: Step):
|
||||
logging.debug("Add step")
|
||||
logging.info("Add step")
|
||||
item.id = shortuuid.uuid()
|
||||
item.status = StepState.INITIAL
|
||||
try:
|
||||
|
@ -256,8 +256,10 @@ class StepController:
|
|||
self.cbpi.ws.send(dict(topic="mash_profile_update", data=self.get_state()))
|
||||
else:
|
||||
self.cbpi.ws.send(dict(topic="step_update", data=list(map(lambda item: item.to_dict(), self.profile))))
|
||||
for item in self.profile:
|
||||
self.cbpi.push_update(topic="cbpi/stepupdate/{}".format(item.id), data=(item.to_dict()))
|
||||
|
||||
self.cbpi.push_update(topic="cbpi/stepupdate", data=list(map(lambda item: item.to_dict(), self.profile)))
|
||||
#for item in self.profile:
|
||||
# self.cbpi.push_update(topic="cbpi/stepupdate/{}".format(item.id), data=(item.to_dict()))
|
||||
|
||||
async def start_step(self,step):
|
||||
try:
|
||||
|
|
|
@ -21,7 +21,7 @@ import warnings
|
|||
|
||||
@parameters([Property.Text(label="Notification",configurable = True, description = "Text for notification"),
|
||||
Property.Select(label="AutoNext",options=["Yes","No"], description="Automatically move to next step (Yes) or pause after Notification (No)")])
|
||||
class NotificationStep(CBPiFermentationStep):
|
||||
class FermenterNotificationStep(CBPiFermentationStep):
|
||||
|
||||
async def NextStep(self, **kwargs):
|
||||
await self.next()
|
||||
|
@ -65,7 +65,7 @@ class NotificationStep(CBPiFermentationStep):
|
|||
Property.Kettle(label="Kettle"),
|
||||
Property.Text(label="Notification",configurable = True, description = "Text for notification when Temp is reached"),
|
||||
Property.Select(label="AutoMode",options=["Yes","No"], description="Switch Kettlelogic automatically on and off -> Yes")])
|
||||
class TargetTempStep(CBPiFermentationStep):
|
||||
class FermenterTargetTempStep(CBPiFermentationStep):
|
||||
|
||||
async def NextStep(self, **kwargs):
|
||||
await self.next()
|
||||
|
@ -228,4 +228,4 @@ def setup(cbpi):
|
|||
|
||||
cbpi.plugin.register("NotificationStep", NotificationStep)
|
||||
cbpi.plugin.register("TargetTempStep", TargetTempStep)
|
||||
cbpi.plugin.register("FermentationStep", FermentationStep)
|
||||
cbpi.plugin.register("FermentationStep", FermentationStep)
|
||||
|
|
Loading…
Reference in a new issue