Home-IoT/craftbeerpi4-pione
1
0
Fork 0
mirror of https://github.com/PiBrewing/craftbeerpi4.git synced 2024-11-10 01:17:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

changed mqtt step notification topic to 'stepnotification'

Browse source
This commit is contained in:
avollkopf 2022-01-12 18:34:59 +01:00
parent 027966af12
commit ff638b2d13
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cbpi/__init__.py
View file

@ -1 +1,2 @@
__version__ = "4.0.1.a9" __version__ = "4.0.1.a10"

10
cbpi/controller/step_controller.py
View file

@ -117,7 +117,7 @@ class StepController:
step = self.find_by_status(StepState.STOP) step = self.find_by_status(StepState.STOP)
if step is not None: if step is not None:
logging.info("Resume step") logging.info("Resume step")
self.cbpi.push_update(topic="cbpi/notification", data=dict(type="info", title="Resume", message="Calling resume step")) self.cbpi.push_update(topic="cbpi/stepnotification", data=dict(type="info", title="Resume", message="Calling resume step"))
await self.start_step(step) await self.start_step(step)
await self.save() await self.save()
return return
@ -125,13 +125,13 @@ class StepController:
step = self.find_by_status(StepState.INITIAL) step = self.find_by_status(StepState.INITIAL)
if step is not None: if step is not None:
logging.info("Start Step") logging.info("Start Step")
self.cbpi.push_update(topic="cbpi/notification", data=dict(type="info", title="Start", message="Calling start step")) self.cbpi.push_update(topic="cbpi/stepnotification", data=dict(type="info", title="Start", message="Calling start step"))
self.push_udpate(complete=True) self.push_udpate(complete=True)
await self.start_step(step) await self.start_step(step)
await self.save() await self.save()
return return
self.cbpi.notify("Brewing Complete", "Now the yeast will take over",action=[NotificationAction("OK")]) self.cbpi.notify("Brewing Complete", "Now the yeast will take over",action=[NotificationAction("OK")])
self.cbpi.push_update(topic="cbpi/notification", data=dict(type="info", title="Brewing completed", message="Now the yeast will take over")) self.cbpi.push_update(topic="cbpi/stepnotification", data=dict(type="info", title="Brewing completed", message="Now the yeast will take over"))
logging.info("BREWING COMPLETE") logging.info("BREWING COMPLETE")
async def previous(self): async def previous(self):
@ -172,7 +172,7 @@ class StepController:
logging.info("CALLING STOP STEP") logging.info("CALLING STOP STEP")
try: try:
await step.instance.stop() await step.instance.stop()
self.cbpi.push_update(topic="cbpi/notification", data=dict(type="info", title="Pause", message="Calling paue step")) self.cbpi.push_update(topic="cbpi/stepnotification", data=dict(type="info", title="Pause", message="Calling paue step"))
step.status = StepState.STOP step.status = StepState.STOP
await self.save() await self.save()
@ -189,7 +189,7 @@ class StepController:
item.status = StepState.INITIAL item.status = StepState.INITIAL
try: try:
await item.instance.reset() await item.instance.reset()
self.cbpi.push_update(topic="cbpi/notification", data=dict(type="info", title="Stop", message="Calling stop step")) self.cbpi.push_update(topic="cbpi/stepnotification", data=dict(type="info", title="Stop", message="Calling stop step"))
except: except:
logging.warning("No Step Instance - Id: %s", item.id) logging.warning("No Step Instance - Id: %s", item.id)
await self.save() await self.save()

1
cbpi/craftbeerpi.py
View file

@ -55,7 +55,6 @@ from cbpi.http_endpoints.http_fermentation import FermentationHttpEndpoints
import shortuuid import shortuuid
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@web.middleware @web.middleware
async def error_middleware(request, handler): async def error_middleware(request, handler):
try: try: