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

Merge pull request #92 from craftbeerpi/development

Browse source 
Development
This commit is contained in:
Alexander Vollkopf 2022-03-30 17:42:18 +02:00 committed by GitHub
commit c781f9cd2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 145 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cbpi/__init__.py
View file

@ -1,2 +1,3 @@
__version__ = "4.0.3.a2"
__version__ = "4.0.4.a3"
__codename__ = "Spring Break"

14
cbpi/controller/fermentation_controller.py
View file

@ -54,10 +54,7 @@ class FermentationController:
for step in fermenter.steps:
try:
self.logger.info("Stop {}".format(step.name))
try:
step.instance.shutdown = True
except:
pass
step.instance.shutdown = True
await step.instance.stop()
except Exception as e:
self.logger.error(e)
@ -67,10 +64,7 @@ class FermentationController:
for step in fermenter.steps:
try:
self.logger.info("Stop {}".format(step.name))
try:
step.instance.shutdown = True
except:
pass
step.instance.shutdown = True
await step.instance.stop()
except Exception as e:
self.logger.error(e)
@ -305,6 +299,8 @@ class FermentationController:
item = self._find_by_id(id)
# might require later check if step is active
item.steps = []
item.brewname = ""
self.push_update()
self.save()
self.push_update("fermenterstepupdate")
@ -588,4 +584,4 @@ class FermentationController:
self.save()
self.push_update("fermenterstepupdate")
return step

5
cbpi/craftbeerpi.py
View file

@ -12,7 +12,7 @@ from cbpi.controller.notification_controller import NotificationController
import logging
from os import urandom
import os
from cbpi import __version__
from cbpi import __version__, __codename__
from aiohttp import web
from aiohttp_auth import auth
from aiohttp_session import session_middleware
@ -95,7 +95,8 @@ class CraftBeerPi:
self.path = os.sep.join(os.path.abspath(__file__).split(os.sep)[:-1]) # The path to the package dir
self.version = __version__
self.codename = __codename__
self.static_config = load_config(os.path.join(".", 'config', "config.yaml"))
logger.info("Init CraftBeerPI")

121
cbpi/extension/FermentationStep/__init__.py
View file

