Commit graph

232 commits

Author SHA1 Message Date
avollkopf
42670efd9c Added fermenterstep with controlled ramp rate 2022-03-28 15:59:04 +02:00
avollkopf
cdc2ee83a3 fix if no description is given in fermenterrecipe 2022-03-15 21:15:38 +01:00
Manuel Fritsch
036e70e4bf Merge form dev branch 2022-03-13 12:52:40 +01:00
avollkopf
aa76c908ef wlan0 speed fix for linux / defalt mqtt actor off on startup 2022-03-09 08:25:17 +01:00
avollkopf
12803b62c4 check if nic is down 2022-03-08 19:43:37 +01:00
avollkopf
c3c4101b6b Added NIC Speed info to system controller 2022-03-08 14:25:00 +01:00
avollkopf
6ac93e5212 fix for stepid on load recipe/addstep 2022-03-07 16:43:00 +01:00
Manuel Fritsch
3b81f1d844 remove db and update get async loop 2022-03-06 14:39:52 +01:00
Manuel Fritsch
248be2c6e2 db removed 2022-03-06 14:37:44 +01:00
avollkopf
ecbb2d404d use current fermenter recipe name when sending recipe to fermenter 2022-03-05 16:07:15 +01:00
avollkopf
bce0a0025b cleanup in fermentation controller and setup.py 2022-03-05 11:02:49 +01:00
avollkopf
b1dc05b209 feasibility to update fermentersteps (not reqwuired yet) 2022-03-04 16:52:16 +01:00
avollkopf
a16c14feca fix for loading fermenterrecipes from recipe book -> add endtime = 0 2022-03-02 19:40:22 +01:00
avollkopf
662e8b4497 updated libs and fix eventloop from lib_update branch 2022-03-02 12:35:16 +01:00
avollkopf
1d3298fc60 autostart active fermenterstep with remaining time 2022-03-02 07:53:43 +01:00
avollkopf
5bcbb7480a fixes for femrentersteps on controler shutdown 2022-03-01 21:55:52 +01:00
avollkopf
959c33624d one more fix on timer reset for fermentationstep 2022-02-28 18:15:23 +01:00
avollkopf
a503995d98 update cli and remove target temp to 0 at fermenterstep end 2022-02-28 11:15:02 +01:00
avollkopf
580bdd899a Autostart active or stopped step with orignila endtime 2022-02-27 18:45:57 +01:00
avollkopf
ff37779863 Fermentation controller will start step instead of logic after restart 2022-02-26 23:08:45 +01:00
Manuel Fritsch
18476a78c0 updated of cli 2022-02-26 21:45:10 +01:00
avollkopf
b2d29678b5 Added fermenter recipe book 2022-02-24 13:46:56 +01:00
avollkopf
2d481bff81 added fermenterstep actions 2022-02-23 07:12:51 +01:00
avollkopf
3aa9ad9cd2 fix fermenter steps -> self.next() requires now fermenter id 2022-02-21 19:39:36 +01:00
avollkopf
84f9bbb67f update on fermentersteps for automode 2022-02-21 17:54:22 +01:00
avollkopf
36329fb533 further changes to support fermentersteps - WIP 2022-02-21 07:16:34 +01:00
avollkopf
286198fcd1 update on fermenter steps - Work In Progress 2022-02-18 20:22:16 +01:00
avollkopf
2cc2df0208 fermentertest 2022-02-17 21:42:54 +01:00
avollkopf
b8ef79d11c further tests on fermentersteps 2022-02-16 20:36:11 +01:00
avollkopf
033165d619 updated requirements in setup.py 2022-02-07 17:52:42 +01:00
pascal1404
49e8488c0b
Merge branch 'development' into master 2022-02-06 14:06:21 +01:00
pascal1404
ab60c5c0fc Remove kettle and fermenter target temp logs and actor logs 2022-02-06 14:05:31 +01:00
pascal1404
f8024f3b49 Add Influxdb-cloud connection and log for actor, fermenter and kettles 2022-02-04 20:48:55 +01:00
avollkopf
c1dacd691e added filters for mqtt updates that can be triggered via mqtt
cbpi/updatekettle
cbpi/updateactor
cbpi/updatesensor
cbpi/updatefermenter
2022-02-03 18:03:53 +01:00
avollkopf
0bf2b64c3e Reduction of duplicated mqtt actor messages 2022-02-03 17:00:12 +01:00
avollkopf
f2e9b1bebc Update fermentation_controller.py 2022-01-28 19:41:58 +01:00
avollkopf
2de62ca7d5 Added Actor for Cooldown step in settings
- Default Actor can be defined for cooldown to trigger cooling water on and off.
- will be used in automated recipe creation for cooldown step
2022-01-28 07:56:24 +01:00
pascal1404
1ecc8451e4 add condition for mashout step
add mashout step only if temp of last step is not the same as "Abmaischtemperatur" in MMuM-JSON.
2022-01-25 18:34:11 +01:00
pascal1404
7c90340236 Add mashout step to MMuM-JSON import 2022-01-25 18:16:04 +01:00
pascal1404
5c00b90390 Upload MMuM-JSON 2022-01-20 17:44:44 +01:00
avollkopf
6f60b7ae7c Reverted step controller mqtt topic back (requirement for mqttdevice) 2022-01-12 22:02:05 +01:00
avollkopf
ff638b2d13 changed mqtt step notification topic to 'stepnotification' 2022-01-12 18:34:59 +01:00
avollkopf
027966af12 Reverted back to item based mqtt updates for testing 2022-01-12 17:56:30 +01:00
Alexander Vollkopf
57af6cac59
Merge branch 'development' into development 2022-01-12 17:25:35 +01:00
avollkopf
dfa5df2ef1 Some fixes
- Different names for fermentersteps as Notificationstep caused an issue (steps not yot implemented for fermentation)
- Reverted back item based mqtt as this may require further testing -> will be activated in dev branch later
2022-01-11 06:59:16 +01:00
InnuendoPi
1640453525 4.01a8
Signed-off-by: InnuendoPi <k.ader@pc-team.de>
2022-01-08 23:29:21 +01:00
avollkopf
a8f7f2d92f Additional CBPIFermenterStep Class
Class has been activated but is not yet used
Fix in mqtt actor power action setting
2022-01-05 06:46:35 +01:00
avollkopf
49362aa098 Fixed Recipe import in case of two kettles
In case of different boil kettle, sensor from first kettle was used by external recipe import. Thi sis now fixed.
In case of different boil kettle, Sensor specified for this kettle will be used during external recipe import
2022-01-03 17:53:22 +01:00
avollkopf
51136aef88 Unification of mqtt data
-> sensor values are updated under sensordata/{sensorid}
One topic for each sensor to keep data small (esp compatibility)

