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

Merge pull request #47 from Prash3r/master

Browse source 
BasicController manages state of item.instance.running
This commit is contained in:
Manuel83 2021-03-11 22:23:44 +01:00 committed by GitHub
commit 9c3a1f564b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cbpi/controller/basic_controller2.py
View file

@ -76,9 +76,9 @@ class BasicController:
async def stop(self, id): async def stop(self, id):
logging.info("{} Stop Id {} ".format(self.name, id)) logging.info("{} Stop Id {} ".format(self.name, id))
try: try:
print("STOP NOW")
item = self.find_by_id(id) item = self.find_by_id(id)
await item.instance.stop() await item.instance.stop()
item.instance.running = False
await self.push_udpate() await self.push_udpate()
except Exception as e: except Exception as e:
logging.error("{} Cant stop {} - {}".format(self.name, id, e)) logging.error("{} Cant stop {} - {}".format(self.name, id, e))
@ -87,7 +87,7 @@ class BasicController:
logging.info("{} Start Id {} ".format(self.name, id)) logging.info("{} Start Id {} ".format(self.name, id))
try: try:
item = self.find_by_id(id) item = self.find_by_id(id)
if item.instance is not None and item.instance.state is True: if item.instance is not None and item.instance.running is True:
logging.warning("{} already running {}".format(self.name, id)) logging.warning("{} already running {}".format(self.name, id))
return return
if item.type is None: if item.type is None:
@ -97,6 +97,7 @@ class BasicController:
item.instance = clazz(self.cbpi, item.id, item.props) item.instance = clazz(self.cbpi, item.id, item.props)
await item.instance.start() await item.instance.start()
item.instance.running = True
item.instance.task = self._loop.create_task(item.instance._run()) item.instance.task = self._loop.create_task(item.instance._run())
logging.info("{} started {}".format(self.name, id)) logging.info("{} started {}".format(self.name, id))

2
cbpi/extension/dummysensor/__init__.py
View file

@ -15,7 +15,7 @@ class CustomSensor(CBPiSensor):
self.value = 0 self.value = 0
async def run(self): async def run(self):
while True: while self.running == True:
self.value = random.randint(10,100) self.value = random.randint(10,100)
self.log_data(self.value) self.log_data(self.value)

4
cbpi/extension/gpioactor/__init__.py
View file

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

2
cbpi/extension/hysteresis/__init__.py
View file

@ -18,7 +18,7 @@ class Hysteresis(CBPiKettleLogic):
# self.get_actor_state() # self.get_actor_state()
while True: while self.running == True:
sensor_value = self.get_sensor_value(self.kettle.sensor).get("value") sensor_value = self.get_sensor_value(self.kettle.sensor).get("value")
target_temp = self.get_kettle_target_temp(self.id) target_temp = self.get_kettle_target_temp(self.id)

9
cbpi/extension/mashstep/__init__.py
View file

@ -38,7 +38,7 @@ class MashStep(CBPiStep):
self.timer = Timer(int(self.props.Timer) *60 ,on_update=self.on_timer_update, on_done=self.on_timer_done) self.timer = Timer(int(self.props.Timer) *60 ,on_update=self.on_timer_update, on_done=self.on_timer_done)
async def run(self): async def run(self):
while True: while self.running == True:
await asyncio.sleep(1) await asyncio.sleep(1)
sensor_value = self.get_sensor_value(self.props.Sensor) 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: if sensor_value.get("value") >= int(self.props.Temp) and self.timer.is_running is not True:
@ -83,7 +83,7 @@ class WaitStep(CBPiStep):
self.timer = Timer(int(self.props.Timer) * 60,on_update=self.on_timer_update, on_done=self.on_timer_done) self.timer = Timer(int(self.props.Timer) * 60,on_update=self.on_timer_update, on_done=self.on_timer_done)
async def run(self): async def run(self):
while True: while self.running == True:
await asyncio.sleep(1) await asyncio.sleep(1)
return StepResult.DONE return StepResult.DONE
@ -114,8 +114,7 @@ class ActorStep(CBPiStep):
self.timer = Timer(int(self.props.Timer) *60 ,on_update=self.on_timer_update, on_done=self.on_timer_done) self.timer = Timer(int(self.props.Timer) *60 ,on_update=self.on_timer_update, on_done=self.on_timer_done)
async def run(self): async def run(self):
while self.running == True:
while True:
await asyncio.sleep(1) await asyncio.sleep(1)
return StepResult.DONE return StepResult.DONE
@ -155,7 +154,7 @@ class BoilStep(CBPiStep):
self.timer.start() self.timer.start()
async def run(self): async def run(self):
while True: while self.running == True:
await asyncio.sleep(1) await asyncio.sleep(1)
sensor_value = self.get_sensor_value(self.props.Sensor) 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: if sensor_value.get("value") >= int(self.props.Temp) and self.timer.is_running is not True:

2
cbpi/extension/onewire/__init__.py
View file

@ -77,7 +77,7 @@ class OneWire(CBPiSensor):
pass pass
async def run(self): async def run(self):
while True: while self.running == True:
self.value = self.t.value self.value = self.t.value
self.log_data(self.value) self.log_data(self.value)