Commit graph

Select branches

Hide pull requests

development

doc

master

outputtest

#1

#10

#100

#102

#103

#106

#109

#11

#110

#111

#116

#119

#12

#120

#122

#123

#126

#129

#13

#130

#131

#133

#134

#136

#138

#14

#140

#143

#146

#15

#16

#17

#18

#19

#2

#22

#25

#26

#27

#29

#3

#30

#31

#33

#35

#38

#4

#40

#41

#42

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#6

#62

#63

#65

#67

#68

#69

#7

#70

#71

#74

#75

#77

#78

#8

#86

#88

#9

#90

#91

#92

#94

#96

#97

#98

#99

Mono Color

• 92ddb2a45a
  Revert "add hop name to BoilStep and UploadController" #70 Alexander Vollkopf 2022-10-03 12:04:42 +0200
• 6e1f1fadce
  Merge pull request #68 from lopelex/hop_text Alexander Vollkopf 2022-10-03 11:42:04 +0200
• cb60b6d5c5
  Merge branch 'development' into hop_text #68 Alexander Vollkopf 2022-10-03 11:37:19 +0200
• 7c87a2b054
  Merge pull request #69 from prash3r/move-dashboard-files Alexander Vollkopf 2022-10-03 11:20:41 +0200
• 7f16a8b9b5 not copying empty cbpi_dashboard_1.json anymore. will be created on first dashboard save instead. #69 prash3r 2022-10-02 19:01:14 +0200
• 2a0daf354c moves cbpi_dashboard_*.json to dashboard folder. if the file cbpi_dashboard_1.json doesnt exist in the dashboard folder every cbpi_dashboard_*.json file from the config folder is moved to the dashboard folder. This also removes the empty default cbpi_dashboard_1.json file from the template folder, because the file is not needed for cbpi to function and can be created when editing the dashboard online. prash3r 2022-10-02 18:32:40 +0200
• 8c8d09ed72
  Merge pull request #65 from prash3r/notify-log-events Alexander Vollkopf 2022-10-02 16:15:08 +0200
• 24ae03405c
  Merge pull request #63 from prash3r/kbh-whirlpool-step Alexander Vollkopf 2022-10-02 16:10:23 +0200
• 781f68dca6
  Merge pull request #62 from prash3r/dev-config-changes Alexander Vollkopf 2022-10-02 15:45:01 +0200
• 89da0bec04
  remove unused import lopelex 2022-09-30 07:36:21 +0200
