Home-IoT/craftbeerpi4-pione
1
0
Fork 0
mirror of https://github.com/PiBrewing/craftbeerpi4.git synced 2024-12-27 07:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity
682 commits 4 branches 0 tags 83 MiB
Commit graph

682 commits

This branch
This branch
All branches
Author SHA1 Message Date
avollkopf
f2e9b1bebc Update fermentation_controller.py 2022-01-28 19:41:58 +01:00
Alexander Vollkopf
4f82dc85b3
Merge pull request #35 from avollkopf/development 
Merge update from Development Branch
 2022-01-28 18:15:49 +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
Alexander Vollkopf
69405a1c31
Merge pull request #31 from pascal1404/master 
Upload MMuM-JSON recipe -> test for development branch -> will also require update on UI
 2022-01-24 22:19:42 +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
Alexander Vollkopf
97a45f144e
Merge pull request #30 from avollkopf/development 
Merge from Development branch
 2022-01-15 14:49:28 +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
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