Commit graph

253 commits

Author SHA1 Message Date
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
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
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
avollkopf
afeba81740 bump rev 2022-11-17 19:41:06 +01:00
avollkopf
8b2e0fb1d8 avoid error logging / notification for Notification step w/o Sensor definittion 2022-10-22 14:08:59 +02:00
avollkopf
21ce9ed220 update version number 2022-10-03 12:11:53 +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
avollkopf
4d85c4c6af Update minor version 2022-07-16 10:26:32 +02: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
avollkopf
08a841ebe3 Add test for fermenter spunding logic 2022-04-03 20:07:22 +02:00
avollkopf
b7d54952d1 Add valve, pressure sensor and target pressure to fermenter class 2022-04-03 12:37:34 +02:00
Alexander Vollkopf
d254cdfb7d
Merge branch 'master' into development 2022-03-30 17:37:55 +02:00
avollkopf
25327bab9f clear femrenter recipe name if recie is cleared 2022-03-29 18:48:36 +02:00
avollkopf
43cf27bad5 Version bump 2022-03-28 15:59:42 +02:00
avollkopf
83286150b7 Add Codename 2022-03-24 07:33:48 +01:00
Alexander Vollkopf
6cf49a822a
Merge branch 'master' into master 2022-03-21 11:30:05 +01:00
avollkopf
cdc2ee83a3 fix if no description is given in fermenterrecipe 2022-03-15 21:15:38 +01:00
avollkopf
d8ba8c0ac5 fix create plugin under windows 2022-03-15 06:53:40 +01:00
Manuel Fritsch
fda8042ff1 version number update to 4.0.3 2022-03-13 12:55:52 +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
6ac93e5212 fix for stepid on load recipe/addstep 2022-03-07 16:43:00 +01:00
avollkopf
bc6649dff8 Dont' start femrentationstep before mqtt sensor has received a value 2022-03-07 15:03:41 +01:00
avollkopf
ecbb2d404d use current fermenter recipe name when sending recipe to fermenter 2022-03-05 16:07:15 +01:00
avollkopf
a136f6b467 set default for mqtt sensor to 999 and add check to fermentersteps target temp step 2022-03-05 11:29:33 +01:00
avollkopf
bce0a0025b cleanup in fermentation controller and setup.py 2022-03-05 11:02:49 +01:00
avollkopf
db4e75525f check if server is running under windows to fix issue with mqtt under win and python 3.9 2022-03-04 16:36:50 +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
3cf48fff04 fix to start timer directly after restart on step with remaining time 2022-03-02 10:29:21 +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
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
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
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
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
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
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
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
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
6e3dc392b6 SVG upload functionality 2021-11-09 18:32:00 +01:00
avollkopf
3bc70f8c7f PWM Actor test 2021-11-05 19:32:34 +01:00
avollkopf
7c8351e068 Update __init__.py 2021-11-03 09:35:59 +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
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
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
Manuel Fritsch
70469adc49 "fermentation controller pre version. Not ready to use" 2021-04-04 15:54:10 +02:00
Manuel Fritsch
2a018fb731 "fix mqtt push update issue" 2021-03-14 17:40:44 +01:00
Manuel Fritsch
12857c73ef "mqtt added" 2021-03-14 11:52:46 +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
441e235d1f "fix cli main_dir error" 2021-03-03 23:49:41 +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
6a091c0bae "fix config.json" 2021-02-19 22:05:13 +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
0f295e25c6 "1" 2021-02-07 13:52:03 +01:00
Manuel Fritsch
3a39719957 adding description 2021-02-07 13:08:13 +01:00
Manuel Fritsch
aa2ab888d5 update version 2021-02-06 00:42:48 +01:00
Manuel Fritsch
64dea90e3b fix props for plugin 2021-02-02 21:22:59 +01:00
Manuel Fritsch
aeabde8c4a plugin controller change 2021-01-30 22:29:33 +01:00