actor, kettle, sensor, fermenter, steps are updated also for each id individually to keep packets small

e.g. actorupdate/{actorid}

This was proposed by Innuendo to ensure compatibility with the ESP based MQTTDevice
2022-01-03 12:47:20 +01:00
avollkopf
e43aaf4fcd Fix for Property Type Fermenter
-> allows usage of property.ferenter in sensors, steps,....
2022-01-02 17:08:23 +01:00
avollkopf
ba42027e75 Another fix based now on a life Pi system
- fixed storage of femrenter_data.json -> Fermenters are in 'data'
- fixed hysteresis
2022-01-02 13:24:40 +01:00
avollkopf
751b3dcad9 Bug fix for first startup w/o fermenter 2022-01-02 12:43:33 +01:00
avollkopf
d7c1b64493 Added Fermenters (development)
Added fermenter type
Added fermenter logic (incl. new class)
-> will require cbpi4ui -> >= 0.1.a1

Still under development, but fermentation w/o steps should be working
2022-01-02 11:25:56 +01:00
avollkopf
bee645ff96 activate chromium desktop via cli
- added option to activate chromium desktop on startup via cli
- save also actor, sensor, kettle and plugin information when log is downloaded
2021-12-27 18:11:40 +01:00
avollkopf
563fae9359 Add cbpi service logfile download via journalctl 2021-12-19 18:00:15 +01:00
avollkopf
9b3219d89c Test to transfer Data to influxdb
CSV logfile writing can be switched off via settings
influxdb can be switched on via settings

