Commit graph

654 commits

Author SHA1 Message Date
Alexander Vollkopf
f36b6d31ab
Merge branch 'craftbeerpi:master' into master 2022-04-25 07:17:37 +02:00
Alexander Vollkopf
4a4eed8fd8
Merge pull request #94 from craftbeerpi/development
disable sorting of elements by default
2022-04-23 20:42:46 +02:00
avollkopf
1b85eefad2 disable sorting of elements by default 2022-04-23 20:32:32 +02:00
Alexander Vollkopf
6f458b4649
Merge pull request #47 from craftbeerpi/master
Fetch upstream
2022-04-14 08:11:54 +02:00
Alexander Vollkopf
8a0061f0a0
Merge pull request #93 from craftbeerpi/development
Development environment for vscode | spunding
2022-04-14 07:22:59 +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
avollkopf
9677357726 changed dockerfile UI to craftbeerpi org repo 2022-04-02 16:28:55 +02:00
avollkopf
72ea595f16 fix typos 2022-04-02 16:27:09 +02:00
avollkopf
14f1bd6dd4 fix typos in step controller 2022-04-02 16:20:48 +02:00
avollkopf
fec02047ad fix for fermenter_recipe_controller and flexible config path 2022-04-01 19:28:17 +02:00
Alexander Vollkopf
46a589c463
Merge pull request #87 from papauorg/feature/development-environment-upstream
Provide preconfigured dev-environment and automated tests -> some fixes still required for femrneter recipes and config path
2022-04-01 18:40:26 +02:00
Philipp Grathwohl
0c0bda6abe Use config folder abstraction in fermentation controller 2022-04-01 15:02:12 +00:00
Philipp Grathwohl
1b2257f3e2 Use official source for cbpi-ui plugin 2022-04-01 08:25:53 +02:00
Philipp Grathwohl
db5d58e49c Run tests automatically in build 2022-03-31 08:06:46 +02:00
Philipp Grathwohl
652fbd74be Fix tests so they run again
Tests that can not work because of missing endpoints in the controllers
were removed. Also tests that have no clear intent and were failing were
deleted.
2022-03-31 08:06:46 +02:00
Philipp Grathwohl
86b8d6fc62 Allow specifying config path on start
Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,
2022-03-31 08:06:42 +02:00
Philipp Grathwohl
86bd6c5a6b Delete unused craftbeerpi.db 2022-03-31 08:04:42 +02:00
Philipp Grathwohl
a187ec64e1 Add default configuration for development environment 2022-03-31 08:04:42 +02:00
Philipp Grathwohl
9366c18a38 Configure devcontainer for python 2022-03-31 08:04:42 +02:00
Alexander Vollkopf
c781f9cd2f
Merge pull request #92 from craftbeerpi/development
Development
2022-03-30 17:42:18 +02:00
Alexander Vollkopf
d254cdfb7d
Merge branch 'master' into development 2022-03-30 17:37:55 +02:00
avollkopf
8a7525ef9d Added codenae to release.py and adapted release.py code for 3 digits version 2022-03-30 07:42:07 +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
42670efd9c Added fermenterstep with controlled ramp rate 2022-03-28 15:59:04 +02:00
avollkopf
83286150b7 Add Codename 2022-03-24 07:33:48 +01:00
Alexander Vollkopf
bdc534e12c
Merge pull request #46 from craftbeerpi/master
Align with upstream
2022-03-21 11:59:46 +01:00
Alexander Vollkopf
6cf49a822a
Merge branch 'master' into master 2022-03-21 11:30:05 +01:00
avollkopf
e3f47e6651 Merge branch 'master' of https://github.com/craftbeerpi/craftbeerpi4 2022-03-15 21:15:42 +01:00
avollkopf
cdc2ee83a3 fix if no description is given in fermenterrecipe 2022-03-15 21:15:38 +01:00
Alexander Vollkopf
30ec17be3c
Merge pull request #88 from papauorg/feature/fix-readme-links
Fix readme links for the main repository -> brings only the readme links back to the upstream repo
2022-03-15 16:09:12 +01:00
Alexander Vollkopf
9349ce8ca8
Merge pull request #91 from papauorg/feature/fix-version-regex
Allow 3 part version numbers -> no change on server itself and won't break anything for the release candidate
2022-03-15 16:06:42 +01:00
Philipp Grathwohl
2bde0e42ae Allow 3 part version numbers 2022-03-15 08:13:00 +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
Manuel Fritsch
036e70e4bf Merge form dev branch 2022-03-13 12:52:40 +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
c3c4101b6b Added NIC Speed info to system controller 2022-03-08 14:25:00 +01:00
Alexander Vollkopf
f3cd341813
Merge pull request #45 from craftbeerpi/development_fermentersteps
Transfer from organization dev branch that has now fermentersteps
2022-03-08 07:32:09 +01:00
avollkopf
6ac93e5212 fix for stepid on load recipe/addstep 2022-03-07 16:43:00 +01:00