Merge pull request #59 from MrGunnery/Fix_some_issues

Fix some issues

cbpi/api/step.py

@@ -1,23 +1,20 @@
 import asyncio
-import json
-import logging
-import time
-from abc import ABCMeta, abstractmethod
-from enum import Enum
+from abc import abstractmethod
 
 from cbpi.api.base import CBPiBase
-from cbpi.api.config import ConfigType
 
 __all__ = ["StepResult", "StepState", "StepMove", "CBPiStep"]
 
 from enum import Enum
 
+
 class StepResult(Enum):
     STOP = 1
     NEXT = 2
     DONE = 3
     ERROR = 4
 
+
 class StepState(Enum):
     INITIAL = "I"
     DONE = "D"
@@ -25,10 +22,12 @@ class StepState(Enum):
     ERROR = "E"
     STOP = "S"
 
+
 class StepMove(Enum):
     UP = -1
     DOWN = 1
 
+
 class CBPiStep(CBPiBase):
 
     def __init__(self, cbpi, id, name, props, on_done) -> None:
@@ -40,21 +39,25 @@ class CBPiStep(CBPiBase):
         self.props = props
         self.cancel_reason: StepResult = None
         self.summary = ""
+        self.running: bool = False
 
     def _done(self, task):
         self._done_callback(self, task.result())
 
     async def start(self):
+        self.running = True
         self.task = asyncio.create_task(self._run())
         self.task.add_done_callback(self._done)
 
     async def next(self):
+        self.running = False
         self.cancel_reason = StepResult.NEXT
         self.task.cancel()
         await self.task
 
     async def stop(self):
         try:
+            self.running = False
             self.cancel_reason = StepResult.STOP
             self.task.cancel()
             await self.task

cbpi/extension/dummysensor/__init__.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 import asyncio
 import random
-import re
-import random
-from aiohttp import web
-from cbpi.api import *
+
+from cbpi.api import parameters, CBPiSensor
 
 
 @parameters([])
@@ -13,20 +11,20 @@ class CustomSensor(CBPiSensor):
     def __init__(self, cbpi, id, props):
         super(CustomSensor, self).__init__(cbpi, id, props)
         self.value = 0
-    async def run(self):
 
-        while self.running == True:
+    async def run(self):
+        while self.running:
             self.value = random.randint(10, 100)
             self.log_data(self.value)
 
             self.push_update(self.value)
             await asyncio.sleep(1)
+
     def get_state(self):
         return dict(value=self.value)
 
 
 def setup(cbpi):