->Some changes will be required
2021-12-14 07:20:22 +01:00
avollkopf
b2fe624d08 Version change
- bumped Version to 4.0.0.56
- Uncommented on push_ update in basic_controller2.py which seemd to cause error messages during startup and is not required
2021-12-06 17:13:49 +01:00
Philipp Grathwohl
7413f79d6e Extend exception messages for warning logs 2021-12-03 13:26:18 +01:00
avollkopf
80bdac45ce some fixes for actor power
- Actor used to set power to 100 eventhough target was 0
- moved chromium.desktop file to config folder -> easier available for users and potential to enable chromium desktop via cbpi commandline in future
2021-12-02 14:48:39 +01:00
avollkopf
3724f76faa mqtt sensor fix
- mqtt sensor is now also working after changing the configuration
- config.yaml accepts now also 'true' besides 'True' to activate mqtt
2021-11-23 17:33:58 +01:00
avollkopf
75ab9b96fc Added MQTT Actor and power setting 2021-11-22 16:09:09 +01:00
avollkopf
19f3a16154 minor bug fix
Error message showed up when no instance of kettle was active
2021-11-21 13:59:54 +01:00
avollkopf
a0e89fe4dc Update kettle controller/mashsteps 2021-11-20 11:13:51 +01:00
avollkopf
2fca6dcdc9 Actor Power fixes 2021-11-15 20:18:33 +01:00
avollkopf
80a81c50a2 some tweaks for actor power settings 2021-11-11 11:22:13 +01:00
avollkopf
6e3dc392b6 SVG upload functionality 2021-11-09 18:32:00 +01:00
avollkopf
2462f9329a Update on pwm test
-> set power action should now update also directly in dashboard
2021-11-08 14:04:28 +01:00
avollkopf
4c543b46f7 added power to actor dataclass 2021-11-06 15:15:11 +01:00
avollkopf
c43a0a25bf Fix for StrikeTemp in case you operate system in F
BF i sending all temps in C and striketemp needs to be converterd to F if cbpi4 is running in F
2021-11-03 12:53:34 +01:00
avollkopf
326d24c48f BF StrikeTemp test and some fixes 2021-11-03 09:30:16 +01:00
avollkopf
ee2acda2e3 fixed issues with xml upload in case of non compatible characters 2021-10-28 18:35:00 +02:00
avollkopf
f8bd353f02 Added interim plugin list function 2021-10-16 14:22:04 +02:00
avollkopf
8459ad63d5 Moved restore config to cli.py
- cbpi is now checking if a zip is existing to restore the config during start.
- If zip is there, content is checked prior to restore
- if required content is found, config folder is removed and zip is extracted.
- afterwards zip is removed
- cbpi is starting with restored config

