Commit graph

418 commits

Author SHA1 Message Date
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
Alexander Vollkopf
c627c38f86
Merge pull request #29 from avollkopf/development
Merge 4.0.1.1 from development branch
2022-01-14 12:21:18 +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
03001a2de7
Merge pull request #26 from InnuendoPi/development
Add some additional / modified mqtt update functions
2022-01-12 17:32:42 +01:00
Alexander Vollkopf
57af6cac59
Merge branch 'development' into development 2022-01-12 17:25:35 +01:00
Alexander Vollkopf
029a6c280e
Merge pull request #27 from avollkopf/development
Merge from Development Branch -> Add Fermenter Class
2022-01-11 07:03:23 +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
Alexander Vollkopf
1efe31cb25
Merge pull request #25 from avollkopf/development
Merge from Development Branch
2021-12-30 13:12:07 +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
Alexander Vollkopf
13f0a53125
Merge pull request #22 from avollkopf/development
Merge 4.0.0.57 from Development branch
2021-12-19 14:47:27 +01:00
avollkopf
206eff88f5 Merge branch 'development' of https://github.com/avollkopf/craftbeerpi4 into development 2021-12-14 07:20:42 +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
Alexander Vollkopf
d5d5a6c3db
Merge pull request #19 from papauorg/feature/enable-gpio-for-docker
Install RPi.GPIO in docker image
2021-12-10 18:45:44 +01:00
Philipp Grathwohl
bff184c497 Install RPi.GPIO in docker image 2021-12-07 21:09:50 +01:00
Alexander Vollkopf
d8e8e49ed0
Merge pull request #18 from avollkopf/development
Merge from Development
2021-12-06 17:21:45 +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
Alexander Vollkopf
2584b18ce6
Merge pull request #14 from papauorg/feature/mqtt-actor-payload
Provide payload parameter for mqtt actor
2021-12-06 07:18:29 +01:00
Alexander Vollkopf
59a20fdccb
Merge pull request #17 from papauorg/feature/use-cache-to-increase-build-perf
Reduce build time for docker image on GitHub actions by using a cache
2021-12-04 15:10:15 +01:00
Philipp Grathwohl
48df3cdffa Use cache to increase build performance 2021-12-04 12:26:48 +01:00
Philipp Grathwohl
4faea7ed20 Determin the proper image for caching for the build 2021-12-04 12:23:56 +01:00
Philipp Grathwohl
4727162002 Increase caching potential of docker image 2021-12-04 12:09:46 +01:00
Philipp Grathwohl
d80486abd0 Revert to python v3.7 to increase build time on gh actions 2021-12-04 11:45:53 +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
Alexander Vollkopf
204b02106d
Merge pull request #13 from papauorg/feature/no-sudo
Avoid root when installing cbpi in docker container
2021-12-03 07:44:44 +01:00
Philipp Grathwohl
623711e772 Increase possible caching on docker file creation 2021-12-03 00:35:45 +01:00
Philipp Grathwohl
0c380d5912 Avoid root when installing cbpi 2021-12-02 23:40:46 +01:00
Alexander Vollkopf
127354c834
Merge pull request #12 from avollkopf/development
Merge from development
2021-12-02 15:36:14 +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
Alexander Vollkopf
2ebf9f3245
Merge pull request #10 from papauorg/feature/update-readme
Update readme to include more info about the project
2021-12-01 07:14:46 +01:00
Philipp Grathwohl
8ff0ebddf3
Remove Docker details from readme
This information should be placed in the documentation page.
2021-11-30 13:24:52 +01:00
Philipp Grathwohl
0dd8bf5074 Update readme to include more info about the project 2021-11-29 17:16:35 +01:00
Alexander Vollkopf
6c4561f011
Merge pull request #9 from papauorg/feature/improve-ci
Improve CI build and fix docker build issue
2021-11-28 15:50:10 +01:00
Philipp Grathwohl
57be4fe621 Improve job names of build pipeline 2021-11-28 13:38:46 +01:00
Philipp Grathwohl
603764cdcc Use full python image to avoid build errors 2021-11-28 13:33:42 +01:00