Commit graph

227 commits

Author SHA1 Message Date
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
2573e39bd8 timer fix for manual stop and restart of fermentationstep 2022-02-28 16:47:33 +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
avollkopf
c272d1ba2a Fixed time format for timer and messages in case of longer steps 2022-02-25 07:28:18 +01:00
avollkopf
d87a578447 fix calculation of fermentation end time -> Format still open 2022-02-24 18:37:46 +01:00
avollkopf
9ed640cf6a Add fermentation time in stepform as days, hours, minutes 2022-02-22 18:32:48 +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
2cc2df0208 fermentertest 2022-02-17 21:42:54 +01:00
avollkopf
94d32c4dc4 fixed duplicated mqtt message for gpioactors 2022-02-07 18:57:02 +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
6c1f928933 Update on mqttutil
An update on kettle and fermenter is triggered on start of cbpi
2022-02-04 17:08:10 +01:00
avollkopf
ed141f8788 Added mqttutil extension
- forces mqtt update for kettle and femrenter in specified timeframes even w/o change in payload
- required for mqttdevice
- only active if mqtt is enabled
- can be set to never and is also deactivated when mqtt is enabled
2022-01-31 17:17:53 +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
avollkopf
8320853399 Minor fixes
- onewire is not hardcoded to busmaster 1
- try to catch exception while sending data to WS and WS has closed connection
2022-01-25 07:47:40 +01:00
avollkopf
027966af12 Reverted back to item based mqtt updates for testing 2022-01-12 17:56:30 +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
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
78a0832fd2 Update __init__.py 2022-01-03 17:21:32 +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
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
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
Philipp Grathwohl
f337cb8e97 Add generic and Tasmota specific MQTT actors 2021-12-03 13:26:12 +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
db39d82432 Some fixes
- command line cbpi plugins -> not interrupted if plugin has not been installed correctly
- round power value submitted by mqtt plugin
2021-11-26 22:54:55 +01:00
avollkopf
b2e61bee8e Changed setup.py for RPI.GPIO
RPi.GPIO 0.7.0 is causing an error if installed under bullseye and python 3.9
-> 0.7.1a4 solves the issue for now.
-> will be changed as soon as new RPi.GPIO release is comming out
2021-11-24 22:10:28 +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
71897c8276 Some MQTT updates
- MQTT actor power change also if actor is off
- payload Filter for MQTT sensor
2021-11-22 17:33:46 +01:00
avollkopf
01386ef0da Update config.yaml 2021-11-22 16:11:24 +01:00
avollkopf
75ab9b96fc Added MQTT Actor and power setting 2021-11-22 16:09:09 +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
40121e667e Experimental power mode for standard actor
Power = 100: standard on
Standard sampling time is 5 seconds.
if power is set to 50%, heating time is 2.5 sec and witing time (gpio off) is also 2.5 sec
Changing power to lower readings, wil reduce heating time within the 5 seconeds and increase waiting time
Increase of power results in longer heating times and reduced wait times
Sort of a poos men's PWM with a fix requency of 0.2 hz

This will reduce the complexity of all PID plugins.

