Commit graph

702 commits

Author SHA1 Message Date
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
Alexander Vollkopf
f966419c58
Merge pull request #49 from avollkopf/development
Development -> version update for release
2022-05-12 07:07:15 +02:00
avollkopf
e2c2e88d94 Version change fr release 2022-05-12 07:05:25 +02:00
avollkopf
d148dc0b38 update workflow 2022-05-11 07:47:06 +02:00
avollkopf
3c8801780c Merge branch 'development' of https://github.com/avollkopf/craftbeerpi4 into development 2022-05-11 07:42:43 +02:00
Alexander Vollkopf
d209472238
Update README.md 2022-05-11 07:38:35 +02:00
avollkopf
4cb340ba45 update README 2022-05-11 07:36:21 +02:00
Alexander Vollkopf
261b391895
Merge pull request #48 from avollkopf/testrelease
merge in Testrelease
2022-05-11 07:33:48 +02:00
avollkopf
4744070063 change docker ui to main 2022-05-11 07:29:58 +02:00
avollkopf
59274f23c2 some updated links 2022-05-10 17:52:23 +02:00
avollkopf
b1bd3dc9f4 adapt for release test with different gui package 2022-05-10 07:06:14 +02:00
avollkopf
29cc09c837 minor adaptions for release test 2022-05-09 22:29:50 +02:00
avollkopf
d36c18cb2a rename app to cbpi4 for test release 2022-05-09 17:10:36 +02:00
Alexander Vollkopf
a8b745c97b
Merge branch 'craftbeerpi:development' into development 2022-04-26 16:28:05 +02:00
Alexander Vollkopf
a00b77b45d
Merge branch 'craftbeerpi:master' into master 2022-04-26 16:27:52 +02:00
Alexander Vollkopf
988f19ebdd
Merge pull request #95 from craftbeerpi/development
bug fix plugin create in cli.py
2022-04-26 07:21:51 +02:00
avollkopf
cbce63eab3 fix plugin create in cli.py 2022-04-26 07:19:25 +02:00
Alexander Vollkopf
043e75303a
Merge branch 'craftbeerpi:development' into development 2022-04-25 07:18:07 +02:00
Alexander Vollkopf
f36b6d31ab
Merge branch 'craftbeerpi:master' into master 2022-04-25 07:17:37 +02:00
Alexander Vollkopf
4a4eed8fd8
Merge pull request #94 from craftbeerpi/development
disable sorting of elements by default
2022-04-23 20:42:46 +02:00