• d1c38af3ae add First_Wort_text and fix error in json_recipe_creation #367 lopelex 2022-09-29 12:11:06 +0200
• 2bc5bbb183 add hop text #67 lopelex 2022-09-28 16:56:14 +0200
• 50fa87d6df repairs plugin creation inside the devcontainer strange windows volume behaviour needs a small delay between template folder unzip and rename. reverts user changes of the dev container which werent the cause of this problem. #62 prash3r 2022-09-24 21:55:36 +0200
• e7aa0a64c7 repairs log_file_controller.py. I seem to have exidentally search and replaced some needed glob.glob calls when adding dinamic log location, which should now be repaired. There also was a mysterious cbpi_dashboard_1.json appearing in the wrong folder which now inside the dashboard folder. I also figured out how to run tests locally, they should now respect the dynamic folder paths. prash3r 2022-09-24 15:19:34 +0200
• e0d809c3a3 additional requirements.txt for devcontainer only inside the dev container default config there now is a 'additional-dev-requirements.txt' file that allows us to ship additional python packages requirements with a default development config. prash3r 2022-09-24 12:58:26 +0200
• fea1ba04f0 corrected some more places where ./logs was used instead of the dynamically given logs path. prash3r 2022-09-16 18:56:52 +0200
• 6bf1b14a36 notify clients on log events worse than INFO #65 prash3r 2022-09-16 16:45:33 +0200
• 1fa3f88997 adds the 'cbpi create' command to vscode. also initilizes plugin names with dashes instead of underscores. everything now runs as root inside the dev container (otherwise the permissions for cbpi create wouldnt be sufficient). prash3r 2022-09-16 10:25:31 +0200
• ac9b599619 check_for_setup() now checks for provided logs folder path prash3r 2022-09-14 19:36:51 +0200
• 706bbac9f0 keeps default dev config unchanged. this commit moves the default config into a seperate folder. And it adds a preLaunchTask which copies the default dev config to the used dev config. This is done with the cp option '-ru' so if the files in the target dir (current config) are newer they are not overwritten. prash3r 2022-09-14 19:04:58 +0200
• cfc876f2f4 KBH import with and without whirlpool additions #63 prash3r 2022-09-14 15:08:59 +0200
• f924e1a683 adds journalctl arg '--output cat' (log exports), because cbpi already writes timestamps into the logs and we dont need two timestamps when exporting. This commit also reverts to using the same formatter for all logHandlers. prash3r 2022-09-14 13:54:58 +0200
• c56d7ccc51 adds --logs-folder-path as cli option prash3r 2022-09-12 21:54:51 +0200
• 4952861a58 logs folder is next to the active config folder. It was wherever 'cbpi setup' was run from. and if no config folder path is provided its still the same. This also adds a file based global logger placed in the logs folder. The sensor loggers respect the new logs folder location. prash3r 2022-09-09 18:38:08 +0200
• b5ca644e80 Merge branch 'dev-config-changes' of github.com:prash3r/craftbeerpi4 into dev-config-changes prash3r 2022-09-09 13:08:40 +0200
• e61fbdb69c extends #62 reorders the .vscode tasks so run is the default hopefully. removes code that was commented out anyway. prash3r 2022-09-07 12:39:52 +0200
• 2076c66eb5 uploaded restored_config.zip is now placed in provided config folder and not the working directory where it will be ignored on restart prash3r 2022-09-03 13:43:17 +0200
• 76b11a7247 imports the whirlpool hop addition kbh with timer previously the whirlpool step has been ignored when importing from a kbh database. on creation the whirlpoolstep would only be on a hardcoded 15 minute timer. I added the optional timer as argument to create_Whirlpool_Cooldown(). And made use of it for negative hops timer imported from KBH. For KBH databases this is valid because if the hops timer value is negative it can only be the whirlpool timer and the value is the time that is set for the brewing device for getting from boil to below 80°C. I did only test the data and not the functionality, but it sucessfully replaces the hardcoded "15" timer with the value from the first whirlpool hop addition while getting rid of the sign. prash3r 2022-09-02 18:17:08 +0200
• 2f085965c7 extends cbpi-dev-config to be a complete set. cbpi requires empty folders inside the config folder to fully function, and this commit adds them. There are also some more extensive checks on missing files and folders newly implemented. As well as checking for restored_config.zip is now done before checking for config.yaml. On unsuccessfull restore the zip file is renamed instead of deleted. prash3r 2022-09-02 17:00:50 +0200
• ac3c880523 actor update api for WS avollkopf 2022-08-31 20:46:27 +0200
• 9c6ede13f1 change upload controller to support kbh 2.4.0 hop timer categories avollkopf 2022-08-14 13:39:08 +0200
• c7d01c33f6 change version # for pipe animation speed avollkopf 2022-08-14 12:42:29 +0200
• 635ea3649c
  Merge pull request #58 from phylax2020/master Alexander Vollkopf 2022-08-07 13:57:45 +0200
• c0997ff357 Add setting parameter for dashboard pipe animation slow down #58 phylax2020 2022-07-21 10:27:54 +0200
• 205389f246
  Merge pull request #57 from phylax2020/master Alexander Vollkopf 2022-07-19 21:53:33 +0200
• 16190124d0 hopefully this commit works! #57 #56 phylax2020 2022-07-19 21:03:17 +0200
• 41018182de Merge branch 'master' of https://github.com/phylax2020/craftbeerpi4 phylax2020 2022-07-19 20:54:34 +0200
• ff0ba76cc0 log_file_controller added again phylax2020 2022-07-19 20:47:11 +0200
• 752d9a27b6 delete log_file_controller.py. will be later restored phylax2020 2022-07-19 20:45:26 +0200
• 313f9d4b39 Set default logfile size to 100000 bytes phylax2020 2022-07-19 20:28:36 +0200
• 5ea4160b4f
  Merge branch 'master' into master phylax2020 2022-07-19 18:36:14 +0200