-
     '''
     This method is called by the server during startup
     Here you need to register your plugins at the server

cbpi/extension/gpioactor/__init__.py

@@ -105,7 +105,7 @@ class GPIOPWMActor(CBPiActor):
         return self.state
     
     async def run(self):
-        while self.runnin == True:
+        while self.running == True:
             
             await asyncio.sleep(1)
 

cbpi/extension/mashstep/__init__.py

@@ -1,19 +1,15 @@
-
 import asyncio
-from cbpi.api.step import CBPiStep, StepResult
+
+from cbpi.api import parameters, Property, action
+from cbpi.api.step import StepResult, CBPiStep
 from cbpi.api.timer import Timer
-from cbpi.api import *
-import logging
+
 
 @parameters([Property.Number(label="Timer", description="Time in Minutes", configurable=True),
              Property.Number(label="Temp", configurable=True),
              Property.Sensor(label="Sensor"),
              Property.Kettle(label="Kettle")])
 class MashStep(CBPiStep):
-
-    
-        
-        
     async def on_timer_done(self, timer):
         self.summary = ""
         await self.next()
@@ -25,6 +21,8 @@ class MashStep(CBPiStep):
     async def on_start(self):
         if self.timer is None:
             self.timer = Timer(int(self.props.Timer) * 60, on_update=self.on_timer_update, on_done=self.on_timer_done)
+        if self.cbpi.kettle is not None:
+            await self.cbpi.kettle.set_target_temp(self.props.Kettle, int(self.props.Temp))
         self.summary = "Waiting for Target Temp"
         await self.push_update()
 
@@ -38,7 +36,7 @@ class MashStep(CBPiStep):
         self.timer = Timer(int(self.props.Timer) * 60, on_update=self.on_timer_update, on_done=self.on_timer_done)
 
     async def run(self):
-        while True:
+        while self.running == True:
             await asyncio.sleep(1)
             sensor_value = self.get_sensor_value(self.props.Sensor)
             if sensor_value.get("value") >= int(self.props.Temp) and self.timer.is_running is not True:
@@ -47,7 +45,6 @@ class MashStep(CBPiStep):
         return StepResult.DONE
 
 
-
 @parameters([Property.Number(label="Timer", description="Time in Minutes", configurable=True)])
 class WaitStep(CBPiStep):
 
@@ -55,12 +52,10 @@ class WaitStep(CBPiStep):
     async def hello(self, **kwargs):
         print("ACTION")
 
-
     @action(key="Custom Step Action 2", parameters=[])
     async def hello2(self, **kwargs):
         print("ACTION2")
 
-
     async def on_timer_done(self, timer):
         self.summary = ""
         await self.next()
@@ -87,6 +82,7 @@ class WaitStep(CBPiStep):
             await asyncio.sleep(1)
         return StepResult.DONE
 
+
 @parameters([Property.Number(label="Timer", description="Time in Minutes", configurable=True),
              Property.Actor(label="Actor")])
 class ActorStep(CBPiStep):
@@ -136,7 +132,8 @@ class BoilStep(CBPiStep):
     async def on_start(self):
         if self.timer is None:
             self.timer = Timer(int(self.props.Timer) * 60, on_update=self.on_timer_update, on_done=self.on_timer_done)
-
+        if self.cbpi.kettle is not None:
+            await self.cbpi.kettle.set_target_temp(self.props.Kettle, int(self.props.Temp))
         self.summary = "Waiting for Target Temp"
         await self.push_update()
 
@@ -162,6 +159,7 @@ class BoilStep(CBPiStep):
                 self.timer.is_running = True
         return StepResult.DONE
 
+
 def setup(cbpi):
     '''
     This method is called by the server during startup 
@@ -175,8 +173,3 @@ def setup(cbpi):
     cbpi.plugin.register("WaitStep", WaitStep)
     cbpi.plugin.register("MashStep", MashStep)
     cbpi.plugin.register("ActorStep", ActorStep)
-    
-    
-    
-
-    

cbpi/extension/mqtt_sensor/__init__.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 import asyncio
-import random
-import re
-from aiohttp import web
-from cbpi.api import *
+
+from cbpi.api import parameters, Property, CBPiSensor
 
 
 @parameters([Property.Text(label="Topic", configurable=True)])
@@ -11,18 +9,19 @@ class MQTTSensor(CBPiSensor):
 
     async def on_message(self, message):
         try:
-            self.value = message
+            self.value = float(message)
             self.log_data(self.value)
-            self.push_update(message)
+            self.push_update(self.value)
         except Exception as e:
             print(e)
 
     def __init__(self, cbpi, id, props):
         super(MQTTSensor, self).__init__(cbpi, id, props)
         self.mqtt_task = self.cbpi.satellite.subcribe(self.props.Topic, self.on_message)
+        self.value: int = 0
 
     async def run(self):
-        while self.running == True:
+        while self.running:
             await asyncio.sleep(1)
 
     def get_state(self):
@@ -36,8 +35,8 @@ class MQTTSensor(CBPiSensor):
             except asyncio.CancelledError:
                 pass
 
-def setup(cbpi):
 
+def setup(cbpi):
     '''
     This method is called by the server during startup
     Here you need to register your plugins at the server