Home-IoT/craftbeerpi4-pione
1
0
Fork 0
mirror of https://github.com/PiBrewing/craftbeerpi4.git synced 2024-11-09 17:07:43 +01:00
Code Issues Projects Releases Packages Wiki Activity
767 commits 4 branches 0 tags 83 MiB
Commit graph

510 commits

Author SHA1 Message Date
avollkopf
7d9d010e0c keyword 'globalsettings' in plugin setup.py required to show up on settings page 2023-04-03 20:39:35 +02:00
avollkopf
1357aa2a0e fix in http_plugin endpoint 2023-04-02 18:27:15 +02:00
avollkopf
73200890a1 removed logging item 2023-04-02 17:01:56 +02:00
avollkopf
754d8be21f update currentdashbardnumber to hidden 2023-04-02 16:32:10 +02:00
avollkopf
be77d90c7e automatic config update test 2023-04-02 16:14:33 +02:00
avollkopf
5f3e3ea60d Add 'All' and 'steps' as categories 2023-04-02 13:05:48 +02:00
avollkopf
a70c63edf4 add http api to retreive only plugin names 2023-04-01 14:18:44 +02:00
avollkopf
7fa738d240 test 2023-04-01 14:13:04 +02:00
avollkopf
35252a2b83 change rev 2023-03-29 06:53:59 +02:00
avollkopf
0364769573 fixed another bug in case of no logging during inactivity 2023-03-28 07:00:21 +02:00
avollkopf
7df48bdf08 missing varable in mqttsensor 2023-03-27 22:31:47 +02:00
avollkopf
54eb769fb3 another fix 2023-03-27 22:12:11 +02:00
avollkopf
b52e260b4a bug fix 2023-03-27 22:04:54 +02:00
avollkopf
187426eb4a added sensor disabling with fermenter/kettle inactivity 2023-03-27 20:19:37 +02:00
avollkopf
5a2b0a8bd0 bump version to rc1 2023-03-26 16:41:45 +02:00
avollkopf
37203dd93e uncomment 'break' in listening -> does not help to shutdown faster 2023-03-26 15:22:44 +02:00
avollkopf
b0406a4de8 cancelling also mqtt listening on cacnellederror 2023-03-26 11:36:18 +02:00
avollkopf
3768a77dfe added soome additional info on cancelled task 2023-03-25 19:15:26 +01:00
avollkopf
bcf9b3e06b improved handling in cancelling the mqtt subscription 2023-03-25 18:50:36 +01:00
avollkopf
62298ae844 additional logging in mqttsensor task cancel 2023-03-25 18:35:17 +01:00
avollkopf
6e066282c4 some tweaks 2023-03-25 14:56:04 +01:00
avollkopf
3186c182f7 test 2023-03-25 14:23:21 +01:00
avollkopf
c5d6cb5ae5 test 2023-03-25 14:15:30 +01:00
avollkopf
84bb745054 test 2023-03-25 13:54:24 +01:00
avollkopf
5cbc7e1393 test 2023-03-25 13:51:13 +01:00
avollkopf
1fcbe91e09 test 2023-03-25 13:27:15 +01:00
avollkopf
848fb4e778 test 2023-03-25 13:25:07 +01:00
avollkopf
5f24e2d149 test 2023-03-25 13:19:02 +01:00
avollkopf
a8ec65b3e4 update 2023-03-25 12:56:37 +01:00
avollkopf
9257b95e37 additional logging info 2023-03-25 12:44:28 +01:00
avollkopf
5bc5259bc3 added reduced logging functionality to httpsensor 2023-03-25 11:56:01 +01:00
avollkopf
88528f6df7 added reduced logging fucntionality to onewire sensor (depeding on kettle or fermenter activity) 2023-03-25 11:30:38 +01:00
avollkopf
2aa2ef71ba mqttsensor with reduced logging freqency option on inactive fermenter or kettle 2023-03-25 10:56:42 +01:00
avollkopf
9a8b0ca30f separate influxdb write to async routine (test) 2023-03-24 18:58:35 +01:00
avollkopf
c4333d2cab change cryptography version to 40 (fix security issue). Tested with raspbian 32 and 64 bit versions 2023-03-24 18:10:20 +01:00
Alexander Vollkopf
ec1f79d7a1
Bump revision 
Bump to 4.1.7.a3 due to the last PR (Influxdb handling of non-ASCII symbols)
 2023-03-24 07:08:57 +01:00
pascal1404
6996a93d2b
Merge pull request #103 from mstrinzha/influxdb 
InfluxDB: support non-ASCII symbols in sensor names
 2023-03-23 22:01:59 +01:00