• c85b929b75 Annotations for logfile maximum size revised phylax2020 2022-07-19 18:27:10 +0200
• 3d72071303
  Merge pull request #55 from avollkopf/revert-54-master Alexander Vollkopf 2022-07-19 17:41:01 +0200
• 49b5067841
  Revert "Allow changing logfile size and logfile backup count" #55 Alexander Vollkopf 2022-07-19 17:36:37 +0200
• ce1db9b188
  Merge pull request #54 from phylax2020/master Alexander Vollkopf 2022-07-19 17:36:27 +0200
• abe87b4218 Logfile size and backup logfile count in config.json #54 phylax2020 2022-07-19 09:39:27 +0200
• 4d85c4c6af Update minor version avollkopf 2022-07-16 10:26:32 +0200
• 8621888d81 Allow changing log file size and log file backup count in settings. Default for log file size is now 130000 bytes (was 1MB). Dashboard with charts can be blocked if accumulated size of log file data exceeds some megabytes. Also chart refresh rate should be greater than some 10 seconds so that chart plots can not block the user interface. In functions get_data (for dashboard charts) and get_data2 (for chart in analytics) the pandas resample function is reactivated respectively added to further reduce the amount of data to be transferred to the clients. In function log_data max_bytes and backup_count must be converted to int, when these settings are changed in the settings dialog. phylax2020 2022-07-15 21:47:23 +0200
• 459c4207fe
  Merge pull request #52 from chappo/master Alexander Vollkopf 2022-07-10 18:17:29 +0200
• 82e2c1b61a
  Merge pull request #53 from phylax2020/master Alexander Vollkopf 2022-07-10 17:16:43 +0200
• e95237eef6 limit log data transfer to not exceed 2 times max_rows = 1000 rows by removing every nth row. This keeps the user interface operable. #53 phylax2020 2022-07-09 22:23:26 +0200
• 4652b2b516 Missing string conversion of value in log_data function. phylax2020 2022-07-03 21:28:19 +0200
• a4f1de3953
  Set power to Zero if the actor is switched off. #52 chappo 2022-06-07 13:35:32 +0800
• 55db17e4fe
  Set Power to Zero if Switched Off chappo 2022-06-07 13:35:06 +0800
• 58175bf951
  Merge pull request #51 from avollkopf/development Alexander Vollkopf 2022-05-12 21:28:16 +0200
• 9634e876ce fix restor backup issue #51 avollkopf 2022-05-12 21:27:12 +0200
• 25c96b2df4
  Merge pull request #50 from avollkopf/development Alexander Vollkopf 2022-05-12 07:14:18 +0200
• e86c3d2f1c Add license information to setup.py #50 avollkopf 2022-05-12 07:11:39 +0200
• f966419c58
  Merge pull request #49 from avollkopf/development Alexander Vollkopf 2022-05-12 07:07:15 +0200
• e2c2e88d94 Version change fr release #49 avollkopf 2022-05-12 07:05:25 +0200
• d148dc0b38 update workflow avollkopf 2022-05-11 07:47:06 +0200
• 3c8801780c Merge branch 'development' of https://github.com/avollkopf/craftbeerpi4 into development avollkopf 2022-05-11 07:42:43 +0200
• d209472238
  Update README.md Alexander Vollkopf 2022-05-11 07:38:35 +0200
• 4cb340ba45 update README avollkopf 2022-05-11 07:36:21 +0200
• 261b391895
  Merge pull request #48 from avollkopf/testrelease Alexander Vollkopf 2022-05-11 07:33:48 +0200