Version -> 4.0.0.38
2021-09-22 12:14:49 +02:00
avollkopf
bd2cb1b497 Added BoilKettle to settings
- Boilkettle is used for Boil, Whirlpool and Cooldown step
- If no kettle is selected, standard MASH_TUN will be used for these steps
2021-09-21 18:06:23 +02:00
avollkopf
e1e7de2924 Changed system controller to accomodate more system fucntions
- Backup and restore of config folder is possible via system page
- Bumped version to 4.0.0.36
- will require cbpiui 0.0.17
2021-09-21 16:20:44 +02:00
avollkopf
a7c9a5f0e6 current dashboard information added
Added functions to store current dashboard info in settings
Info can be also retrieved from ui to start with the dashboard that was used last time
2021-08-18 21:55:56 +02:00
avollkopf
d5ed315034 integrated system_controller into http_system endpoint
moved restart and shutdown procedure to system_controller
-> works currently only under linux with systemctl
2021-08-12 18:09:15 +02:00
avollkopf
016c6d1adf Allow Multiple Dashboards
- Up to 10 Dashboards possible
- Config parameter max_dashboard_number added
- Default is 4 dashboards
- Config parameter will be added automatically via extension if not in config.json
2021-08-11 17:12:13 +02:00
avollkopf
d8eda55286 Automatic config update
in case of new config parameters, the new extension can update the config automatically.
2021-07-15 07:16:26 +02:00
avollkopf
cad063e6a3 some fixes
- improved handling of 'empty' config paramaters
- improved handling of bf recipes where a step has no name
2021-07-13 07:07:55 +02:00
avollkopf
c8c6491467 Added offset to bf recipe list -> up to 250 recipes can be selected 2021-07-04 17:42:37 +02:00
avollkopf
f62263e287 Update upload_controller.py
Increase limit of BF recipes to 50
next Steps: add offset parameter to start also with recipe 51,....
2021-07-04 13:39:25 +02:00
avollkopf
4e22e6415e Added setting parameter for Step AutoMode
- Adds more flexibility for users
- Default is yes
2021-06-21 06:51:58 +02:00
avollkopf
3ee23bfa59 bug fix
small bug fix with respect to auto mode for mash steps
2021-06-17 21:53:43 +02:00
avollkopf
b6a430ada1 Update upload_controller.py
merge of rutines for upload / recipe creation
2021-06-15 21:03:56 +02:00
avollkopf
a36591636e Native Brewfather recipe import added 2021-06-13 14:38:18 +02:00
avollkopf
fcb2400240 Bug Fix for kbh upload 2021-06-10 20:57:22 +02:00
avollkopf
2aa5feceb4 Added upload controller
Integrated recipe file upload into cbpi
- Controller and http endpoint added
--> No extension required
2021-06-06 13:00:55 +02:00
avollkopf
40020ba64d Save active recipe to recipe book 2021-05-27 20:35:10 +02:00
Manuel Fritsch
70469adc49 "fermentation controller pre version. Not ready to use" 2021-04-04 15:54:10 +02:00
Manuel Fritsch
12857c73ef "mqtt added" 2021-03-14 11:52:46 +01:00
prash3r
a9546bc40c BasicController start() and stop() functions manages item.instance.running state
Also changes usage of 'while True' inside run() functions to 'while self.running == True'
2021-03-08 01:34:13 +01:00
Manuel Fritsch
7a5e852121 "save props for steps" 2021-03-07 23:52:20 +01:00
Manuel Fritsch
51c8f82834 "notificaton added" 2021-03-07 22:11:25 +01:00
Manuel Fritsch
a55ed2a5e5 "recipe book added" 2021-02-27 20:09:19 +01:00
Manuel Fritsch
79fd2b8727 "fix actor satellite issue" 2021-02-20 12:59:23 +01:00
Manuel Fritsch
c78ab29b85 "fix actor instance error" 2021-02-20 09:24:03 +01:00
Manuel Fritsch
f1bcd1e543 "fix static config" 2021-02-19 22:24:15 +01:00
Manuel Fritsch
fb85d67fcf "Small bug fixed. Step Actions added on server part" 2021-02-17 23:52:54 +01:00
Manuel Fritsch
93aea0c063 "added dataclassed" 2021-02-16 20:37:51 +01:00
Manuel Fritsch
2468dab6dd "fix mash step time to minutes" 2021-02-12 00:03:18 +01:00
Manuel Fritsch
5f18e7a7b8 "Hysteresis added" 2021-02-10 22:11:35 +01:00
Manuel Fritsch
bd311edccd "mash profiles added" 2021-02-10 07:38:55 +01:00
Manuel Fritsch
3a39719957 adding description 2021-02-07 13:08:13 +01:00
Manuel Fritsch
4fe47d5a31 sensor methods added 2021-02-06 00:40:55 +01:00
Manuel Fritsch
64dea90e3b fix props for plugin 2021-02-02 21:22:59 +01:00
Manuel Fritsch
b3af77fdb8 actor added 2021-02-02 00:07:58 +01:00
thehatguy
23eb12ef28 Changed paths to absolute paths 2021-02-01 02:38:04 +02:00
Manuel Fritsch
aeabde8c4a plugin controller change 2021-01-30 22:29:33 +01:00
Manuel Fritsch
2779c3cc2c reuqirements.txt updated 2021-01-26 20:21:53 +01:00
Manuel Fritsch
0d2770ef4c add missing dependencies 2021-01-24 22:14:57 +01:00
Manuel Fritsch
6c537bd278 bugfixing 2021-01-23 14:41:26 +01:00
Manuel Fritsch
296c2c69f0 rework database 2021-01-22 23:25:20 +01:00
Manuel Fritsch
05e08d0dc6 new step controller 2021-01-17 22:49:18 +01:00
Manuel Fritsch
b1b9025886 bugfixing actor, sensor controller. New dashboard api 2021-01-09 15:20:56 +01:00
manuel83
eb2ba8fdfe plugin installer added 2019-08-16 21:36:55 +02:00
manuel83
30efc95462 log http endpoint swagger doc added 2019-08-05 23:15:14 +02:00
manuel83
bbbfe92aab log http endpoint added 2019-08-05 23:00:18 +02:00
manuel83
8200c48dfc log controller added 2019-08-05 20:51:20 +02:00
manuel83
8db6251fb7 changes in plugin controller 2019-07-31 07:58:54 +02:00
manuel83
8ba6b4c506 Lots of changes 2019-07-27 21:08:19 +02:00
manuel83
0496b04608 config fix 2019-01-28 22:21:31 +01:00
manuel83
8cfffa17bb actor action button added. kettle automatic connnected to ui 2019-01-24 21:27:55 +01:00
manuel83
8379dee5c7 swagger doc for system controller added 2019-01-21 22:37:00 +01:00
manuel83
6cc7f5ad77 step change add oder for new 2019-01-21 22:33:29 +01:00
manuel83
017b7373e3 fixes for step controller 2019-01-17 22:11:55 +01:00
manuel83
8cf373c993 changes for ui 2019-01-14 07:33:59 +01:00
manuel83
705c81a075 fix translaton controller 2019-01-08 20:22:50 +01:00
manuel83
26bc72b27e fix plugin loading error 2019-01-08 19:45:23 +01:00
manuel83
dcc82d4bd8 requirements fix 2019-01-07 22:05:52 +01:00
manuel83
5533761bb4 cleanup 2019-01-05 22:44:54 +01:00
manuel83
7ab75f0b01 setuptools added 2019-01-05 20:43:48 +01:00