Maxim Strinzha
15b275b22e Setup default ULR for influxdb 2023-03-21 22:58:35 +03:00
Maxim Strinzha
c59931dfc1 InfluxDB: support non-ASCII symbols in sensor names. Fix for InfluxDB Cloud 2023-03-19 16:10:01 +03:00
avollkopf
f975eb7a47 added global settings parameter for buzzer sound in UI 2023-03-18 16:05:13 +01:00
Maxim Strinzha
03d1521c5e InfluxDB: support non-ASCII symbols in sensor names 2023-03-18 16:39:35 +03:00
avollkopf
7aecdac6a7 change in influxdb address requirements 2023-03-13 07:14:26 +01:00
avollkopf
8dae24502b bump revision 2023-03-09 07:28:26 +01:00
avollkopf
2c13b3c62f catch nen existing logfile for analytics page 2023-03-08 21:39:07 +01:00
avollkopf
f5e6b22f01 timer fix 2023-03-08 19:21:07 +01:00
avollkopf
bffa3c36e3 minor changes to timer code 2023-03-08 06:58:17 +01:00
avollkopf
4d1c24e2c1 removed some notifications from alarmtimer 2023-03-08 06:50:18 +01:00
avollkopf
f7c0c7b2fa added Alarmtimer (Sensor with actions) -> Ui 0.3.10 required 2023-03-07 22:24:23 +01:00
avollkopf
d0278c2448 test with sensor datatype -> should allow datetime in sensors. requires also new ui version (0.3.8) 2023-03-06 20:11:53 +01:00
avollkopf
4c0aa22e98 adapted dockerfiles to new org 2023-03-04 16:03:04 +01:00
avollkopf
2c978400b9 set actor power added to api 2023-03-04 15:03:21 +01:00
avollkopf
6d5fd493df Hysteresis extension: switch heater only on/off once 2023-03-02 06:51:57 +01:00
avollkopf
be59c7c9e4 allow float values for kettle target temp 2023-02-11 15:30:19 +01:00
avollkopf
616503eed6 added dwell time to boilstep 2023-02-07 19:34:58 +01:00
prash3r
7a1aabd123 fixes #87 cli create problem 2023-02-07 18:02:17 +01:00
avollkopf
760d9b8c7a bump revision 2023-02-01 06:41:34 +01:00
avollkopf
679d10d4dc newer pandas in requirements 2023-01-29 12:26:03 +01:00
avollkopf
90f94525be trying to fix dleetion of logfiles via analytics page 2023-01-28 16:34:09 +01:00
avollkopf
853920be6d Fixed Typo in fermenterhysteresis description 2023-01-27 17:09:53 +01:00
avollkopf
56ec309dab transfer guiversion to gui 2023-01-27 12:26:55 +01:00
avollkopf
366d6cbe91 Improved handling of missing or corrupt step_data and fermenterstep_data files at startup 2023-01-26 17:43:19 +01:00
avollkopf
9e50b790e0 aded sensor name and timestamp of last data to notification 2023-01-23 07:15:29 +01:00
avollkopf
85490cebc8 added timeout notification to mqtt sensor; => 0 value will deactivate function 2023-01-22 19:53:54 +01:00
avollkopf
47e3bcb529 added alarm to httpsensor on timeout 2023-01-22 16:37:10 +01:00
avollkopf
4ddc9690ef added timeout parameter to notificartion controller for potential later usage in UI 2023-01-20 21:26:40 +01:00
avollkopf
2429ea63d1 some fixes in tests and parameter for influxdb measurement name 2023-01-20 17:31:23 +01:00
avollkopf
10e603e81c require latest numpy t-> works with python up to 3.11 in devcontainer 2023-01-15 14:21:16 +01:00
avollkopf
2d5ca55718 add unique client id for mqtt broker 2023-01-15 09:33:11 +01:00
avollkopf
7f76645b05 adapted sattelite_controller init to upcomming asyncio-mqtt requirements 2023-01-15 08:25:01 +01:00
avollkopf
f5d9d4304a bump version 2023-01-08 13:38:07 +01:00
avollkopf
4dd20ff985 partial update for sattelite controller to adapt to future requirements of asyncio-mqtt 
Still some additional work required
 2023-01-08 12:05:17 +01:00
avollkopf
8d6f21749d replaced PyInquirer with inquirer for python 3.10 compatibility 2023-01-07 22:39:08 +01:00
avollkopf
1f7cd381ad updated packages requirements to latest available packages 2023-01-07 16:43:08 +01:00
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
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
afeba81740 bump rev 2022-11-17 19:41:06 +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
0b0ee24ab4
Merge branch 'development' into hop-name-test 2022-10-22 12:36:15 +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
92ddb2a45a
Revert "add hop name to BoilStep and UploadController" 2022-10-03 12:04:42 +02:00
Alexander Vollkopf
cb60b6d5c5
Merge branch 'development' into hop_text 2022-10-03 11:37:19 +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
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
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
49b5067841
Revert "Allow changing logfile size and logfile backup count" 2022-07-19 17:36:37 +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
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
avollkopf
9634e876ce fix restor backup issue 2022-05-12 21:27:12 +02:00
avollkopf
e2c2e88d94 Version change fr release 2022-05-12 07:05:25 +02:00
avollkopf
59274f23c2 some updated links 2022-05-10 17:52:23 +02:00
avollkopf
29cc09c837 minor adaptions for release test 2022-05-09 22:29:50 +02:00
avollkopf
cbce63eab3 fix plugin create in cli.py 2022-04-26 07:19:25 +02:00
avollkopf
1b85eefad2 disable sorting of elements by default 2022-04-23 20:32:32 +02:00
avollkopf
da975f92b2 fix spunding hysteresis temp control 2022-04-11 13:06:32 +02:00
avollkopf
d63bbbb887 sort order needs also change in basic controller for existing data 2022-04-11 10:15:08 +02:00
avollkopf
9ac0141e4d sort hardware by name 2022-04-11 10:06:54 +02:00
avollkopf
4d95017842 Added dummy pressure sensor for testing of spunding functionality 2022-04-10 17:48:36 +02:00
avollkopf
d1f656f509 Added pressure to steps 2022-04-05 12:31:20 +02:00
avollkopf
1f25b3ae03 Fix in case no valve is defined for fermenter 2022-04-05 07:43:19 +02:00
avollkopf
4acb19fcc5 Added valve release time and pause as parameters 2022-04-04 19:56:47 +02:00
avollkopf
946d4c6261 aded wait step when spundung valve is closed 2022-04-04 07:21:41 +02:00