Commit graph

652 commits

Author SHA1 Message Date
phylax2020
0c957de5e5 Copy dashboard files from config folder to config/dashboard when upgrading to version 4.0.7. Detect missing or empty dashboard file in config/dashboard. 2023-01-05 10:01:57 +01:00
Alexander Vollkopf
08f292209f
Merge pull request #77 from avollkopf/development
Development
2022-12-10 15:14:33 +01:00
avollkopf
6a356c6add bump rev from rc to major 2022-12-10 14:21:07 +01:00
avollkopf
cde20f647d fix notify on error 2022-12-02 20:25:27 +01:00
avollkopf
9f655c9393 Add parameter for Notify on Error 2022-12-02 20:05:30 +01:00
avollkopf
7e0eb0f30d bump rev 2022-11-27 16:08:11 +01:00
avollkopf
05b70e3cd7 Fix log level setting for cli 2022-11-27 15:16:18 +01:00
avollkopf
f13993db31 removed loop from asyncio.queue (depracted since py 3.9 and removed in 3.10) 2022-11-27 10:49:59 +01:00
avollkopf
f83ee71369 bump rev 2022-11-19 12:47:55 +01:00
Alexander Vollkopf
a9f3bef7c7
Merge pull request #75 from lopelex/development
add hop text
2022-11-19 12:21:04 +01:00
avollkopf
0105d15f14 update gitignore 2022-11-17 19:46:42 +01:00
avollkopf
5dc9089c80 update requirements 2022-11-17 19:44:32 +01:00
avollkopf
afeba81740 bump rev 2022-11-17 19:41:06 +01:00
avollkopf
f38697df93 update requirements 2022-11-17 19:40:20 +01:00
lopelex
4e234f4753 add hop text 2022-11-05 12:57:44 +01:00
avollkopf
8b2e0fb1d8 avoid error logging / notification for Notification step w/o Sensor definittion 2022-10-22 14:08:59 +02:00
avollkopf
17a2d403bf added missing updated for boilstep 2022-10-22 13:02:13 +02:00
Alexander Vollkopf
9a1e457505
Merge pull request #74 from avollkopf/hop-name-test
Hop name test
2022-10-22 12:48:52 +02:00
Alexander Vollkopf
0b0ee24ab4
Merge branch 'development' into hop-name-test 2022-10-22 12:36:15 +02:00
Alexander Vollkopf
f13c8de190
Merge pull request #71 from lopelex/hop_text
add hop name to BoilStep and UploadController
2022-10-22 12:28:07 +02:00
lopelex
2ebc659bcf fix conflicts with #62 2022-10-03 16:28:42 +02:00
avollkopf
21ce9ed220 update version number 2022-10-03 12:11:53 +02:00
Alexander Vollkopf
7021131967
Merge pull request #70 from avollkopf/revert-68-hop_text
Revert "add hop name to BoilStep and UploadController"
2022-10-03 12:05:22 +02:00
Alexander Vollkopf
92ddb2a45a
Revert "add hop name to BoilStep and UploadController" 2022-10-03 12:04:42 +02:00
Alexander Vollkopf
6e1f1fadce
Merge pull request #68 from lopelex/hop_text
add hop name to BoilStep and UploadController
2022-10-03 11:42:04 +02:00
Alexander Vollkopf
cb60b6d5c5
Merge branch 'development' into hop_text 2022-10-03 11:37:19 +02:00
Alexander Vollkopf
7c87a2b054
Merge pull request #69 from prash3r/move-dashboard-files
moves cbpi_dashboard_*.json to subfolder dashboard.
2022-10-03 11:20:41 +02:00
prash3r
7f16a8b9b5 not copying empty cbpi_dashboard_1.json anymore.
will be created on first dashboard save instead.
2022-10-02 19:01:14 +02:00
prash3r
2a0daf354c moves cbpi_dashboard_*.json to dashboard folder.
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.
2022-10-02 18:32:40 +02:00
Alexander Vollkopf
8c8d09ed72
Merge pull request #65 from prash3r/notify-log-events
notify clients on log events worse than INFO
2022-10-02 16:15:08 +02:00
Alexander Vollkopf
24ae03405c
Merge pull request #63 from prash3r/kbh-whirlpool-step
imports the whirlpool hop addition kbh with timer
2022-10-02 16:10:23 +02:00
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