• 4744070063 change docker ui to main #48 avollkopf 2022-05-11 07:29:58 +0200
• 59274f23c2 some updated links avollkopf 2022-05-10 17:52:23 +0200
• b1bd3dc9f4 adapt for release test with different gui package avollkopf 2022-05-10 07:06:14 +0200
• 29cc09c837 minor adaptions for release test avollkopf 2022-05-09 22:29:50 +0200
• d36c18cb2a rename app to cbpi4 for test release avollkopf 2022-05-09 17:10:36 +0200
• a8b745c97b
  Merge branch 'craftbeerpi:development' into development Alexander Vollkopf 2022-04-26 16:28:05 +0200
• a00b77b45d
  Merge branch 'craftbeerpi:master' into master Alexander Vollkopf 2022-04-26 16:27:52 +0200
• 988f19ebdd
  Merge pull request #95 from craftbeerpi/development Alexander Vollkopf 2022-04-26 07:21:51 +0200
• cbce63eab3 fix plugin create in cli.py avollkopf 2022-04-26 07:19:25 +0200
• 043e75303a
  Merge branch 'craftbeerpi:development' into development Alexander Vollkopf 2022-04-25 07:18:07 +0200
• f36b6d31ab
  Merge branch 'craftbeerpi:master' into master Alexander Vollkopf 2022-04-25 07:17:37 +0200
• 4a4eed8fd8
  Merge pull request #94 from craftbeerpi/development Alexander Vollkopf 2022-04-23 20:42:46 +0200
• 1b85eefad2 disable sorting of elements by default avollkopf 2022-04-23 20:32:32 +0200
• 6f458b4649
  Merge pull request #47 from craftbeerpi/master Alexander Vollkopf 2022-04-14 08:11:54 +0200
• 8a0061f0a0
  Merge pull request #93 from craftbeerpi/development #47 Alexander Vollkopf 2022-04-14 07:22:59 +0200
• da975f92b2 fix spunding hysteresis temp control avollkopf 2022-04-11 13:06:32 +0200
• d63bbbb887 sort order needs also change in basic controller for existing data avollkopf 2022-04-11 10:15:08 +0200
• 9ac0141e4d sort hardware by name avollkopf 2022-04-11 10:06:54 +0200
• 4d95017842 Added dummy pressure sensor for testing of spunding functionality avollkopf 2022-04-10 17:48:36 +0200
• d1f656f509 Added pressure to steps avollkopf 2022-04-05 12:31:20 +0200
• 1f25b3ae03 Fix in case no valve is defined for fermenter avollkopf 2022-04-05 07:43:19 +0200
• 4acb19fcc5 Added valve release time and pause as parameters avollkopf 2022-04-04 19:56:47 +0200
• 946d4c6261 aded wait step when spundung valve is closed avollkopf 2022-04-04 07:21:41 +0200
• 08a841ebe3 Add test for fermenter spunding logic avollkopf 2022-04-03 20:07:22 +0200
• b7d54952d1 Add valve, pressure sensor and target pressure to fermenter class avollkopf 2022-04-03 12:37:34 +0200
• 9677357726 changed dockerfile UI to craftbeerpi org repo avollkopf 2022-04-02 16:28:55 +0200
• 72ea595f16 fix typos avollkopf 2022-04-02 16:27:09 +0200
• 14f1bd6dd4 fix typos in step controller avollkopf 2022-04-02 16:20:48 +0200
• fec02047ad fix for fermenter_recipe_controller and flexible config path avollkopf 2022-04-01 19:28:17 +0200
• 46a589c463
  Merge pull request #87 from papauorg/feature/development-environment-upstream Alexander Vollkopf 2022-04-01 18:40:26 +0200
• 0c0bda6abe Use config folder abstraction in fermentation controller Philipp Grathwohl 2022-04-01 15:02:12 +0000
• 1b2257f3e2 Use official source for cbpi-ui plugin Philipp Grathwohl 2022-04-01 08:25:53 +0200
• db5d58e49c Run tests automatically in build Philipp Grathwohl 2022-02-20 11:07:13 +0000
• 652fbd74be Fix tests so they run again Philipp Grathwohl 2022-02-20 10:50:44 +0000
• 86b8d6fc62 Allow specifying config path on start Philipp Grathwohl 2022-02-19 11:33:11 +0000