Some additional tests and changes might be required for api.
2021-11-08 19:01:53 +01:00
avollkopf
5b0f351a98 Update __init__.py 2021-11-08 14:09:32 +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
3bc70f8c7f PWM Actor test 2021-11-05 19:32:34 +01:00
avollkopf
326d24c48f BF StrikeTemp test and some fixes 2021-11-03 09:30:16 +01:00
avollkopf
45c084360f Reverted mashsteps back
- last change caused some issues
2021-10-03 16:50:36 +02:00
avollkopf
dd7da9ce71 Added actiions for sensors and minor fix in mashsteps
- Actions can now also be called for sensors -> will require ui 0.0.18.
- Some fixes for timer in mashsteps in case of pause is pressed
2021-09-26 12:41:39 +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
93be663a19 Added Toggle Step to MashSteps
Additional mash step : Toggle Step
Increased Version from 4.0.0.34 to 4.0.0.35
2021-08-15 11:41:18 +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
3a75036b19 Removed actor GPIO 28 & 29 again
-> not relevant in BCM mode which is used in cbpi4
2021-08-10 13:01:45 +02:00
avollkopf
ec6498921e Added gpio 28 & 29 to actors 2021-08-09 12:49:31 +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
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
b3d87bc027 Added api path for recipe creation
- Added path parameter in config.json for settings
- If empty, 'upload' will be used per default as api path
- If something is entered, a different api path will be used for the creation of recipes.
-> this allows the standard usage of the recipe upload and selection via cbpi4, but adds the possibility that custom plugins can be written to create cbpi recipe flows from the uploaded files
*********************
+ some prep work to create the http endpoints
2021-05-30 11:58:18 +02:00
avollkopf
e187c9f047 Added Recipeupload and creation for beerxml and kbh database
- Beerxml files and kbh V2 database can be uploaded to cbpi via webinterface.
- Recipes can be created from the xml file or the kbh database
- cbpi setup needs to be run to create upload folder
- config.json needs to be updated manually on an existing installation ro add the step config.
--> this could be added automatically via the extension. However, needs to be discussed with Manuel.
Tip: cbpi4-RecipeImport Plugin could be installed , activated and removed later as this plugin adds the parameters during startup including creation of the upload folder
2021-05-26 21:00:35 +02:00
avollkopf
5669bb900e Support beerxml and kbh database upload 2021-05-22 18:25:57 +02:00
avollkopf
8608f08fd9 Update __init__.py
Updated property description. No functional change
2021-05-02 10:03:25 +02:00
avollkopf
175f053f9d Added Steps and Step Functions 2021-04-20 21:20:03 +02:00
avollkopf
14b08e1ddb Fix on actions, simplification on hop alarms 2021-04-17 11:11:14 +02:00
avollkopf
0828aeacac Simplified offset handling
Change is somehow dependent dependent on issue #68 with corresponding change in dataclasses.py.
But this is an example on how the change in dataclasses.py would allow to simplify the props handling in case of empty values.
2021-04-11 12:30:34 +02:00
avollkopf
e89c42f5dd Added offset and Temp Unit support
- Offset can be specified for each newire sensor
- Sensor is reporting temp in C or F depending on server settings
2021-04-09 10:36:06 +02:00
avollkopf
5cb0ce76de Added Hop alarms to boil step 2021-03-30 21:00:17 +02:00
avollkopf
06bc69b367 Fixed back hysteresis
To addres issue #44
2021-03-30 07:46:41 +02:00
Martin
6dc1c22e20 Fix[extension]: mqtt_sensor did not work with Mash_profile
Error NoneType object as no attribute 'get'
2021-03-18 19:27:03 +01:00
Martin
919d6c8e93
Update cbpi/extension/mashstep/__init__.py
Co-authored-by: Marcel Schulz <schullebernd@googlemail.com>
2021-03-15 22:09:23 +01:00
Martin
aabe76d15d optimize import 2021-03-15 19:55:59 +01:00
Martin
d8b083003d fix issues #55 2021-03-15 19:54:22 +01:00
Martin
de38fbc80c fix: error, i put the modification on bad class 2021-03-15 17:21:57 +01:00
Martin
93a07ac613 Fix: issuses #56 2021-03-15 13:02:35 +01:00
Martin
12d487bd3a Fix: issuses #57 2021-03-15 12:59:55 +01:00
Manuel Fritsch
12857c73ef "mqtt added" 2021-03-14 11:52:46 +01:00
Manuel83
9c3a1f564b
Merge pull request #47 from Prash3r/master
BasicController manages state of item.instance.running
2021-03-11 22:23:44 +01:00
Manuel83
7611e1d167
Merge pull request #48 from BrauereiAlt/master
Activate Timer in Boil and Mash Steps
2021-03-11 22:21:20 +01:00
BrauereiAlt
07024d7fc3
Add files via upload 2021-03-07 22:54:58 -08: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
Manuel83
0371e74b4a
Merge pull request #42 from michluk/dev
fix HttpSensor
2021-03-07 19:26:46 +01:00
BrauereiAlt
03a30e70ce
Add files via upload 2021-03-06 17:05:19 -08:00
Lukas
1ddfc56f15
Update __init__.py 2021-03-04 15:07:56 +01:00
Lukas
7c94833634
Update __init__.py 2021-03-04 14:49:10 +01:00
Mich, Lukas
5874b0bda5 fix HttpSensor 2021-03-04 13:06:57 +01:00
Manuel Fritsch
c142380bc6 "add seconds to timer at runtime" 2021-03-03 07:37:54 +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
Manuel83
ab14111787
Merge pull request #16 from avollkopf/master 2021-02-10 07:21:01 +01:00
avollkopf
ba988fbbb5 Fix for gpioactor
definition of mode --> GPIO.BCM
2021-02-09 18:48:45 +01:00
Manuel Fritsch
73ba659c59 adding description 2021-02-07 13:08:55 +01:00
Manuel Fritsch
3a39719957 adding description 2021-02-07 13:08:13 +01:00
avollkopf
9caca9074a Change Inverted logic for GPIO Actor
If sensor is set to active, GPIO pin should be high under normal conditions.
If inverted, GPIO pin should be low when sensor is active.
This logic is aligned with the old craftbeerpi3 GPIOSystem plugin
2021-02-07 12:07:48 +01:00
Manuel Fritsch
68fc73cc25 change dummy logic 2021-02-06 20:09:01 +01:00
Manuel Fritsch
b2fe0c8453 setup one wire added 2021-02-06 14:11:30 +01:00
Manuel Fritsch
4fe47d5a31 sensor methods added 2021-02-06 00:40:55 +01:00
Manuel Fritsch
0a3e272f85 fix props for plugin 2021-02-02 21:24:29 +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
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
manuel83
eb2ba8fdfe plugin installer added 2019-08-16 21:36:55 +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
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
d0b751a0d4 json dump for Actor and Sensor added 2019-01-08 23:31:39 +01:00
manuel83
7ab75f0b01 setuptools added 2019-01-05 20:43:48 +01:00