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

269 commits

Author SHA1 Message Date
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
Manuel83
d02da30d11
Delete .DS_Store 2022-02-26 21:46:43 +01:00
Manuel Fritsch
18476a78c0 updated of cli 2022-02-26 21:45:10 +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
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
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
286198fcd1 update on fermenter steps - Work In Progress 2022-02-18 20:22:16 +01:00
Alexander Vollkopf
115fa37685
Update __init__.py 
Adapt version for cli.py fix from 18.02.22
 2022-02-18 18:53:25 +01:00
Alexander Vollkopf
2f0edbf0fd
Update cli.py 2022-02-17 21:45:44 +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
972c9dbf49 Added check for plugin addition 
before plugin is added to the config, cli.py checks if the package does exist and if the name is correct (capital letters,...)
 2022-02-15 18:11:14 +01:00
avollkopf
259f5abc78 changed RPi.GPIO version to latest official version 2022-02-14 07:53:04 +01:00
avollkopf
94d32c4dc4 fixed duplicated mqtt message for gpioactors 2022-02-07 18:57:02 +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
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
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
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
a7ddcdd306 fix get_actor_state () in CBPiBase 2022-01-31 07:27:01 +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
Alexander Vollkopf
f4b028f263
Update __init__.py 
Update version for last merge
 2022-01-25 21:16:52 +01:00
Alexander Vollkopf
370f9c3c5a
Merge pull request #33 from pascal1404/master 
Mashout step for MMuM-JSON import
 2022-01-25 21:15:48 +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
avollkopf
50677a2a3e Restore config fix for windows 2022-01-25 11:33:21 +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
Alexander Vollkopf
7ad3fd252e
Update __init__.py 2022-01-24 22:20:27 +01:00
pascal1404
e05c945d11 Update http_upload.py 
add MMuM-JSON import
 2022-01-24 20:41:19 +01:00
pascal1404
5c00b90390 Upload MMuM-JSON 2022-01-20 17:44:44 +01:00
avollkopf
54e7ad832c Update __init__.py 
bumped version number to merge into master branch
 2022-01-15 14:35:44 +01:00
avollkopf
1b6d8a3778 Update __init__.py 2022-01-14 17:32:18 +01:00
avollkopf
be1f066782 Minor change sensor update 
Change for sensor plugins.

Will update also mqtt per default when push_update is called.

But if False is send for mqtt parameter, only web interface will be updated.

-> Good for sensors that retrieve values only once per minute or so
-> WI can be continuosly updated with current value and no empty value is displayed, but mqtt does not nee to be updated

(example ispindel, scd30 sensor, kettle sensor, Hydrom/Tilt,....)

Plugins will be updated later in main branches
 2022-01-14 17:11:16 +01:00
avollkopf
20e6aa7e59 Fix for restore config 
- removed hardcoding of user/group from pi:pi
- retrieve owner / group of oroginal folder and use them
 2022-01-14 12:16:42 +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
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
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
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
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
e1c1432f14 increased max upload size to 5 Mb for svg and config upload 2021-11-10 12:28:42 +01:00
avollkopf
6e3dc392b6 SVG upload functionality 2021-11-09 18:32:00 +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
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
7c8351e068 Update __init__.py 2021-11-03 09:35:59 +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
45c084360f Reverted mashsteps back 
- last change caused some issues
 2021-10-03 16:50:36 +02:00
avollkopf
0f58b73a98 Update http_sensor.py 2021-09-26 17:44:03 +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
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
2d55410d4a http endpoint to retrieve sensor value added 2021-08-28 17:32:31 +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
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
1d7cae39b7 Activated restart and shutdown in http_system endpoint 
-> shoud be transferred to system_controller at a later point of time
 2021-08-12 16:56:48 +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