From 8cfffa17bb6f797859386c47c2269b69b7d0cfbf Mon Sep 17 00:00:00 2001 From: manuel83 Date: Thu, 24 Jan 2019 21:27:55 +0100 Subject: [PATCH] actor action button added. kettle automatic connnected to ui --- .idea/workspace.xml | 693 ++++++++++++--------- cbpi/cli.py | 2 +- cbpi/controller/actor_controller.py | 14 +- cbpi/controller/kettle_controller.py | 19 +- cbpi/controller/step_controller.py | 2 +- cbpi/controller/translation_controller.py | 2 +- cbpi/craftbeerpi.py | 1 - cbpi/extension/comp/__init__.py | 4 +- cbpi/extension/dummyactor/__init__.py | 6 + cbpi/extension/dummylogic/__init__.py | 16 +- cbpi/extension/dummysensor/__init__.py | 2 +- cbpi/http_endpoints/http_actor.py | 7 +- cbpi/http_endpoints/http_config.py | 4 +- cbpi/http_endpoints/http_curd_endpoints.py | 2 +- cbpi/http_endpoints/http_kettle.py | 2 +- cbpi/http_endpoints/http_step.py | 16 +- cbpi/utils/encoder.py | 6 +- craftbeerpi.db | Bin 53248 -> 53248 bytes docs_src/source/actor.rst | 16 +- docs_src/source/conf.py | 1 + 20 files changed, 479 insertions(+), 336 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2466e55..fb23ca5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,26 @@ - + + + + + + + + + + + + + + + + + + + +