Commit graph

821 commits

Author SHA1 Message Date
Alexander Vollkopf
781f68dca6
Merge pull request #62 from prash3r/dev-config-changes
changes to cbpi-dev-config, logs and the devcontainer.
2022-10-02 15:45:01 +02:00
lopelex
89da0bec04
remove unused import 2022-09-30 07:36:21 +02:00
lopelex
d1c38af3ae add First_Wort_text and fix error in json_recipe_creation #367 2022-09-29 12:11:06 +02:00
lopelex
2bc5bbb183 add hop text 2022-09-28 16:56:14 +02:00
prash3r
50fa87d6df repairs plugin creation inside the devcontainer
strange windows volume behaviour needs a small delay
between template folder unzip and rename.
reverts user changes of the dev container
which werent the cause of this problem.
2022-09-24 21:55:36 +02:00
prash3r
e7aa0a64c7 repairs log_file_controller.py.
I seem to have exidentally search and replaced some
needed glob.glob calls when adding dinamic log location,
which should now be repaired.
There also was a mysterious cbpi_dashboard_1.json appearing
in the wrong folder which now inside the dashboard folder.
I also figured out how to run tests locally,
they should now respect the dynamic folder paths.
2022-09-24 15:19:34 +02:00
prash3r
e0d809c3a3 additional requirements.txt for devcontainer only
inside the dev container default config there now is a
'additional-dev-requirements.txt' file that allows us to
ship additional python packages requirements
with a default development config.
2022-09-24 12:58:26 +02:00
prash3r
fea1ba04f0 corrected some more places where ./logs was used
instead of the dynamically given logs path.
2022-09-16 18:56:52 +02:00
prash3r
6bf1b14a36 notify clients on log events worse than INFO 2022-09-16 16:54:33 +02:00
prash3r
1fa3f88997 adds the 'cbpi create' command to vscode.
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).
2022-09-16 10:25:31 +02:00
prash3r
ac9b599619 check_for_setup() now checks for provided logs folder path 2022-09-14 19:36:51 +02:00
prash3r
706bbac9f0 keeps default dev config unchanged.
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.
2022-09-14 19:14:52 +02:00
prash3r
cfc876f2f4 KBH import with and without whirlpool additions 2022-09-14 15:08:59 +02:00
prash3r
f924e1a683 adds journalctl arg '--output cat' (log exports),
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.
2022-09-14 13:54:58 +02:00
prash3r
c56d7ccc51 adds --logs-folder-path as cli option 2022-09-12 21:54:51 +02:00
prash3r
4952861a58 logs folder is next to the active config folder.
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.
2022-09-09 18:44:48 +02:00
prash3r
b5ca644e80 Merge branch 'dev-config-changes' of github.com:prash3r/craftbeerpi4 into dev-config-changes 2022-09-09 13:08:40 +02:00
prash3r
e61fbdb69c extends #62
reorders the .vscode tasks so run is the default hopefully.
removes code that was commented out anyway.
2022-09-07 12:39:52 +02:00
prash3r
2076c66eb5 uploaded restored_config.zip is now placed in provided config folder and not the working directory where it will be ignored on restart 2022-09-03 13:43:17 +02:00
prash3r
76b11a7247 imports the whirlpool hop addition kbh with timer
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.
2022-09-02 18:17:08 +02:00
prash3r
2f085965c7 extends cbpi-dev-config to be a complete set.
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.
2022-09-02 17:00:50 +02:00
avollkopf
ac3c880523 actor update api for WS 2022-08-31 20:46:27 +02:00
avollkopf
9c6ede13f1 change upload controller to support kbh 2.4.0 hop timer categories 2022-08-14 13:39:08 +02:00
avollkopf
c7d01c33f6 change version # for pipe animation speed 2022-08-14 12:42:29 +02:00
Alexander Vollkopf
635ea3649c
Merge pull request #58 from phylax2020/master
Add parameter in settings to slow down pipe animation in dashboard
2022-08-07 13:57:45 +02:00
phylax2020
c0997ff357 Add setting parameter for dashboard pipe animation slow down 2022-07-21 10:27:54 +02:00
Alexander Vollkopf
205389f246
Merge pull request #57 from phylax2020/master
log_file_controller.py and __init__.py in ConfigUpdate reloaded
2022-07-19 21:53:33 +02:00
phylax2020
16190124d0 hopefully this commit works! 2022-07-19 21:03:17 +02:00
phylax2020
41018182de Merge branch 'master' of https://github.com/phylax2020/craftbeerpi4
# Conflicts:
#	cbpi/controller/log_file_controller.py
2022-07-19 20:54:34 +02:00
phylax2020
ff0ba76cc0 log_file_controller added again 2022-07-19 20:47:11 +02:00
phylax2020
752d9a27b6 delete log_file_controller.py. will be later restored 2022-07-19 20:45:26 +02:00
phylax2020
313f9d4b39 Set default logfile size to 100000 bytes 2022-07-19 20:28:36 +02:00
phylax2020
5ea4160b4f
Merge branch 'master' into master 2022-07-19 18:36:14 +02:00
phylax2020
c85b929b75 Annotations for logfile maximum size revised 2022-07-19 18:27:10 +02:00
Alexander Vollkopf
3d72071303
Merge pull request #55 from avollkopf/revert-54-master
Revert "Allow changing logfile size and logfile backup count"
2022-07-19 17:41:01 +02:00
Alexander Vollkopf
49b5067841
Revert "Allow changing logfile size and logfile backup count" 2022-07-19 17:36:37 +02:00
Alexander Vollkopf
ce1db9b188
Merge pull request #54 from phylax2020/master
Allow changing logfile size and logfile backup count
2022-07-19 17:36:27 +02:00
phylax2020
abe87b4218 Logfile size and backup logfile count in config.json 2022-07-19 09:39:27 +02:00
avollkopf
4d85c4c6af Update minor version 2022-07-16 10:26:32 +02:00
phylax2020
8621888d81 Allow changing log file size and log file backup count in settings. Default for log file size is now 130000 bytes (was 1MB). Dashboard with charts can be blocked
if accumulated size of log file data exceeds some megabytes. Also chart refresh rate should be greater than some 10 seconds so that chart plots can not block the user interface.
In functions get_data (for dashboard charts) and get_data2 (for chart in analytics) the pandas resample function is reactivated respectively added to further reduce the amount of data to be transferred to the clients.
In function log_data max_bytes and backup_count must be converted to int, when these settings are changed in the settings dialog.
2022-07-15 21:47:23 +02:00
Alexander Vollkopf
459c4207fe
Merge pull request #52 from chappo/master
Set MQTT Actor Power Level to Zero if Switched Off
2022-07-10 18:17:29 +02:00
Alexander Vollkopf
82e2c1b61a
Merge pull request #53 from phylax2020/master
Missing string conversion of value in log_data function.
2022-07-10 17:16:43 +02:00
phylax2020
e95237eef6 limit log data transfer to not exceed 2 times max_rows = 1000 rows by removing every nth row. This keeps the user interface operable. 2022-07-09 22:23:26 +02:00
phylax2020
4652b2b516 Missing string conversion of value in log_data function. 2022-07-03 21:28:19 +02:00
chappo
a4f1de3953
Set power to Zero if the actor is switched off.
Set power to Zero if the actor is switched off.
2022-06-07 13:35:32 +08:00
chappo
55db17e4fe
Set Power to Zero if Switched Off
Set power to Zero if the actor is switched off.
2022-06-07 13:35:06 +08:00
Alexander Vollkopf
58175bf951
Merge pull request #51 from avollkopf/development
fix restore backup issue
2022-05-12 21:28:16 +02:00
avollkopf
9634e876ce fix restor backup issue 2022-05-12 21:27:12 +02:00
Alexander Vollkopf
25c96b2df4
Merge pull request #50 from avollkopf/development
Add license information to setup.py
2022-05-12 07:14:18 +02:00
avollkopf
e86c3d2f1c Add license information to setup.py 2022-05-12 07:11:39 +02:00