@ -81,8 +81,9 @@ class FermenterTargetTempStep(CBPiFermentationStep):
if self.AutoMode == True:
await self.setAutoMode(False)
self.cbpi.notify(self.name, self.props.get("Notification","Target Temp reached. Please add malt and klick next to move on."))
await self.next(self.fermenter.id)
return StepResult.DONE
if self.shutdown == False:
await self.next(self.fermenter.id)
return StepResult.DONE
async def on_timer_update(self,timer, seconds):
@ -183,7 +184,7 @@ class FermenterStep(CBPiFermentationStep):
if self.AutoMode == True:
await self.setAutoMode(False)
self.cbpi.notify(self.name, 'Step finished', NotificationType.SUCCESS)
if self.shutdown != True:
if self.shutdown == False:
await self.next(self.fermenter.id)
return StepResult.DONE
@ -291,6 +292,119 @@ class FermenterStep(CBPiFermentationStep):
except Exception as e:
logging.error("Failed to switch on FermenterLogic {} {}".format(self.fermenter.id, e))
@parameters([Property.Number(label="Temp", configurable=True, description = "Ramp to this temp"),
Property.Number(label="RampRate", configurable=True, description = "Ramp x °C/F per day. Default: 1"),
Property.Sensor(label="Sensor"),
Property.Text(label="Notification",configurable = True, description = "Text for notification when Temp is reached"),
Property.Select(label="AutoMode",options=["Yes","No"], description="Switch Fermenterlogic automatically on and off -> Yes")])
class FermenterRampTempStep(CBPiFermentationStep):
async def NextStep(self, **kwargs):
if self.shutdown == False:
await self.next(self.fermenter.id)
return StepResult.DONE
async def on_timer_done(self,timer):
self.summary = ""
await self.push_update()
if self.AutoMode == True:
await self.setAutoMode(False)
self.cbpi.notify(self.name, self.props.get("Notification","Target Temp reached. Please add malt and klick next to move on."))
await self.next(self.fermenter.id)
return StepResult.DONE
async def on_timer_update(self,timer, seconds):
await self.push_update()
async def on_start(self):
self.shutdown = False
self.AutoMode = True if self.props.get("AutoMode","No") == "Yes" else False
self.rate=float(self.props.get("RampRate",1))
logging.info(self.rate)
self.target_temp = round(float(self.props.get("Temp", 0))*10)/10
logging.info(self.target_temp)
while self.get_sensor_value(self.props.get("Sensor", None)).get("value") > 900:
await asyncio.sleep(1)
self.starttemp = self.get_sensor_value(self.props.get("Sensor", None)).get("value")
self.current_target_temp = self.starttemp
if self.fermenter is not None:
await self.set_fermenter_target_temp(self.fermenter.id, self.current_target_temp)
if self.AutoMode == True:
await self.setAutoMode(True)
self.summary = "Ramping to {}° with {}° per day".format(self.target_temp,self.rate)
if self.fermenter is not None and self.timer is None:
self.timer = Timer(1 ,on_update=self.on_timer_update, on_done=self.on_timer_done)
await self.push_update()
async def on_stop(self):
await self.timer.stop()
self.summary = ""
if self.AutoMode == True:
await self.setAutoMode(False)
await self.push_update()
async def calc_target_temp(self):
delta_time = time.time() - self.starttime
current_target_temp = round((self.starttemp + delta_time * self.ratesecond)*10)/10
# logging.info(current_target_temp)
if current_target_temp != self.current_target_temp:
self.current_target_temp = current_target_temp
await self.set_fermenter_target_temp(self.fermenter.id, self.current_target_temp)
#self.fermenter.target_temp = self.current_target_temp
await self.push_update()
pass
async def run(self):
self.delta_temp = self.target_temp-self.starttemp
try:
self.deltadays = abs(self.delta_temp / self.rate)
self.deltaseconds = self.deltadays * 24 * 60 * 60
self.ratesecond = self.delta_temp/self.deltaseconds
except Exception as e:
logging.info(e)
self.starttime=time.time()
if self.target_temp >= self.starttemp:
logging.info("warmup")
while self.running == True:
if self.current_target_temp != self.target_temp:
await self.calc_target_temp()
sensor_value = self.get_sensor_value(self.props.get("Sensor", None)).get("value")
if sensor_value >= self.target_temp and self.timer.is_running is not True:
self.timer.start()
self.timer.is_running = True
await asyncio.sleep(1)
elif self.target_temp <= self.starttemp:
logging.info("Cooldown")
while self.running == True:
if self.current_target_temp != self.target_temp:
await self.calc_target_temp()
sensor_value = self.get_sensor_value(self.props.get("Sensor", None)).get("value")
if sensor_value <= self.target_temp and self.timer.is_running is not True:
self.timer.start()
self.timer.is_running = True
await asyncio.sleep(1)
await self.push_update()
return StepResult.DONE
async def reset(self):
self.timer = Timer(1 ,on_update=self.on_timer_update, on_done=self.on_timer_done)
self.timer.is_running == False
async def setAutoMode(self, auto_state):
try:
if (self.fermenter.instance is None or self.fermenter.instance.state == False) and (auto_state is True):
await self.cbpi.fermenter.toggle(self.fermenter.id)
elif (self.fermenter.instance.state == True) and (auto_state is False):
await self.fermenter.instance.stop()
await self.push_update()
except Exception as e:
logging.error("Failed to switch on FermenterLogic {} {}".format(self.fermenter.id, e))
def setup(cbpi):
'''
@ -303,4 +417,5 @@ def setup(cbpi):
cbpi.plugin.register("FermenterNotificationStep", FermenterNotificationStep)
cbpi.plugin.register("FermenterTargetTempStep", FermenterTargetTempStep)
cbpi.plugin.register("FermenterRampTempStep", FermenterRampTempStep)
cbpi.plugin.register("FermenterStep", FermenterStep)

5
cbpi/http_endpoints/http_system.py
View file

@ -5,7 +5,7 @@ from cbpi.job.aiohttp import get_scheduler_from_app
import logging
from cbpi.api import request_mapping
from cbpi.utils import json_dumps
from cbpi import __version__
from cbpi import __version__, __codename__
import pathlib
import os
from cbpi.controller.system_controller import SystemController
@ -36,7 +36,8 @@ class SystemHttpEndpoints:
step=self.cbpi.step.get_state(),
fermentersteps=self.cbpi.fermenter.get_fermenter_steps(),
config=self.cbpi.config.get_state(),
version=__version__)
version=__version__,
codename=__codename__)
, dumps=json_dumps)
@request_mapping(path="/logs", auth_required=False)

21
release.py
View file

@ -1,3 +1,4 @@
import code
import subprocess
import click
import re
@ -9,17 +10,23 @@ def main():
@click.command()
@click.option('-m', prompt='Commit Message')
def commit(m):
new_content = []
file = "./cbpi/__init__.py"
with open(file) as reader:
match = re.search('.*\"(.*)\"', reader.readline())
major, minor, patch, build = match.group(1).split(".")
build = int(build)
build += 1
new_version = "__version__ = \"{}.{}.{}.{}\"".format(major,minor,patch, build)
codename = reader.readline()
try:
major, minor, patch, build = match.group(1).split(".")
except:
major, minor, patch = match.group(1).split(".")
patch = int(patch)
patch += 1
new_content.append("__version__ = \"{}.{}.{}\"".format(major,minor,patch))
new_content.append(codename)
with open(file,'w',encoding = 'utf-8') as file:
print("New Version {}.{}.{}.{}".format(major,minor,patch, build))
file.write(new_version)
print("New Version {}.{}.{}".format(major,minor,patch))
file.writelines("%s\n" % i for i in new_content)
subprocess.run(["git", "add", "-A"])
subprocess.run(["git", "commit", "-m", "\"{}\"".format(m)])