Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #77

Merged
merged 66 commits into from
Dec 10, 2022
Merged

Development #77

merged 66 commits into from
Dec 10, 2022

Conversation

avollkopf
Copy link
Member

Merge development branch into main: 4.0.6 -> 4.0.7

chappo and others added 30 commits June 7, 2022 13:35
Set power to Zero if the actor is switched off.
Set power to Zero if the actor is switched off.
Missing string conversion of value in log_data function.
Set MQTT Actor Power Level to Zero if Switched Off
# Conflicts:
#	cbpi/controller/log_file_controller.py
log_file_controller.py and __init__.py in ConfigUpdate reloaded
Add parameter in settings to slow down pipe animation in dashboard
cbpi requires empty folders inside the config folder to fully function, and this commit adds them.
There are also some more extensive checks on missing files and folders newly implemented.
As well as checking for restored_config.zip is now done before checking for config.yaml.
On unsuccessfull restore the zip file is renamed instead of deleted.
previously the whirlpool step has been ignored when importing from a kbh database.
on creation the whirlpoolstep would only be on a hardcoded 15 minute timer.
I added the optional timer as argument to create_Whirlpool_Cooldown().
And made use of it for negative hops timer imported from KBH.
For KBH databases this is valid because if the hops timer value is negative it can only be the whirlpool timer
and the value is the time that is set for the brewing device for getting from boil to below 80°C.
I did only test the data and not the functionality,
but it sucessfully replaces the hardcoded "15" timer with the value
from the first whirlpool hop addition while getting rid of the sign.
…and not the working directory where it will be ignored on restart
reorders the .vscode tasks so run is the default hopefully.
removes code that was commented out anyway.
It was wherever 'cbpi setup' was run from.
and if no config folder path is provided its still the same.
This also adds a file based global logger placed in the logs folder.
The sensor loggers respect the new logs folder location.
because cbpi already writes timestamps into the logs
and we dont need two timestamps when exporting.
This commit also reverts to using the same formatter for all logHandlers.
this commit moves the default config into a seperate folder.
And it adds a preLaunchTask
which copies the default dev config to the used dev config.
This is done with the cp option '-ru'
so if the files in the target dir (current config)
are newer they are not overwritten.
also initilizes plugin names with dashes instead of underscores.
everything now runs as root inside the dev container
(otherwise the permissions for cbpi create wouldnt be sufficient).
lopelex and others added 29 commits September 30, 2022 07:36
changes to cbpi-dev-config, logs and the devcontainer.
imports the whirlpool hop addition kbh with timer
notify clients on log events worse than INFO
if the file cbpi_dashboard_1.json doesnt exist in the dashboard folder
every cbpi_dashboard_*.json file from the config folder is moved to the dashboard folder.
This also removes the empty default cbpi_dashboard_1.json file from the template folder,
because the file is not needed for cbpi to function and can be created when editing the dashboard online.
will be created on first dashboard save instead.
moves cbpi_dashboard_*.json to subfolder dashboard.
add hop name to BoilStep and UploadController
Revert "add hop name to BoilStep and UploadController"
add hop name to BoilStep and UploadController
@avollkopf avollkopf merged commit 08f2922 into master Dec 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants