Commit graph

662 commits

Author SHA1 Message Date
avollkopf
2cc2df0208 fermentertest 2022-02-17 21:42:54 +01:00
avollkopf
fe75ae64d6 Merge branch 'development' of https://github.com/avollkopf/craftbeerpi4 into development 2022-02-17 20:30:19 +01:00
avollkopf
334e9e7335 fix cli.py
reverted back spell check for activation of plugins as metadata package does mix '_' with '-'
2022-02-17 20:29:15 +01:00
avollkopf
b8ef79d11c further tests on fermentersteps 2022-02-16 20:36:11 +01:00
Alexander Vollkopf
4803376b6c
Merge pull request #42 from avollkopf/development
Development
2022-02-15 18:28:03 +01:00
avollkopf
22d629c7a8 Merge branch 'development' of https://github.com/avollkopf/craftbeerpi4 into development 2022-02-15 18:15:08 +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
Alexander Vollkopf
28cd17ec2a
Merge pull request #41 from papauorg/feature/python3.9-docker
Update github build workflow and docker image to python 3.9
2022-02-14 20:30:51 +01:00
Philipp Grathwohl
baed31f8b6 Update dependencies for dev environment for python 3.9
see github issue avollkopf/craftbeerpi4#39
2022-02-14 10:45:22 +01:00
Philipp Grathwohl
68fb5f45c8 Update python to v3.9 when building 2022-02-14 10:44:51 +01:00
avollkopf
259f5abc78 changed RPi.GPIO version to latest official version 2022-02-14 07:53:04 +01:00
Alexander Vollkopf
9ad90fdf45
Merge pull request #40 from avollkopf/development
Merge changes from development branch
2022-02-13 11:38:28 +01:00
avollkopf
1652b340fe Update setup.py
better detection of raspberry pi based cpu for RPi.GPIO
2022-02-12 15:38:51 +01:00
avollkopf
f887d6247b Update setup.py 2022-02-12 14:56:31 +01:00
avollkopf
04753946d0 Update setup.py
Test with conditional setup.py for 64 bit raspbian
2022-02-11 17:19:41 +01:00
avollkopf
c47849e741 Update setup.py
Reverted back to old combination of pandas and numpy as other combinations of newer versions are causing an error:

valueerror: numpy.ndarray size changed, may indicate binary incompatibility. expected 48 from c header, got 44 from pyobject
2022-02-11 07:15:15 +01:00
avollkopf
31fb88ef23 Update setup.py
test for docker
2022-02-11 06:56:16 +01:00
avollkopf
a24f426909 Update setup.py
reverted back to numpy 1.21.5 as docker image won't build
2022-02-07 22:34:53 +01:00
avollkopf
9deb4d115e Update setup.py
revert back to pandas 1.3.5 as docker image won't build
2022-02-07 22:31:21 +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
Alexander Vollkopf
195705d79e
Merge pull request #38 from pascal1404/master
Add Influxdb-cloud connection and log for actor, fermenter and kettles
2022-02-06 14:46:57 +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
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