From 00c7a465d7c6f202258f46bdee0573c0477521d4 Mon Sep 17 00:00:00 2001
From: manuel83 <cUrrent2015>
Date: Fri, 4 Jan 2019 09:29:09 +0100
Subject: [PATCH] GPIO added

---
 .idea/workspace.xml                        | 1018 ++++++++++----------
 core/controller/actor_controller.py        |   39 +-
 core/controller/kettle_controller.py       |    3 +
 core/controller/notification_controller.py |    5 +-
 core/controller/sensor_controller.py       |    3 +
 core/controller/step_controller.py         |  131 +--
 core/controller/system_controller.py       |   12 +
 core/craftbeerpi.py                        |    5 +-
 core/database/model.py                     |   10 +
 core/eventbus.py                           |    2 +-
 core/extension/dummyactor/__init__.py      |   88 +-
 core/extension/dummystep/__init__.py       |   10 +-
 core/http_endpoints/http_actor.py          |   35 +
 core/http_endpoints/http_step.py           |   10 +-
 core/utils/encoder.py                      |    3 +-
 core/websocket.py                          |   61 +-
 craftbeerpi.db                             |  Bin 53248 -> 53248 bytes
 docs/genindex.html                         |    2 +-
 docs/step.html                             |    2 +-
 logs/sensors/sensor_1.log                  |   58 +-
 logs/sensors/sensor_1.log.1                |  172 ++--
 logs/sensors/sensor_1.log.10               |   91 +-
 logs/sensors/sensor_1.log.2                |   91 +-
 logs/sensors/sensor_1.log.3                |   91 +-
 logs/sensors/sensor_1.log.4                |   91 +-
 logs/sensors/sensor_1.log.5                |   91 +-
 logs/sensors/sensor_1.log.6                |   91 +-
 logs/sensors/sensor_1.log.7                |   91 +-
 logs/sensors/sensor_1.log.8                |   91 +-
 logs/sensors/sensor_1.log.9                |   14 +-
 tests/craftbeerpi.db                       |  Bin 0 -> 53248 bytes
 tests/test_actor.py                        |   21 +-
 tests/test_gpio.py                         |   49 +
 tests/test_index.py                        |    6 +
 tests/test_step.py                         |   44 +-
 tests/test_ws.py                           |   56 ++
 36 files changed, 1129 insertions(+), 1458 deletions(-)
 create mode 100644 tests/craftbeerpi.db
 create mode 100644 tests/test_gpio.py
 create mode 100644 tests/test_ws.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0413af7..d8b89b4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="1a245e6a-2e43-4348-8759-dc1b63a4c9c8" name="Default" comment="Lots of changes" />
+    <list default="true" id="1a245e6a-2e43-4348-8759-dc1b63a4c9c8" name="Default" comment="Lots of changes">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/controller/actor_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/actor_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/controller/kettle_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/kettle_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/controller/notification_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/notification_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/controller/sensor_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/sensor_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/controller/step_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/step_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/controller/system_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/controller/system_controller.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/craftbeerpi.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/craftbeerpi.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/database/model.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/database/model.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/eventbus.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/eventbus.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/extension/dummyactor/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/extension/dummyactor/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/extension/dummystep/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/extension/dummystep/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/http_endpoints/http_actor.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/http_endpoints/http_actor.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/http_endpoints/http_step.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/http_endpoints/http_step.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/utils/encoder.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/utils/encoder.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/core/websocket.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/websocket.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/craftbeerpi.db" beforeDir="false" afterPath="$PROJECT_DIR$/craftbeerpi.db" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docs/genindex.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/genindex.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docs/step.html" beforeDir="false" afterPath="$PROJECT_DIR$/docs/step.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sensors/sensor_1.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sensors/sensor_1.log" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sensors/sensor_1.log.1" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sensors/sensor_1.log.1" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sensors/sensor_1.log.10" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sensors/sensor_1.log.10" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sensors/sensor_1.log.2" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sensors/sensor_1.log.2" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sensors/sensor_1.log.3" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sensors/sensor_1.log.3" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sensors/sensor_1.log.4" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sensors/sensor_1.log.4" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sensors/sensor_1.log.5" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sensors/sensor_1.log.5" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sensors/sensor_1.log.6" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sensors/sensor_1.log.6" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sensors/sensor_1.log.7" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sensors/sensor_1.log.7" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sensors/sensor_1.log.8" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sensors/sensor_1.log.8" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/sensors/sensor_1.log.9" beforeDir="false" afterPath="$PROJECT_DIR$/logs/sensors/sensor_1.log.9" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/test_actor.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/test_actor.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/test_index.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/test_index.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/tests/test_step.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/test_step.py" afterDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -9,21 +43,26 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="CoverageDataManager">
-    <SUITE FILE_PATH="coverage/craftbeerpi4$main2.coverage" NAME="main2 Coverage Results" MODIFIED="1546124517142" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$test_kettle.coverage" NAME="test kettle Coverage Results" MODIFIED="1546020780689" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_tests_test_step.coverage" NAME="pytest for tests.test_step Coverage Results" MODIFIED="1546556940935" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_test_gpio_py.coverage" NAME="pytest in test_gpio.py Coverage Results" MODIFIED="1546524097542" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_test_config_KettleTestCase.coverage" NAME="pytest for test_config.KettleTestCase Coverage Results" MODIFIED="1546021043564" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_test_sensor_py.coverage" NAME="pytest in test_sensor.py Coverage Results" MODIFIED="1546357778220" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_tests_test_app.coverage" NAME="pytest for tests.test_actor Coverage Results" MODIFIED="1546473988994" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$main2.coverage" NAME="main2 Coverage Results" MODIFIED="1546124517142" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$dummy.coverage" NAME="dummy Coverage Results" MODIFIED="1546520051389" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_test_config_py.coverage" NAME="pytest in test_config.py Coverage Results" MODIFIED="1546113553124" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_tests.coverage" NAME="pytest in tests Coverage Results" MODIFIED="1546460156416" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/craftbeerpi4$test_app.coverage" NAME="test_app Coverage Results" MODIFIED="1546451010464" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
-    <SUITE FILE_PATH="coverage/craftbeerpi4$run.coverage" NAME="run Coverage Results" MODIFIED="1546457725249" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_tests_test_actor.coverage" NAME="pytest for tests.test_actor Coverage Results" MODIFIED="1546524995902" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_tests.coverage" NAME="pytest in tests Coverage Results" MODIFIED="1546559401341" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$test_app.coverage" NAME="test_app Coverage Results" MODIFIED="1546525009502" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$run.coverage" NAME="run Coverage Results" MODIFIED="1546559251208" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_test_kettle_KettleTestCase.coverage" NAME="pytest for test_kettle.KettleTestCase Coverage Results" MODIFIED="1546357864696" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$py_test_in_tests.coverage" NAME="py.test in tests Coverage Results" MODIFIED="1544486432317" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
-    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_test_config_KettleTestCase.coverage" NAME="pytest for test_config.KettleTestCase Coverage Results" MODIFIED="1546021043564" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_test_config_ConfigTestCase.coverage" NAME="pytest for test_config.ConfigTestCase Coverage Results" MODIFIED="1546212760017" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_for_tests_test_app.coverage" NAME="pytest for tests.test_actor Coverage Results" MODIFIED="1546356229754" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_test_sensor_py.coverage" NAME="pytest in test_sensor.py Coverage Results" MODIFIED="1546357778220" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/craftbeerpi4$pytest_in_test_ws_py.coverage" NAME="pytest in test_ws.py Coverage Results" MODIFIED="1546518348327" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
   </component>
   <component name="CoverageViewManager">
-    <option name="myElementSize" value="187" />
+    <option name="myElementSize" value="236" />
   </component>
   <component name="DatabaseView">
     <option name="SHOW_INTERMEDIATE" value="true" />
@@ -46,18 +85,6 @@
         <item name="craftbeerpi.db" type="feb32156:DbDataSourceImpl" />
         <item name="main: schema" type="981a47c2:SqliteImplModel$Schema" />
       </path>
-      <path>
-        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
-        <item name="craftbeerpi.db" type="feb32156:DbDataSourceImpl" />
-        <item name="main: schema" type="981a47c2:SqliteImplModel$Schema" />
-        <item name="dashboard: table" type="3d80ac25:SqliteImplModel$Table" />
-      </path>
-      <path>
-        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
-        <item name="craftbeerpi.db" type="feb32156:DbDataSourceImpl" />
-        <item name="main: schema" type="981a47c2:SqliteImplModel$Schema" />
-        <item name="dashboard_content: table" type="3d80ac25:SqliteImplModel$Table" />
-      </path>
       <path>
         <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
         <item name="craftbeerpi.db" type="feb32156:DbDataSourceImpl" />
@@ -73,73 +100,33 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/utils/encoder.py">
+        <entry file="file://$PROJECT_DIR$/tests/test_gpio.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="20" column="24" lean-forward="true" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/extension/dummyactor/__init__.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="100">
-              <caret line="12" selection-start-line="12" selection-end-line="12" />
+            <state>
+              <caret selection-end-line="15" selection-end-column="27" />
               <folding>
-                <element signature="e#0#14#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/utils/utils.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="210">
-              <caret line="14" column="12" lean-forward="true" selection-start-line="14" selection-start-column="12" selection-end-line="14" selection-end-column="12" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/controller/actor_controller.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-174">
-              <caret line="76" column="14" selection-start-line="76" selection-start-column="14" selection-end-line="76" selection-end-column="14" />
-              <folding>
-                <element signature="e#0#14#0" expanded="true" />
+                <element signature="e#0#15#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/requirements.txt">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/run.py">
+        <entry file="file://$PROJECT_DIR$/core/extension/dummyactor/__init__.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+            <state relative-caret-position="222">
+              <caret line="29" column="35" selection-start-line="29" selection-start-column="35" selection-end-line="29" selection-end-column="35" />
+              <folding>
+                <element signature="e#0#14#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/req.txt">
+        <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_actor.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-604" />
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_dashboard.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="3120">
-              <caret line="211" selection-start-line="211" selection-end-line="211" />
+            <state>
               <folding>
                 <element signature="e#0#23#0" expanded="true" />
               </folding>
@@ -147,16 +134,10 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/core/utils/__init__.py">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/core/controller/config_controller.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="15" column="8" selection-start-line="15" selection-start-column="8" selection-end-line="15" selection-end-column="8" />
+            <state>
               <folding>
                 <element signature="e#0#14#0" expanded="true" />
               </folding>
@@ -164,6 +145,26 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/controller/plugin_controller.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state>
+              <folding>
+                <element signature="e#0#14#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/eventbus.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="178">
+              <caret line="111" lean-forward="true" selection-start-line="111" selection-end-line="111" />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -175,36 +176,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>LIONGNNNNNNN</find>
+      <find>stop</find>
+      <find>NOT SHUTDOWN</find>
+      <find>NOWWWW</find>
+      <find>job/step</find>
+      <find>done</find>
+      <find>YES</find>
+      <find>is_stopping</find>
+      <find>job/step/done</find>
+      <find>Topic job/step/done</find>
+      <find>PUSH {'topic': 'job/step/done',</find>
+      <find>finish</find>
+      <find>send</find>
+      <find>on/ok</find>
+      <find>INTER 1</find>
+      <find>inter</find>
+      <find>DONE</find>
+      <find>start</find>
+      <find>runng</find>
+      <find>is_next</find>
+      <find>S NEXT</find>
+      <find>rwing</find>
+      <find>next</find>
+      <find>Topic</find>
+      <find>Topic step</find>
+      <find>INTER</find>
+      <find>no</find>
+      <find>Fut</find>
+      <find>CBPiException</find>
+      <find>RPi</find>
       <find>print</find>
-      <find>register</find>
-      <find>TEST_DB</find>
-      <find>KettleHttp</find>
-      <find>schedu</find>
-      <find>setup</find>
-      <find>not found</find>
-      <find>register_ev</find>
-      <find>call_initializer</find>
-      <find>CBPiWebSocket</find>
-      <find>app</find>
-      <find>View</find>
-      <find>first_o</find>
-      <find>DATABASE_FILE</find>
-      <find>swagger</find>
-      <find>Post</find>
-      <find>add_get</find>
-      <find>typ</find>
-      <find>future</find>
-      <find>/step/stop</find>
-      <find>/stop</find>
-      <find>ResultContainer</find>
-      <find>sensor</find>
-      <find>ON</find>
-      <find>dash</find>
-      <find>Actor</find>
-      <find>logout</find>
-      <find>login</find>
-      <find>Event Ke</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -214,6 +215,8 @@
     <dirStrings>
       <dir>$PROJECT_DIR$/core/controller</dir>
       <dir>$PROJECT_DIR$/core/api</dir>
+      <dir>$PROJECT_DIR$/tests</dir>
+      <dir>$PROJECT_DIR$/core/extension</dir>
       <dir>$PROJECT_DIR$</dir>
       <dir>$PROJECT_DIR$/core</dir>
     </dirStrings>
@@ -224,11 +227,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/config/plugin_list.txt" />
-        <option value="$PROJECT_DIR$/main2.py" />
-        <option value="$PROJECT_DIR$/core/controller/plugin_controller.py" />
-        <option value="$PROJECT_DIR$/core/cbpiwebsocket.py" />
-        <option value="$PROJECT_DIR$/core/job/aiohttp.py" />
         <option value="$PROJECT_DIR$/core/extension/dummysensor/__init__.py" />
         <option value="$PROJECT_DIR$/../craftbeerpi4_api/cbpi_api/sensor.py" />
         <option value="$PROJECT_DIR$/tests/test_app.py" />
@@ -237,50 +235,55 @@
         <option value="$PROJECT_DIR$/core/http_endpoints/swagger/example_swagger_partial.yaml" />
         <option value="$PROJECT_DIR$/core/http_endpoints/http_api.py" />
         <option value="$PROJECT_DIR$/core/http_endpoints/http_api2.py" />
-        <option value="$PROJECT_DIR$/core/controller/notification_controller.py" />
         <option value="$PROJECT_DIR$/core/controller/config_controller.py" />
-        <option value="$PROJECT_DIR$/core/controller/step_controller.py" />
-        <option value="$PROJECT_DIR$/core/eventbus.py" />
         <option value="$PROJECT_DIR$/core/http_endpoints/http_kettle.py" />
         <option value="$PROJECT_DIR$/core/http_endpoints/http_config.py" />
         <option value="$PROJECT_DIR$/core/http_endpoints/http_sensor.py" />
         <option value="$PROJECT_DIR$/core/controller/job_controller.py" />
         <option value="$PROJECT_DIR$/core/database/orm_framework.py" />
-        <option value="$PROJECT_DIR$/core/http_endpoints/http_actor.py" />
-        <option value="$PROJECT_DIR$/core/database/model.py" />
         <option value="$PROJECT_DIR$/core/controller/dashboard_controller.py" />
         <option value="$PROJECT_DIR$/tests/test_sensor.py" />
-        <option value="$PROJECT_DIR$/core/craftbeerpi.py" />
-        <option value="$PROJECT_DIR$/core/controller/sensor_controller.py" />
         <option value="$PROJECT_DIR$/tests/test_notification_controller.py" />
         <option value="$PROJECT_DIR$/tests/test_config.py" />
         <option value="$PROJECT_DIR$/core/controller/crud_controller.py" />
-        <option value="$PROJECT_DIR$/tests/test_actor.py" />
-        <option value="$PROJECT_DIR$/core/extension/dummyactor/__init__.py" />
         <option value="$PROJECT_DIR$/core/utils/utils.py" />
         <option value="$PROJECT_DIR$/tests/test_utils.py" />
-        <option value="$PROJECT_DIR$/core/websocket.py" />
         <option value="$PROJECT_DIR$/core/http_endpoints/http_login.py" />
-        <option value="$PROJECT_DIR$/tests/test_index.py" />
         <option value="$PROJECT_DIR$/core/http_endpoints/http_curd_endpoints.py" />
-        <option value="$PROJECT_DIR$/tests/test_step.py" />
-        <option value="$PROJECT_DIR$/core/http_endpoints/http_step.py" />
-        <option value="$APPLICATION_CONFIG_DIR$/consoles/.datagrid/cell" />
-        <option value="$PROJECT_DIR$/core/controller/kettle_controller.py" />
-        <option value="$PROJECT_DIR$/core/controller/actor_controller.py" />
         <option value="$PROJECT_DIR$/tests/test_kettle.py" />
         <option value="$PROJECT_DIR$/run.py" />
         <option value="$PROJECT_DIR$/tests/test_system.py" />
-        <option value="$PROJECT_DIR$/core/controller/system_controller.py" />
         <option value="$PROJECT_DIR$/core/http_endpoints/http_dashboard.py" />
         <option value="$PROJECT_DIR$/tests/test_dashboard.py" />
+        <option value="$PROJECT_DIR$/core/http_endpoints/http_actor.py" />
+        <option value="$PROJECT_DIR$/core/controller/sensor_controller.py" />
+        <option value="$PROJECT_DIR$/core/controller/kettle_controller.py" />
+        <option value="$PROJECT_DIR$/core/controller/system_controller.py" />
+        <option value="$PROJECT_DIR$/core/controller/notification_controller.py" />
         <option value="$PROJECT_DIR$/core/utils/encoder.py" />
+        <option value="$PROJECT_DIR$/core/websocket.py" />
+        <option value="$PROJECT_DIR$/tests/test_index.py" />
+        <option value="$PROJECT_DIR$/core/craftbeerpi.py" />
+        <option value="$PROJECT_DIR$/tests/dummy.py" />
+        <option value="$PROJECT_DIR$/tests/test_gpio.py" />
+        <option value="$PROJECT_DIR$/core/http_endpoints/http_step.py" />
+        <option value="$PROJECT_DIR$/tests/test_actor.py" />
+        <option value="$PROJECT_DIR$/core/job/_job.py" />
+        <option value="$PROJECT_DIR$/tests/test_step.py" />
+        <option value="$PROJECT_DIR$/tests/test_ws.py" />
+        <option value="$PROJECT_DIR$/core/extension/dummystep/__init__.py" />
+        <option value="$PROJECT_DIR$/core/database/model.py" />
+        <option value="$PROJECT_DIR$/core/controller/step_controller.py" />
+        <option value="$PROJECT_DIR$/core/controller/actor_controller.py" />
+        <option value="$APPLICATION_CONFIG_DIR$/consoles/.datagrid/cell" />
+        <option value="$PROJECT_DIR$/core/eventbus.py" />
+        <option value="$PROJECT_DIR$/core/extension/dummyactor/__init__.py" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="61" />
-    <option name="y" value="72" />
+    <option name="x" value="123" />
+    <option name="y" value="23" />
     <option name="width" value="1492" />
     <option name="height" value="910" />
   </component>
@@ -299,7 +302,14 @@
             </path>
             <path>
               <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="craftbeerpi4" type="b2602c69:ProjectViewProjectNode" />
+              <item name="craftbeerpi4" type="462c0819:PsiDirectoryNode" />
+              <item name="core" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -345,7 +355,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Python.run">
+  <component name="RunManager" selected="Python tests.pytest in tests">
     <configuration name="run" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="craftbeerpi4" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -430,38 +440,6 @@
       <option name="_new_targetType" value="&quot;PATH&quot;" />
       <method v="2" />
     </configuration>
-    <configuration name="pytest for test_config.ConfigTestCase" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
-      <module name="craftbeerpi4" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="IS_MODULE_SDK" value="true" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_keywords" value="&quot;&quot;" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;test_config.ConfigTestCase&quot;" />
-      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
-      <method v="2" />
-    </configuration>
-    <configuration name="pytest for test_kettle.KettleTestCase" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
-      <module name="craftbeerpi4" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="IS_MODULE_SDK" value="true" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_keywords" value="&quot;&quot;" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;test_kettle.KettleTestCase&quot;" />
-      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
-      <method v="2" />
-    </configuration>
     <configuration name="pytest for tests.test_actor" type="tests" factoryName="py.test" nameIsGenerated="true">
       <module name="craftbeerpi4" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -478,7 +456,7 @@
       <option name="_new_targetType" value="&quot;PYTHON&quot;" />
       <method v="2" />
     </configuration>
-    <configuration name="pytest in test_sensor.py" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+    <configuration name="pytest for tests.test_step" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
       <module name="craftbeerpi4" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -490,7 +468,39 @@
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
       <option name="_new_keywords" value="&quot;&quot;" />
       <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;$PROJECT_DIR$/tests/test_sensor.py&quot;" />
+      <option name="_new_target" value="&quot;tests.test_step&quot;" />
+      <option name="_new_targetType" value="&quot;PYTHON&quot;" />
+      <method v="2" />
+    </configuration>
+    <configuration name="pytest in test_gpio.py" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+      <module name="craftbeerpi4" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tests" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;$PROJECT_DIR$/tests/test_gpio.py&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+      <method v="2" />
+    </configuration>
+    <configuration name="pytest in test_ws.py" type="tests" factoryName="py.test" temporary="true" nameIsGenerated="true">
+      <module name="craftbeerpi4" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;$PROJECT_DIR$/tests/test_ws.py&quot;" />
       <option name="_new_targetType" value="&quot;PATH&quot;" />
       <method v="2" />
     </configuration>
@@ -514,18 +524,18 @@
       <item itemvalue="Python.test_app" />
       <item itemvalue="Python.run" />
       <item itemvalue="Python tests.pytest for tests.test_actor" />
-      <item itemvalue="Python tests.pytest for test_config.ConfigTestCase" />
-      <item itemvalue="Python tests.pytest for test_kettle.KettleTestCase" />
       <item itemvalue="Python tests.pytest in tests" />
-      <item itemvalue="Python tests.pytest in test_sensor.py" />
+      <item itemvalue="Python tests.pytest in test_ws.py" />
+      <item itemvalue="Python tests.pytest in test_gpio.py" />
+      <item itemvalue="Python tests.pytest for tests.test_step" />
     </list>
     <recent_temporary>
       <list>
         <item itemvalue="Python tests.pytest in tests" />
         <item itemvalue="Python.run" />
-        <item itemvalue="Python tests.pytest for test_kettle.KettleTestCase" />
-        <item itemvalue="Python tests.pytest in test_sensor.py" />
-        <item itemvalue="Python tests.pytest for test_config.ConfigTestCase" />
+        <item itemvalue="Python tests.pytest for tests.test_step" />
+        <item itemvalue="Python tests.pytest in test_gpio.py" />
+        <item itemvalue="Python tests.pytest in test_ws.py" />
       </list>
     </recent_temporary>
   </component>
@@ -546,7 +556,8 @@
       <workItem from="1545814324660" duration="436000" />
       <workItem from="1546003397332" duration="543000" />
       <workItem from="1546006149688" duration="24136000" />
-      <workItem from="1546201868140" duration="51460000" />
+      <workItem from="1546201868140" duration="66956000" />
+      <workItem from="1546520120024" duration="18168000" />
     </task>
     <task id="LOCAL-00001" summary="Lots of changes">
       <created>1541288846149</created>
@@ -566,39 +577,39 @@
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="pytest_in_tests - 2019.01.02 at 21h 03m 34s.xml">
+    <history-entry file="pytest_in_tests - 2019.01.04 at 00h 18m 01s.xml">
       <configuration name="pytest in tests" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_tests - 2019.01.02 at 21h 05m 21s.xml">
+    <history-entry file="pytest_in_tests - 2019.01.04 at 00h 18m 14s.xml">
       <configuration name="pytest in tests" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_tests - 2019.01.02 at 21h 06m 21s.xml">
+    <history-entry file="pytest_in_tests - 2019.01.04 at 00h 19m 30s.xml">
       <configuration name="pytest in tests" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_tests - 2019.01.02 at 21h 07m 29s.xml">
+    <history-entry file="pytest_in_tests - 2019.01.04 at 00h 21m 30s.xml">
       <configuration name="pytest in tests" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_tests - 2019.01.02 at 21h 08m 38s.xml">
+    <history-entry file="pytest_in_tests - 2019.01.04 at 00h 23m 28s.xml">
       <configuration name="pytest in tests" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_tests - 2019.01.02 at 21h 12m 18s.xml">
+    <history-entry file="pytest_in_tests - 2019.01.04 at 00h 23m 54s.xml">
       <configuration name="pytest in tests" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_tests - 2019.01.02 at 21h 13m 36s.xml">
+    <history-entry file="pytest_in_tests - 2019.01.04 at 00h 25m 08s.xml">
       <configuration name="pytest in tests" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_tests - 2019.01.02 at 21h 14m 38s.xml">
+    <history-entry file="pytest_in_tests - 2019.01.04 at 00h 47m 56s.xml">
       <configuration name="pytest in tests" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_tests - 2019.01.02 at 21h 15m 16s.xml">
+    <history-entry file="pytest_in_tests - 2019.01.04 at 00h 49m 29s.xml">
       <configuration name="pytest in tests" configurationId="tests" />
     </history-entry>
-    <history-entry file="pytest_in_tests - 2019.01.02 at 21h 16m 18s.xml">
+    <history-entry file="pytest_in_tests - 2019.01.04 at 00h 50m 28s.xml">
       <configuration name="pytest in tests" configurationId="tests" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="88783000" />
+    <option name="totallyTimeSpent" value="122447000" />
   </component>
   <component name="TodoView" selected-index="4">
     <todo-panel id="selected-file">
@@ -610,17 +621,17 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="61" y="72" width="1492" height="910" extended-state="0" />
+    <frame x="123" y="23" width="1492" height="910" extended-state="0" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26551723" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3262069" />
       <window_info id="Structure" order="1" weight="0.24957556" />
       <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Event Log" order="0" sideWeight="0.27310345" side_tool="true" weight="0.23349634" />
+      <window_info anchor="bottom" id="Event Log" order="0" sideWeight="0.2737931" side_tool="true" weight="0.3997555" />
       <window_info anchor="bottom" id="Version Control" order="1" weight="0.32762837" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.7268965" weight="0.4180929" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.7262069" visible="true" weight="0.47432762" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39731053" />
       <window_info anchor="bottom" id="Python Console" order="4" weight="0.3290398" />
-      <window_info anchor="bottom" id="Terminal" order="5" sideWeight="0.49761903" visible="true" weight="0.2958435" />
+      <window_info anchor="bottom" id="Terminal" order="5" sideWeight="0.49761903" weight="0.2958435" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3286945" />
       <window_info anchor="bottom" id="Message" order="7" />
       <window_info anchor="bottom" id="Find" order="8" weight="0.32518336" />
@@ -630,14 +641,42 @@
       <window_info anchor="bottom" id="Docker" order="12" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="13" />
       <window_info anchor="bottom" id="Database Console" order="14" weight="0.32885087" />
-      <window_info anchor="right" id="Coverage" sideWeight="0.5017361" side_tool="true" visible="true" weight="0.20275863" />
+      <window_info anchor="bottom" id="Concurrent Activities Diagram" order="15" weight="0.40342298" />
       <window_info anchor="right" id="Data View" order="0" />
-      <window_info anchor="right" id="Database" order="1" sideWeight="0.4982639" visible="true" weight="0.20275863" />
+      <window_info anchor="right" id="Database" order="1" sideWeight="0.49534884" visible="true" weight="0.24551724" />
       <window_info anchor="right" id="Commander" order="2" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="3" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="4" weight="0.25" />
       <window_info anchor="right" id="SciView" order="5" />
+      <window_info anchor="right" id="Coverage" order="6" sideWeight="0.5046512" side_tool="true" visible="true" weight="0.24551724" />
     </layout>
+    <layout-to-restore>
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26551723" />
+      <window_info id="Structure" order="1" weight="0.24957556" />
+      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info anchor="bottom" id="Event Log" order="0" sideWeight="0.27310345" side_tool="true" weight="0.23349634" />
+      <window_info anchor="bottom" id="Version Control" order="1" weight="0.32762837" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.7268965" visible="true" weight="0.2591687" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.39731053" />
+      <window_info anchor="bottom" id="Python Console" order="4" weight="0.3290398" />
+      <window_info anchor="bottom" id="Terminal" order="5" sideWeight="0.49761903" weight="0.2958435" />
+      <window_info anchor="bottom" id="TODO" order="6" weight="0.3286945" />
+      <window_info anchor="bottom" id="Message" order="7" />
+      <window_info anchor="bottom" id="Find" order="8" weight="0.32518336" />
+      <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
+      <window_info anchor="bottom" id="Thumbnails" order="11" weight="0.22666667" />
+      <window_info anchor="bottom" id="Docker" order="12" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Database Changes" order="13" />
+      <window_info anchor="bottom" id="Database Console" order="14" weight="0.32885087" />
+      <window_info anchor="right" id="Coverage" order="0" sideWeight="0.50165015" side_tool="true" visible="true" weight="0.36827585" />
+      <window_info anchor="right" id="Data View" order="1" />
+      <window_info anchor="right" id="Database" order="2" sideWeight="0.49834985" visible="true" weight="0.36827585" />
+      <window_info anchor="right" id="Commander" order="3" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="4" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="5" weight="0.25" />
+      <window_info anchor="right" id="SciView" order="6" />
+    </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
@@ -657,11 +696,6 @@
           <url>file:///usr/local/Cellar/python3/3.6.1/Frameworks/Python.framework/Versions/3.6/lib/python3.6/logging/__init__.py</url>
           <line>25</line>
         </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/tests/test_actor.py</url>
-          <line>27</line>
-          <option name="timeStamp" value="27" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/core/database/orm_framework.py</url>
           <line>149</line>
@@ -683,112 +717,79 @@
     </watches-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_actor.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="206">
-          <caret line="91" column="14" selection-start-line="91" selection-start-column="14" selection-end-line="92" selection-end-column="28" />
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_sensor.py">
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/job_controller.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="43" selection-end-column="33" />
+        <state relative-caret-position="375">
+          <caret line="41" selection-start-line="41" selection-end-line="41" />
           <folding>
             <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_notification_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="16" column="25" lean-forward="true" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/craftbeerpi.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="78" column="30" lean-forward="true" selection-start-line="78" selection-start-column="30" selection-end-line="78" selection-end-column="30" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_config.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="475">
-          <caret line="59" column="15" selection-start-line="59" selection-start-column="15" selection-end-line="59" selection-end-column="15" />
-          <folding>
-            <element signature="e#0#11#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/plugin_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1869">
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_utils.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="5" column="11" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
-          <folding>
-            <element signature="e#0#65#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/extension/dummyactor/config.yaml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/fermentation_controller.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/extension/comp/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="16" column="8" lean-forward="true" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
-          <folding>
-            <element signature="e#0#23#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/__init__.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_sensor.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_actor.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="20" column="8" lean-forward="true" selection-start-line="20" selection-start-column="8" selection-end-line="21" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_login.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="146">
-          <caret line="26" column="84" selection-start-line="26" selection-start-column="84" selection-end-line="26" selection-end-column="84" />
-          <folding>
-            <element signature="e#0#23#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
       <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
         <state>
@@ -796,50 +797,83 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/eventbus.py">
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/craftbeerpi.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="44" column="37" selection-start-line="44" selection-start-column="37" selection-end-line="44" selection-end-column="37" />
+        <state relative-caret-position="76">
+          <caret line="212" column="14" selection-start-line="212" selection-start-column="14" selection-end-line="212" selection-end-column="14" />
           <folding>
             <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/sensor_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
-          <folding>
-            <element signature="e#0#11#0" expanded="true" />
-          </folding>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_step.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="129">
-          <caret line="56" column="33" selection-start-line="56" selection-start-column="33" selection-end-line="56" selection-end-column="33" />
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/step_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="73">
-          <caret line="141" column="19" selection-start-line="141" selection-start-column="14" selection-end-line="141" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_kettle.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="350">
-          <caret line="40" column="47" selection-start-line="40" selection-start-column="37" selection-end-line="40" selection-end-column="47" />
-          <folding>
-            <element signature="e#0#23#0" expanded="true" />
-          </folding>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
         </state>
       </provider>
     </entry>
@@ -850,125 +884,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_kettle.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="173">
-          <caret line="31" column="33" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_step.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3405">
-          <caret line="227" column="38" selection-start-line="227" selection-start-column="38" selection-end-line="227" selection-end-column="38" />
-          <folding>
-            <element signature="e#0#23#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/kettle_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="683">
-          <caret line="139" column="84" selection-start-line="139" selection-start-column="84" selection-end-line="139" selection-end-column="84" />
-          <folding>
-            <element signature="e#0#9#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/websocket.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="149">
-          <caret line="28" column="32" selection-start-line="28" selection-start-column="32" selection-end-line="28" selection-end-column="32" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/mqtt/__init__.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/mqtt/mqtt.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#0#50#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/mqtt/mqtt_matcher.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/job/_job.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="23" column="21" lean-forward="true" selection-start-line="23" selection-start-column="21" selection-end-line="23" selection-end-column="21" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_system.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="26" column="57" selection-start-line="26" selection-start-column="57" selection-end-line="26" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/system_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="219">
-          <caret line="29" column="16" selection-start-line="29" selection-start-column="16" selection-end-line="29" selection-end-column="16" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/database/orm_framework.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="49" column="34" selection-start-line="49" selection-start-column="19" selection-end-line="49" selection-end-column="34" />
-          <folding>
-            <element signature="e#0#11#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_index.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="331">
-          <caret line="34" column="50" lean-forward="true" selection-start-line="34" selection-start-column="50" selection-end-line="34" selection-end-column="50" />
-          <folding>
-            <element signature="e#0#65#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/dashboard">
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
       <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
         <state>
           <filtering enabled="true" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/database/model.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-672">
-          <caret line="40" column="28" lean-forward="true" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="28" />
-          <folding>
-            <element signature="e#0#11#0" expanded="true" />
-            <marker date="1546452188370" expanded="true" signature="1478:1518" ph="UPDATE missi... " />
-            <marker date="1546452188370" expanded="true" signature="1860:1912" ph="SELECT * FRO... missing_value" />
-            <marker date="1546452188370" expanded="true" signature="2292:2362" ph="UPDATE missi... " />
-          </folding>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/dummy">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
         </state>
       </provider>
     </entry>
@@ -979,17 +905,134 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/crud_controller.py">
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/dashboard">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/sensor">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/job/_job.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="44">
-          <caret line="6" column="6" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
+        <state relative-caret-position="223">
+          <caret line="75" column="49" selection-start-line="75" selection-start-column="49" selection-end-line="75" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/job/_scheduler.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="133">
+          <caret line="14" column="10" lean-forward="true" selection-start-line="14" selection-start-column="10" selection-end-line="14" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/job/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="24" selection-start-line="9" selection-start-column="24" selection-end-line="9" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/system_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
           <folding>
-            <element signature="e#0#13#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/job_controller.py">
+    <entry file="file://$PROJECT_DIR$/tests/test_actor.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="86" column="14" selection-start-line="86" selection-start-column="14" selection-end-line="86" selection-end-column="14" />
+          <folding>
+            <element signature="e#0#25#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file:///usr/local/Cellar/python/3.7.1/Frameworks/Python.framework/Versions/3.7/lib/python3.7/asyncio/tasks.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="554" column="10" selection-start-line="554" selection-start-column="10" selection-end-line="554" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_step.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-267">
+          <caret line="180" column="35" selection-start-line="180" selection-start-column="35" selection-end-line="180" selection-end-column="35" />
+          <folding>
+            <element signature="e#0#23#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/test_step.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="432">
+          <caret line="94" column="35" selection-start-line="94" selection-start-column="35" selection-end-line="94" selection-end-column="35" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/test_ws.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="232">
+          <caret line="30" column="45" selection-start-line="30" selection-start-column="45" selection-end-line="30" selection-end-column="45" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/extension/dummystep/config.yaml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/extension/dummystep/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/database/model.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="253">
+          <caret line="64" column="115" selection-start-line="64" selection-start-column="115" selection-end-line="64" selection-end-column="115" />
+          <folding>
+            <element signature="e#0#11#0" expanded="true" />
+            <marker date="1546557779957" expanded="true" signature="1478:1518" ph="UPDATE missi... " />
+            <marker date="1546557779957" expanded="true" signature="2314:2366" ph="SELECT * FRO... missing_value" />
+            <marker date="1546557779957" expanded="true" signature="2783:2853" ph="UPDATE missi... " />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/step_controller.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="212">
+          <caret line="124" column="85" selection-start-line="124" selection-start-column="85" selection-end-line="124" selection-end-column="85" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/controller/plugin_controller.py">
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <folding>
@@ -998,101 +1041,84 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_dashboard.py">
+    <entry file="file://$PROJECT_DIR$/tests/test_gpio.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="337">
-          <caret line="30" column="54" selection-start-line="30" selection-start-column="54" selection-end-line="30" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/dashboard_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="25" column="11" lean-forward="true" selection-start-line="25" selection-start-column="11" selection-end-line="25" selection-end-column="11" />
+        <state>
+          <caret selection-end-line="15" selection-end-column="27" />
           <folding>
-            <element signature="e#0#14#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_curd_endpoints.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="309">
-          <caret line="49" column="7" selection-start-line="49" selection-start-column="7" selection-end-line="49" selection-end-column="45" />
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/actor">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_dashboard.py">
+    <entry file="file://$PROJECT_DIR$/core/http_endpoints/http_actor.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3120">
-          <caret line="211" selection-start-line="211" selection-end-line="211" />
+        <state>
           <folding>
             <element signature="e#0#23#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/utils/__init__.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/utils/utils.py">
+    <entry file="file://$PROJECT_DIR$/core/eventbus.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="14" column="12" lean-forward="true" selection-start-line="14" selection-start-column="12" selection-end-line="14" selection-end-column="12" />
+        <state relative-caret-position="178">
+          <caret line="111" lean-forward="true" selection-start-line="111" selection-end-line="111" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/utils/encoder.py">
+    <entry file="file://$PROJECT_DIR$/core/controller/crud_controller.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="20" column="24" lean-forward="true" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/extension/dummyactor/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="100">
-          <caret line="12" selection-start-line="12" selection-end-line="12" />
+        <state relative-caret-position="90">
+          <caret line="6" column="6" selection-start-line="6" selection-start-column="6" selection-end-line="6" selection-end-column="6" />
           <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/core/controller/config_controller.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="15" column="8" selection-start-line="15" selection-start-column="8" selection-end-line="15" selection-end-column="8" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
+            <element signature="e#0#13#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/core/controller/actor_controller.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-174">
-          <caret line="76" column="14" selection-start-line="76" selection-start-column="14" selection-end-line="76" selection-end-column="14" />
+        <state relative-caret-position="300">
+          <caret line="20" column="13" lean-forward="true" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="49" />
           <folding>
             <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/run.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+    <entry file="das://5067e7fe-480d-4433-bc40-f2d1c38362a2/schema/main/table/step">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/req.txt">
+    <entry file="file://$PROJECT_DIR$/core/controller/config_controller.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-604" />
+        <state>
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/requirements.txt">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/core/extension/dummyactor/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="222">
+          <caret line="29" column="35" selection-start-line="29" selection-start-column="35" selection-end-line="29" selection-end-column="35" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
     </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/core/controller/actor_controller.py b/core/controller/actor_controller.py
index f0fa440..6f80755 100644
--- a/core/controller/actor_controller.py
+++ b/core/controller/actor_controller.py
@@ -2,6 +2,7 @@ import logging
 from asyncio import Future
 
 from cbpi_api import *
+from voluptuous import Schema
 
 from core.controller.crud_controller import CRUDController
 from core.database.model import ActorModel
@@ -29,23 +30,28 @@ class ActorController(CRUDController):
         :return: 
         """
         await super(ActorController, self).init()
-
         for id, value in self.cache.items():
             await self._init_actor(value)
 
+    def get_state(self):
+        return dict(items=self.cache,types=self.types)
+
     async def _init_actor(self, actor):
 
-        if actor.type in self.types:
+        try:
+            if actor.type in self.types:
 
-            cfg = actor.config.copy()
-            cfg.update(dict(cbpi=self.cbpi, id=id, name=actor.name))
-            clazz = self.types[actor.type]["class"];
-            self.cache[actor.id].instance = clazz(**cfg)
-            self.cache[actor.id].instance.init()
-            await self.cbpi.bus.fire(topic="actor/%s/initialized" % actor.id, id=actor.id)
-        else:
-            print("NOT FOUND")
-            self.logger.error("Actor type '%s' not found (Available Actor Types: %s)" % (actor.type, ', '.join(self.types.keys())))
+                cfg = actor.config.copy()
+                cfg.update(dict(cbpi=self.cbpi, id=id, name=actor.name))
+                clazz = self.types[actor.type]["class"];
+                self.cache[actor.id].instance = clazz(**cfg)
+                self.cache[actor.id].instance.init()
+                await self.cbpi.bus.fire(topic="actor/%s/initialized" % actor.id, id=actor.id)
+            else:
+                print("NOT FOUND")
+                self.logger.error("Actor type '%s' not found (Available Actor Types: %s)" % (actor.type, ', '.join(self.types.keys())))
+        except Exception as e:
+            self.logger.error("Failed to init actor %s - Reason %s" % (actor.id, str(e)))
 
     async def _stop_actor(self, actor):
         actor.instance.stop()
@@ -93,6 +99,7 @@ class ActorController(CRUDController):
             else:
                 actor.on()
 
+
     @on_event(topic="actor/+/off")
     async def off(self, actor_id, **kwargs) -> None:
         """
@@ -102,7 +109,6 @@ class ActorController(CRUDController):
         :param actor_id: the actor actor_id
         :param kwargs: 
         """
-
         self.logger.debug("OFF %s" % actor_id)
         actor_id = int(actor_id)
 
@@ -110,6 +116,15 @@ class ActorController(CRUDController):
             actor = self.cache[actor_id].instance
             actor.off()
 
+    @on_event(topic="actor/+/action")
+    async def call_action(self, actor_id, data, **kwargs) -> None:
+
+        schema = Schema({"name":str, "parameter":dict})
+        schema(data)
+        name = data.get("name")
+        parameter = data.get("parameter")
+        actor = self.cache[actor_id].instance.__getattribute__(name)(**parameter)
+
     async def _post_add_callback(self, m):
         '''
     
diff --git a/core/controller/kettle_controller.py b/core/controller/kettle_controller.py
index 49fa2f0..3b48f8d 100644
--- a/core/controller/kettle_controller.py
+++ b/core/controller/kettle_controller.py
@@ -30,6 +30,9 @@ class KettleController(CRUDController):
         '''
         await super(KettleController, self).init()
 
+    def get_state(self):
+        return dict(items=self.cache,types=self.types)
+
     async def toggle_automtic(self, id):
         '''
         
diff --git a/core/controller/notification_controller.py b/core/controller/notification_controller.py
index 262b25b..3e12bff 100644
--- a/core/controller/notification_controller.py
+++ b/core/controller/notification_controller.py
@@ -17,5 +17,6 @@ class NotificationController(object):
 
 
     @on_event(topic="notification/#")
-    async def _on_event(self, key, message, type, **kwargs):
-        self.cbpi.ws.send("YES")
+    async def _on_event(self, key, message, type=None, **kwargs):
+        self.cbpi.ws.send(dict(key=message))
+
diff --git a/core/controller/sensor_controller.py b/core/controller/sensor_controller.py
index 5c42837..fb3f19c 100644
--- a/core/controller/sensor_controller.py
+++ b/core/controller/sensor_controller.py
@@ -33,6 +33,9 @@ class SensorController(CRUDController):
         for id, value in self.cache.items():
             await self.init_sensor(value)
 
+    def get_state(self):
+        return dict(items=self.cache,types=self.types)
+
     async def init_sensor(self, sensor):
         if sensor.type in self.types:
             cfg = sensor.config.copy()
diff --git a/core/controller/step_controller.py b/core/controller/step_controller.py
index 30784f2..08809f3 100644
--- a/core/controller/step_controller.py
+++ b/core/controller/step_controller.py
@@ -1,4 +1,5 @@
 import asyncio
+import logging
 import time
 
 from cbpi_api import *
@@ -17,14 +18,17 @@ class StepController(CRUDController):
 
     def __init__(self, cbpi):
         super(StepController, self).__init__(cbpi)
-
+        self.caching = False
+        self.is_stopping = False
         self.cbpi = cbpi
         self.current_task = None
+        self.is_next = False
         self.types = {}
         self.current_step = None
         self.current_job = None
         self.cbpi.register(self)
-
+        self.logger = logging.getLogger(__name__)
+        self.starttime = None
 
     async def init(self):
         '''
@@ -54,6 +58,8 @@ class StepController(CRUDController):
             self.current_job = await self.cbpi.job.start_job(self.current_step.run(), step.name, "step")
 
 
+    def get_state(self):
+        return dict(items=self.get_all(),types=self.types,is_running=self.is_running(),current_step=self.current_step)
 
     @on_event("step/action")
     async def handle_action(self, action, **kwargs):
@@ -72,7 +78,7 @@ class StepController(CRUDController):
 
 
     @on_event("step/next")
-    async def handle_next(self, **kwargs):
+    async def next(self, **kwargs):
         '''
         Event Handler for "step/next".
         It start the next step
@@ -80,28 +86,20 @@ class StepController(CRUDController):
         :param kwargs: 
         :return: None
         '''
-        if self.current_step is not None:
-            self.current_step.next()
-            pass
+        print("REQUEST NEXT")
+        self.starttime = time.time()
+        if self.current_step is not None and self.is_next is False:
+            self.logger.info("Request Next Step to start. Stopping current step")
+            self.is_next = True
+            self.current_step.stop()
+        else:
+            self.logger.info("Can Start Next")
 
-    @on_event("step/reset")
-    async def handle_reset(self, **kwargs):
-        '''
-        Event Handler for "step/reset".
-        Resets the current step
-        
-        :param kwargs: 
-        :return: None
-        '''
-        if self.current_step is not None:
-            await self.stop()
-            self.is_stopping = True
 
-        await self.model.reset_all_steps()
 
 
     @on_event("job/step/done")
-    async def handle_step_done(self, topic, **kwargs):
+    async def _step_done(self, topic, **kwargs):
 
         '''
         Event Handler for "step/+/done".
@@ -112,17 +110,23 @@ class StepController(CRUDController):
         :return: 
         '''
 
+        # SHUTDONW DO NOTHING
+        self.logger.info("HANDLE DONE IS SHUTDONW %s  IS STOPPING %s IS NEXT %s" % ( self.cbpi.shutdown, self.is_stopping, self.is_next))
+
+
         if self.cbpi.shutdown:
             return
 
-        self.cache[self.current_step.id].state = "D"
-        step_id = self.current_step.id
-        self.current_step = None
+        if self.is_stopping:
+            self.is_stopping = False
+            return
+        self.is_next = False
+        if self.current_step is not None:
+            await self.model.update_state(self.current_step.id, "D", int(time.time()))
+            self.current_step = None
+        await self.start()
 
-        if self.is_stopping is not True:
-            await self.start()
 
-        self.is_stopping = False
 
     def _get_manged_fields_as_array(self, type_cfg):
 
@@ -139,7 +143,7 @@ class StepController(CRUDController):
             return False
 
     @on_event("step/start")
-    async def start(self, future, **kwargs):
+    async def start(self, **kwargs):
 
         '''
         Start the first step 
@@ -147,39 +151,58 @@ class StepController(CRUDController):
         :return:None  
         '''
 
-        if self.current_step is None:
-            loop = asyncio.get_event_loop()
-            open_step = False
+        if self.is_running() is False:
+            next_step = await self.model.get_by_state("I")
 
-            inactive = await self.model.get_by_state("I")
-            active = await self.model.get_by_state("A")
+            if next_step is not None:
+                step_type = self.types[next_step.type]
 
-            if active is not None:
-                active.state = 'D'
-                active.end = int(time.time())
-                # self.stop_step()
-                self.current_step = None
-                await self.model.update(**active.__dict__)
-
-            if inactive is not None:
-                step_type = self.types["CustomStepCBPi"]
-
-                config = dict(cbpi=self.cbpi, id=inactive.id, name=inactive.name, managed_fields=self._get_manged_fields_as_array(step_type))
+                config = dict(cbpi=self.cbpi, id=next_step.id, name=next_step.name, managed_fields=self._get_manged_fields_as_array(step_type))
                 self.current_step = step_type["class"](**config)
 
-                inactive.state = 'A'
-                inactive.stepstate = inactive.config
-                inactive.start = int(time.time())
-                await self.model.update(**inactive.__dict__)
-                self.current_job = await self.cbpi.job.start_job(self.current_step.run(), inactive.name, "step")
+                next_step.state = 'A'
+                next_step.stepstate = next_step.config
+                next_step.start = int(time.time())
+                await self.model.update(**next_step.__dict__)
+                if self.starttime is not None:
+                    end = time.time()
+                    d = end - self.starttime
+                    print("DURATION", d)
+                else:
+                    print("NORMAL START")
+                self.current_job = await self.cbpi.job.start_job(self.current_step.run(), next_step.name, "step")
+                await self.cbpi.bus.fire("step/%s/started" % self.current_step.id)
             else:
-                await self.cbpi.bus.fire("step/berwing/finished")
-
-        future.set_result(True)
+                await self.cbpi.bus.fire("step/brewing/finished")
+        else:
+            self.logger.error("Process Already Running")
+        print("----------- END")
 
     @on_event("step/stop")
     async def stop(self, **kwargs):
-        if self.current_job is not None:
+
+        if self.current_step is not None:
+            self.current_step.stop()
             self.is_stopping = True
-            await self.current_job.close()
-            await self.model.reset_all_steps()
+            self.current_step = None
+
+        await self.model.reset_all_steps()
+        await self.cbpi.bus.fire("step/brewing/stopped")
+
+    @on_event("step/reset")
+    async def handle_reset(self, **kwargs):
+        '''
+        Event Handler for "step/reset".
+        Resets the current step
+
+        :param kwargs:
+        :return: None
+        '''
+        if self.current_step is not None:
+
+            await self.stop()
+            self.current_step = None
+            self.is_stopping = True
+
+        await self.model.reset_all_steps()
+
diff --git a/core/controller/system_controller.py b/core/controller/system_controller.py
index d92b645..aec1a53 100644
--- a/core/controller/system_controller.py
+++ b/core/controller/system_controller.py
@@ -4,6 +4,8 @@ from aiojobs.aiohttp import get_scheduler_from_app
 
 from cbpi_api import *
 
+from utils import json_dumps
+
 
 class SystemController():
 
@@ -12,6 +14,16 @@ class SystemController():
         self.service = cbpi.actor
         self.cbpi.register(self, "/system")
 
+    @request_mapping("/state", method="GET", auth_required=False)
+    def state(self, request):
+        # TODO implement restart
+        return web.json_response(data=dict(
+            actor=self.cbpi.actor.get_state(),
+            sensor=self.cbpi.sensor.get_state(),
+            kettle=self.cbpi.kettle.get_state(),
+            step=self.cbpi.step.get_state())
+            , dumps=json_dumps)
+
     @request_mapping("/restart", method="POST", name="RestartServer", auth_required=False)
     def restart(self, request):
         # TODO implement restart
diff --git a/core/craftbeerpi.py b/core/craftbeerpi.py
index 869c6e9..e8dde1d 100644
--- a/core/craftbeerpi.py
+++ b/core/craftbeerpi.py
@@ -35,8 +35,6 @@ from http_endpoints.http_step import StepHttpEndpoints
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.INFO)
 
-
-
 @web.middleware
 async def error_middleware(request, handler):
     try:
@@ -57,7 +55,6 @@ async def error_middleware(request, handler):
 
 class CraftBeerPi():
 
-
     def __init__(self):
         self.static_config = load_config(os.path.join(os.path.dirname(__file__), '../config/config.yaml'))
         self.database_file = "./craftbeerpi.db"
@@ -117,7 +114,7 @@ class CraftBeerPi():
         '''
         self.register_http_endpoints(obj, url_prefix, static)
         self.bus.register_object(obj)
-        self.ws.register_object(obj)
+        #self.ws.register_object(obj)
         self.job.register_background_task(obj)
         self.register_on_startup(obj)
 
diff --git a/core/database/model.py b/core/database/model.py
index 2c96df1..8b5cee2 100644
--- a/core/database/model.py
+++ b/core/database/model.py
@@ -58,6 +58,15 @@ class StepModel(DBModel):
             cursor = await db.execute("UPDATE %s SET stepstate = ? WHERE id = ?" % cls.__table_name__, (json.dumps(state), step_id))
             await db.commit()
 
+    @classmethod
+    async def update_state(cls, step_id, state, end=None):
+        async with aiosqlite.connect(DATABASE_FILE) as db:
+            if end is not None:
+                await db.execute("UPDATE %s SET state = ?, end = ? WHERE id = ?" % cls.__table_name__, (state, end, step_id))
+            else:
+                await db.execute("UPDATE %s SET state = ? WHERE id = ?" % cls.__table_name__, (state, step_id))
+            await db.commit()
+
     @classmethod
     async def get_by_state(cls, state, order=True):
 
@@ -73,6 +82,7 @@ class StepModel(DBModel):
 
     @classmethod
     async def reset_all_steps(cls):
+        print("RESET ALL STEPS NOW")
         async with aiosqlite.connect(DATABASE_FILE) as db:
             await db.execute("UPDATE %s SET state = 'I', stepstate = NULL , start = NULL, end = NULL " % cls.__table_name__)
             await db.commit()
diff --git a/core/eventbus.py b/core/eventbus.py
index e0970d2..7f66bec 100644
--- a/core/eventbus.py
+++ b/core/eventbus.py
@@ -51,6 +51,7 @@ class CBPiEventBus(object):
         if method in self.registry:
             raise RuntimeError("Method %s already registerd. Please unregister first!" % method.__name__)
         self.logger.info("Topic %s", topic)
+
         node = self._root
         for sym in topic.split('/'):
             node = node._children.setdefault(sym, self.Node())
@@ -104,7 +105,6 @@ class CBPiEventBus(object):
             self.loop = asyncio.get_event_loop()
 
 
-
     def sync_fire(self,topic: str,timeout=1, **kwargs):
         self.loop.create_task(self.fire(topic=topic, timeout=timeout, **kwargs))
 
diff --git a/core/extension/dummyactor/__init__.py b/core/extension/dummyactor/__init__.py
index d759108..f21060a 100644
--- a/core/extension/dummyactor/__init__.py
+++ b/core/extension/dummyactor/__init__.py
@@ -1,44 +1,90 @@
 import logging
+from unittest.mock import MagicMock, patch
 
 from cbpi_api import *
+from cbpi_api.exceptions import CBPiException
 
+logger = logging.getLogger(__name__)
+
+try:
+    import RPi.GPIO as GPIO
+except Exception:
+    logger.error("Failed to load RPi.GPIO. Using Mock")
+    MockRPi = MagicMock()
+    modules = {
+        "RPi": MockRPi,
+        "RPi.GPIO": MockRPi.GPIO
+    }
+    patcher = patch.dict("sys.modules", modules)
+    patcher.start()
+    import RPi.GPIO as GPIO
 
 class CustomActor(CBPiActor):
 
     # Custom property which can be configured by the user
-    gpio = Property.Number(label="Test")
-    v1 = Property.Text(label="Test")
-    v2 = Property.Kettle(label="Test")
-    v3 = Property.Sensor(label="Test")
 
     def init(self):
         pass
 
-    def stop(self):
-        pass
-
-
-    @action(key="name", parameters={})
-    def myAction(self):
-        pass
-
-    def state(self):
-        super().state()
+    def on(self, power=0):
+        logger.info("ACTOR %s ON" % self.id)
+        self.state = True
 
     def off(self):
-
-        print("OFF")
-        # Code to swtich the actor off goes here
-
+        logger.info("ACTOR %s OFF " % self.id)
         self.state = False
 
-    def on(self, power=100):
 
-        print("ON")
-        # Code to swtich the actor on goes here
 
+
+class GPIOActor(CBPiActor):
+
+    # Custom property which can be configured by the user
+
+    gpio = Property.Select("GPIO", options=[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27], description="GPIO to which the actor is connected")
+
+    def init(self):
+        try:
+            GPIO.setup(int(self.gpio), GPIO.OUT)
+            GPIO.output(int(self.gpio), 0)
+        except Exception as e:
+            raise CBPiException("FAILD TO INIT ACTOR")
+
+    def on(self, power=0):
+
+        print("GPIO ON %s" % str(self.gpio))
+        GPIO.output(int(self.gpio), 1)
         self.state = True
 
+    def off(self):
+        print("GPIO OFF %s" % str(self.gpio))
+        GPIO.output(int(self.gpio), 0)
+        self.state = False
+
+class GPIORelayBoardActor(CBPiActor):
+
+    # Custom property which can be configured by the user
+
+    gpio = Property.Select("GPIO", options=[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27], description="GPIO to which the actor is connected")
+
+    def init(self):
+        try:
+            GPIO.setup(int(self.gpio), GPIO.OUT)
+            GPIO.output(int(self.gpio), 1)
+        except Exception as e:
+            raise CBPiException("FAILD TO INIT ACTOR")
+
+    def on(self, power=0):
+
+        print("GPIO ON %s" % str(self.gpio))
+        GPIO.output(int(self.gpio), 0)
+        self.state = True
+
+    def off(self):
+        print("GPIO OFF %s" % str(self.gpio))
+        GPIO.output(int(self.gpio), 1)
+        self.state = False
+
 
 
 def setup(cbpi):
diff --git a/core/extension/dummystep/__init__.py b/core/extension/dummystep/__init__.py
index b2ae6e6..e4921f4 100644
--- a/core/extension/dummystep/__init__.py
+++ b/core/extension/dummystep/__init__.py
@@ -14,14 +14,12 @@ class CustomStepCBPi(CBPiSimpleStep):
         self.name="WOOHOO"
 
     async def run_cycle(self):
-
-
-        #await asyncio.sleep(1)
+        print("RUN", self.name)
         self.i = self.i + 1
-        self.name="HALLO WELT"
-        if self.i == 20:
+        if self.i == 5:
+        #    print("NEXT")
             self.next()
-        self.cbpi.notify(key="step", message="HELLO FROM STEP")
+        #self.cbpi.notify(key="step", message="HELLO FROM STEP")
 
 
 
diff --git a/core/http_endpoints/http_actor.py b/core/http_endpoints/http_actor.py
index ae5b4ec..e084365 100644
--- a/core/http_endpoints/http_actor.py
+++ b/core/http_endpoints/http_actor.py
@@ -231,4 +231,39 @@ class ActorHttpEndpoints(HttpCrudEndpoints):
         actor_id = int(request.match_info['id'])
 
         await self.cbpi.bus.fire(topic="actor/%s/toggle" % actor_id, actor_id=actor_id)
+        return web.Response(status=204)
+
+    @request_mapping(path="/{id:\d+}/action", method="POST", auth_required=auth)
+    async def http_action(self, request) -> web.Response:
+        """
+
+        ---
+        description: Toogle an actor on or off
+        tags:
+        - Actor
+        parameters:
+        - name: "id"
+          in: "path"
+          description: "Actor ID"
+          required: true
+          type: "integer"
+          format: "int64"
+        - in: body
+          name: body
+          description: Update an actor
+          required: false
+          schema:
+            type: object
+            properties:
+              name:
+                type: string
+              config:
+                type: object
+        responses:
+            "204":
+                description: successful operation
+        """
+        actor_id = int(request.match_info['id'])
+
+        await self.cbpi.bus.fire(topic="actor/%s/action" % actor_id, actor_id=actor_id, data=await request.json())
         return web.Response(status=204)
\ No newline at end of file
diff --git a/core/http_endpoints/http_step.py b/core/http_endpoints/http_step.py
index 587e1d9..1eb2e40 100644
--- a/core/http_endpoints/http_step.py
+++ b/core/http_endpoints/http_step.py
@@ -178,12 +178,10 @@ class StepHttpEndpoints(HttpCrudEndpoints):
         """
         if self.controller.is_running():
             raise CBPiException("Brewing Process Already Running")
-        result = await self.cbpi.bus.fire("step/start")
-        r = result.get("core.controller.step_controller.start")
-        if r[0] is True:
-            return web.Response(status=204)
-        else:
-            raise CBPiException("Failed to start brewing process")
+        print("FIRE START FROM HTTP")
+        await self.cbpi.bus.fire("step/start")
+        return web.Response(status=204)
+
 
     @request_mapping(path="/reset", auth_required=False)
     async def http_reset(self, request):
diff --git a/core/utils/encoder.py b/core/utils/encoder.py
index 1fa6b08..49fee31 100644
--- a/core/utils/encoder.py
+++ b/core/utils/encoder.py
@@ -2,7 +2,6 @@ from json import JSONEncoder
 
 class ComplexEncoder(JSONEncoder):
 
-
     def default(self, obj):
 
         from core.database.orm_framework import DBModel
@@ -17,7 +16,7 @@ class ComplexEncoder(JSONEncoder):
             #elif hasattr(obj, "callback"):
             #    return obj()
             else:
-                return None
+                raise TypeError()
         except TypeError:
             pass
         return None
diff --git a/core/websocket.py b/core/websocket.py
index 54d1672..bccea10 100644
--- a/core/websocket.py
+++ b/core/websocket.py
@@ -1,11 +1,13 @@
 import logging
 import weakref
 from collections import defaultdict
-import json
+
 import aiohttp
 from aiohttp import web
-from typing import Iterable, Callable
 from cbpi_api import *
+from voluptuous import Schema
+
+from utils import json_dumps
 
 
 class CBPiWebSocket:
@@ -19,60 +21,53 @@ class CBPiWebSocket:
 
     @on_event(topic="#")
     async def listen(self, topic, **kwargs):
-        from core.utils.encoder import ComplexEncoder
-        data = json.dumps(dict(topic=topic, data=dict(**kwargs)),skipkeys=True, check_circular=True, cls=ComplexEncoder)
+        data = dict(topic=topic, data=dict(**kwargs))
         self.logger.info("PUSH %s " % data)
         self.send(data)
 
     def send(self, data):
-
+        self.logger.debug("broadcast to ws clients. Data: %s" % data)
         for ws in self._clients:
             async def send_data(ws, data):
-                await ws.send_str(data)
+                await ws.send_json(data=data, dumps=json_dumps)
             self.cbpi.app.loop.create_task(send_data(ws, data))
 
-    def add_callback(self, func: Callable, event: str) -> None:
-        self._callbacks[event].add(func)
-
-    def register_object(self, obj):
-        for method in [getattr(obj, f) for f in dir(obj) if callable(getattr(obj, f)) and hasattr(getattr(obj, f), "ws")]:
-            self.add_callback(method, method.__getattribute__("key"))
-
-    async def emit(self, event: str, *args, **kwargs) -> None:
-        for func in self._event_funcs(event):
-            await func(*args, **kwargs)
-
-    def _event_funcs(self, event: str) -> Iterable[Callable]:
-        for func in self._callbacks[event]:
-            yield func
-
     async def websocket_handler(self, request):
         ws = web.WebSocketResponse()
         await ws.prepare(request)
 
         self._clients.add(ws)
+        peername = request.transport.get_extra_info('peername')
+        if peername is not None:
+            host, port = peername
+        else:
+            host, port = "Unknowen"
 
-        c = len(self._clients) - 1
-
-        self.logger.info(ws)
-        self.logger.info(c)
+        self.logger.info("Client Connected - Host: %s Port: %s  - client count: %s " % (host, port, len(self._clients)))
         try:
+            await ws.send_json(data=dict(topic="connection/success"))
             async for msg in ws:
                 if msg.type == aiohttp.WSMsgType.TEXT:
-                    if msg.data == 'close':
 
+                    msg_obj = msg.json()
+                    schema = Schema({"topic": str, "data": dict})
+                    schema(msg_obj)
+
+                    topic = msg_obj.get("topic")
+                    data = msg_obj.get("data")
+                    if topic == "close":
                         await ws.close()
-                        self.logger.info("WS Close")
                     else:
-                        msg_obj = msg.json()
-
-                        await self.cbpi.bus.fire(msg_obj["topic"], id=1, power=22)
-                        # await self.fire(msg_obj["key"], ws, msg)
-
-                        # await ws.send_str(msg.data)
+                        if data is not None:
+                            await self.cbpi.bus.fire(topic=topic, **data)
+                        else:
+                            await self.cbpi.bus.fire(topic=topic)
                 elif msg.type == aiohttp.WSMsgType.ERROR:
                     self.logger.error('ws connection closed with exception %s' % ws.exception())
 
+        except Exception as e:
+            self.logger.error("%s - Received Data %s" % (str(e), msg.data))
+
         finally:
             self._clients.discard(ws)
 
diff --git a/craftbeerpi.db b/craftbeerpi.db
index 20d8331fdb403c5a3975d66a688a8e63128ab2b9..c153a98e916ac59ad6d8fd85ef36b7ee128026ef 100644
GIT binary patch
delta 1180
zcmZvaOH30{6ozlxd0+_V3_>mMM=MCtmbQS1iGU(4pj93PRGt;9BnnNWXp9g@WTC+b
zb(V%e(1hp?n^=^c!5CMDm0{t+xX_J>af5NA(^I%K#KnC1a_0V-|J=;fqG4*$FqfrI
zTMFl#(zr744Et=5&2S69;U|2LQC!A(RPi3(!5{{(8(YzXC$Jo?n2$zGMjdRy5BLh3
z@Dbj@8mz!F%!3LKU=qgQI{2XryigC-PzFVit+puU$g~npnPiM97H^Wxz)Zft?a@%u
z5pIXMm2$IkE8%vCTQRpHZU?zpxS6?47IH1%md`DZTQ0X8ZrR+jxMgz7;AY}>fSWOH
zjoQZPe3-^<KetqF3OD2iJEnH$KQ{~sZdEP_*ComFclm?-LY|Rt$X?klqx4hSkX}lv
z6p}imqmoJdEpCc$#3$mo*elkE`63g(2yca_!n6<&+$-S`gFbgi-LU5At`V;i1H>!D
zLE>eipEyA5C-xD0i9N(_;w9om;ss(Cv6I+A^by;MZNye$3-LVh9MMZWOFTntCN>cp
zV~n^<)@0QFGCi*9@iVUCL!5~yj&am8ruu73QwsGW%d}Wd4u*m^U8>)ep6Z-ntWdW*
zb;hPTXXI~fR#{4AWp#z4%3kiObW~NU#lbekAxf6AOrx>>R7+F8uc2MNAM8&)=5SS1
z+qJ_^XXIB<QIrKHz`72*5MUjnFds=B7=}{pWVe{fYC}P=F<)RbR9-(e8VU|$4Qq(c
zS$tmcc-EwtwG$pgGTTY0e;(!9V#APm;&hLFVKw&LHIMj*1Lore+b__gPe@G7rmHZ!
z&zX>lYN_bnlv}5Tj0wfG?>8reUi~kmU2}%kjcND2-8#OFN7!vZTgJB8>9<q-_1+3g
Hb9Mg!JZ(S#

delta 1040
zcmaKqPiWIn9LIlc8e8mMf9clPcC3Ha*tsgqrFLy69=3H#CydG3?b5?mwdi15Mw=mH
zjt&J8gt3y-4nh?{L=YsPhn+l#S78hfJ9yKB2SE_==1ZDpG>Qo?d3-<L_x=6eOSYTL
zc9YrdwVym}^i9y`>&0hym0$_*7k<T0_yOPIb9{^n-p37;u!1G>n|vpq$su`9_Q^}~
z<gYtHA_NKB^|R}nvc~z8ZO-w(q2A*ZQfEMz-k2=cZeN$m)tjz31O8&=PEGclwh+N2
zF$?K8Nz_6jCJ9?e$RKsu)7OarY_moSy`97rG~)sm;y1}D3*k-TvydK*<n_IFTaedW
z#B~w?cw;o@X%nh(!n9I~ykPRK0mT_@s10t%X%FR<{&-luGPv(VJOUOU0e-=E_zIgU
zH+&cCEDJp#<i~THvDNZQC3Z0?Zgn{{k*DJ7`tq`uVIc&3u~L&odTCO?&O%V|j^B`_
zYBIN8lcg1XzPUyFa0i3lnp|B9*p5wNhlx;^4G#bhP<4-a&XZJnSWJsUNimyET~G$3
zS&ls+h(VsuO<bE=C|)iUm50)TdnA)hCx=Ed>Cue(L*h7Y4;(lH^e>fh29I!1^)4!&
zIh=!A;7^RAL!<M?lm~4Gsa7KeoQK>$fm~UmMVIu`plv>Ao0N|`p-J3>EX3nH1?NCZ
zqQV*A6PnP<H{y*H?X0vRFm9khfYe5VeDx_^wI8c`bH-5?jMch{CWkNCsFBw;)UI;2
erSP%VTMyPFI_tN}I4osSxo-WFb<}yfJN5^H=o1V8

diff --git a/docs/genindex.html b/docs/genindex.html
index 09b458c..7b80f50 100644
--- a/docs/genindex.html
+++ b/docs/genindex.html
@@ -230,7 +230,7 @@
 </li>
       <li><a href="step.html#core.controller.step_controller.StepController.handle_done">handle_done() (core.controller.step_controller.StepController method)</a>
 </li>
-      <li><a href="step.html#core.controller.step_controller.StepController.handle_next">handle_next() (core.controller.step_controller.StepController method)</a>
+      <li><a href="step.html#core.controller.step_controller.StepController.handle_next">next() (core.controller.step_controller.StepController method)</a>
 </li>
       <li><a href="step.html#core.controller.step_controller.StepController.handle_reset">handle_reset() (core.controller.step_controller.StepController method)</a>
 </li>
diff --git a/docs/step.html b/docs/step.html
index 5fdf47b..a5ee31f 100644
--- a/docs/step.html
+++ b/docs/step.html
@@ -220,7 +220,7 @@ Starts the next step</p>
 
 <dl class="method">
 <dt id="core.controller.step_controller.StepController.handle_next">
-<code class="descname">handle_next</code><span class="sig-paren">(</span><em>**kwargs</em><span class="sig-paren">)</span><a class="headerlink" href="#core.controller.step_controller.StepController.handle_next" title="Permalink to this definition">¶</a></dt>
+<code class="descname">next</code><span class="sig-paren">(</span><em>**kwargs</em><span class="sig-paren">)</span><a class="headerlink" href="#core.controller.step_controller.StepController.handle_next" title="Permalink to this definition">¶</a></dt>
 <dd><p>Event Handler for “step/next”.
 It start the next step</p>
 <table class="docutils field-list" frame="void" rules="none">
diff --git a/logs/sensors/sensor_1.log b/logs/sensors/sensor_1.log
index 98cf6d7..bb1888d 100644
--- a/logs/sensors/sensor_1.log
+++ b/logs/sensors/sensor_1.log
@@ -1,24 +1,34 @@
-2019-01-02 20:34:10,10
-2019-01-02 20:34:15,10
-2019-01-02 20:34:20,10
-2019-01-02 20:34:25,10
-2019-01-02 20:34:32,10
-2019-01-02 20:34:37,10
-2019-01-02 20:34:42,10
-2019-01-02 20:34:47,10
-2019-01-02 20:34:52,10
-2019-01-02 20:34:57,10
-2019-01-02 20:35:02,10
-2019-01-02 20:35:07,10
-2019-01-02 20:35:12,10
-2019-01-02 20:35:17,10
-2019-01-02 20:35:22,10
-2019-01-02 20:35:30,10
-2019-01-02 20:35:35,10
-2019-01-02 20:35:40,10
-2019-01-02 20:35:45,10
-2019-01-02 20:35:50,10
-2019-01-02 20:35:55,10
-2019-01-02 20:36:00,10
-2019-01-02 20:36:05,10
-2019-01-02 20:36:10,10
+2019-01-04 00:44:35,10
+2019-01-04 00:44:40,10
+2019-01-04 00:44:45,10
+2019-01-04 00:44:50,10
+2019-01-04 00:44:55,10
+2019-01-04 00:45:00,10
+2019-01-04 00:45:05,10
+2019-01-04 00:45:10,10
+2019-01-04 00:45:15,10
+2019-01-04 00:45:20,10
+2019-01-04 00:45:25,10
+2019-01-04 00:45:30,10
+2019-01-04 00:45:35,10
+2019-01-04 00:45:40,10
+2019-01-04 00:45:45,10
+2019-01-04 00:45:50,10
+2019-01-04 00:45:55,10
+2019-01-04 00:46:00,10
+2019-01-04 00:46:05,10
+2019-01-04 00:46:10,10
+2019-01-04 00:46:15,10
+2019-01-04 00:46:20,10
+2019-01-04 00:46:31,10
+2019-01-04 00:46:36,10
+2019-01-04 00:46:41,10
+2019-01-04 00:46:46,10
+2019-01-04 00:46:51,10
+2019-01-04 00:46:56,10
+2019-01-04 00:47:01,10
+2019-01-04 00:47:06,10
+2019-01-04 00:47:11,10
+2019-01-04 00:47:16,10
+2019-01-04 00:47:21,10
+2019-01-04 00:47:26,10
diff --git a/logs/sensors/sensor_1.log.1 b/logs/sensors/sensor_1.log.1
index a083ed7..9b83c3e 100644
--- a/logs/sensors/sensor_1.log.1
+++ b/logs/sensors/sensor_1.log.1
@@ -1,86 +1,86 @@
-2019-01-02 20:26:40,10
-2019-01-02 20:26:45,10
-2019-01-02 20:26:50,10
-2019-01-02 20:26:55,10
-2019-01-02 20:27:00,10
-2019-01-02 20:27:05,10
-2019-01-02 20:27:10,10
-2019-01-02 20:27:15,10
-2019-01-02 20:27:20,10
-2019-01-02 20:27:25,10
-2019-01-02 20:27:30,10
-2019-01-02 20:27:35,10
-2019-01-02 20:27:40,10
-2019-01-02 20:27:45,10
-2019-01-02 20:27:51,10
-2019-01-02 20:27:56,10
-2019-01-02 20:28:01,10
-2019-01-02 20:28:06,10
-2019-01-02 20:28:11,10
-2019-01-02 20:28:16,10
-2019-01-02 20:28:21,10
-2019-01-02 20:28:26,10
-2019-01-02 20:28:31,10
-2019-01-02 20:28:36,10
-2019-01-02 20:28:41,10
-2019-01-02 20:28:46,10
-2019-01-02 20:28:51,10
-2019-01-02 20:28:56,10
-2019-01-02 20:29:01,10
-2019-01-02 20:29:06,10
-2019-01-02 20:29:11,10
-2019-01-02 20:29:16,10
-2019-01-02 20:29:21,10
-2019-01-02 20:29:26,10
-2019-01-02 20:29:31,10
-2019-01-02 20:29:36,10
-2019-01-02 20:29:41,10
-2019-01-02 20:29:46,10
-2019-01-02 20:29:51,10
-2019-01-02 20:29:56,10
-2019-01-02 20:30:01,10
-2019-01-02 20:30:06,10
-2019-01-02 20:30:11,10
-2019-01-02 20:30:16,10
-2019-01-02 20:30:21,10
-2019-01-02 20:30:26,10
-2019-01-02 20:30:31,10
-2019-01-02 20:30:36,10
-2019-01-02 20:30:41,10
-2019-01-02 20:30:46,10
-2019-01-02 20:30:51,10
-2019-01-02 20:30:56,10
-2019-01-02 20:31:01,10
-2019-01-02 20:31:06,10
-2019-01-02 20:31:11,10
-2019-01-02 20:31:16,10
-2019-01-02 20:31:21,10
-2019-01-02 20:31:26,10
-2019-01-02 20:31:31,10
-2019-01-02 20:31:36,10
-2019-01-02 20:31:41,10
-2019-01-02 20:31:46,10
-2019-01-02 20:31:51,10
-2019-01-02 20:31:56,10
-2019-01-02 20:32:01,10
-2019-01-02 20:32:06,10
-2019-01-02 20:32:11,10
-2019-01-02 20:32:16,10
-2019-01-02 20:32:21,10
-2019-01-02 20:32:26,10
-2019-01-02 20:32:31,10
-2019-01-02 20:32:36,10
-2019-01-02 20:32:41,10
-2019-01-02 20:33:05,10
-2019-01-02 20:33:10,10
-2019-01-02 20:33:15,10
-2019-01-02 20:33:20,10
-2019-01-02 20:33:25,10
-2019-01-02 20:33:30,10
-2019-01-02 20:33:35,10
-2019-01-02 20:33:40,10
-2019-01-02 20:33:45,10
-2019-01-02 20:33:50,10
-2019-01-02 20:33:55,10
-2019-01-02 20:34:00,10
-2019-01-02 20:34:05,10
+2019-01-04 00:19:10,10
+2019-01-04 00:19:15,10
+2019-01-04 00:19:20,10
+2019-01-04 00:19:25,10
+2019-01-04 00:19:30,10
+2019-01-04 00:19:48,10
+2019-01-04 00:19:53,10
+2019-01-04 00:20:04,10
+2019-01-04 00:20:09,10
+2019-01-04 00:20:14,10
+2019-01-04 00:20:19,10
+2019-01-04 00:20:24,10
+2019-01-04 00:20:29,10
+2019-01-04 00:20:34,10
+2019-01-04 00:20:39,10
+2019-01-04 00:20:44,10
+2019-01-04 00:20:49,10
+2019-01-04 00:20:54,10
+2019-01-04 00:20:59,10
+2019-01-04 00:38:43,10
+2019-01-04 00:38:48,10
+2019-01-04 00:38:53,10
+2019-01-04 00:38:58,10
+2019-01-04 00:39:03,10
+2019-01-04 00:39:08,10
+2019-01-04 00:39:13,10
+2019-01-04 00:39:18,10
+2019-01-04 00:39:23,10
+2019-01-04 00:39:28,10
+2019-01-04 00:39:33,10
+2019-01-04 00:39:38,10
+2019-01-04 00:39:45,10
+2019-01-04 00:39:54,10
+2019-01-04 00:39:59,10
+2019-01-04 00:40:04,10
+2019-01-04 00:40:09,10
+2019-01-04 00:40:14,10
+2019-01-04 00:40:21,10
+2019-01-04 00:40:31,10
+2019-01-04 00:40:36,10
+2019-01-04 00:40:41,10
+2019-01-04 00:40:46,10
+2019-01-04 00:40:51,10
+2019-01-04 00:40:56,10
+2019-01-04 00:41:01,10
+2019-01-04 00:41:06,10
+2019-01-04 00:41:11,10
+2019-01-04 00:41:16,10
+2019-01-04 00:41:21,10
+2019-01-04 00:41:26,10
+2019-01-04 00:41:31,10
+2019-01-04 00:41:36,10
+2019-01-04 00:41:41,10
+2019-01-04 00:41:46,10
+2019-01-04 00:41:51,10
+2019-01-04 00:41:56,10
+2019-01-04 00:42:01,10
+2019-01-04 00:42:06,10
+2019-01-04 00:42:11,10
+2019-01-04 00:42:16,10
+2019-01-04 00:42:21,10
+2019-01-04 00:42:26,10
+2019-01-04 00:42:31,10
+2019-01-04 00:42:36,10
+2019-01-04 00:42:41,10
+2019-01-04 00:42:46,10
+2019-01-04 00:42:51,10
+2019-01-04 00:42:56,10
+2019-01-04 00:43:05,10
+2019-01-04 00:43:10,10
+2019-01-04 00:43:15,10
+2019-01-04 00:43:20,10
+2019-01-04 00:43:25,10
+2019-01-04 00:43:30,10
+2019-01-04 00:43:35,10
+2019-01-04 00:43:40,10
+2019-01-04 00:43:45,10
+2019-01-04 00:43:50,10
+2019-01-04 00:43:55,10
+2019-01-04 00:44:00,10
+2019-01-04 00:44:05,10
+2019-01-04 00:44:10,10
+2019-01-04 00:44:15,10
+2019-01-04 00:44:20,10
+2019-01-04 00:44:25,10
+2019-01-04 00:44:30,10
diff --git a/logs/sensors/sensor_1.log.10 b/logs/sensors/sensor_1.log.10
index 7a15b35..5dfb63a 100644
--- a/logs/sensors/sensor_1.log.10
+++ b/logs/sensors/sensor_1.log.10
@@ -1,86 +1,5 @@
-2019-01-02 18:48:13,10
-2019-01-02 18:48:18,10
-2019-01-02 18:48:23,10
-2019-01-02 18:48:28,10
-2019-01-02 18:48:33,10
-2019-01-02 18:48:38,10
-2019-01-02 18:48:43,10
-2019-01-02 18:48:48,10
-2019-01-02 18:48:53,10
-2019-01-02 18:48:58,10
-2019-01-02 18:49:03,10
-2019-01-02 18:49:07,10
-2019-01-02 18:49:07,10
-2019-01-02 18:49:07,10
-2019-01-02 18:49:07,10
-2019-01-02 18:49:07,10
-2019-01-02 18:49:07,10
-2019-01-02 18:49:07,10
-2019-01-02 18:49:07,10
-2019-01-02 18:49:07,10
-2019-01-02 18:49:07,10
-2019-01-02 18:49:07,10
-2019-01-02 18:49:08,10
-2019-01-02 18:49:13,10
-2019-01-02 18:49:18,10
-2019-01-02 18:49:23,10
-2019-01-02 18:49:28,10
-2019-01-02 18:49:33,10
-2019-01-02 18:49:38,10
-2019-01-02 18:49:43,10
-2019-01-02 18:49:48,10
-2019-01-02 18:49:53,10
-2019-01-02 18:49:58,10
-2019-01-02 18:49:58,10
-2019-01-02 18:49:58,10
-2019-01-02 18:49:58,10
-2019-01-02 18:49:58,10
-2019-01-02 18:49:58,10
-2019-01-02 18:49:58,10
-2019-01-02 18:49:58,10
-2019-01-02 18:49:58,10
-2019-01-02 18:49:58,10
-2019-01-02 18:49:58,10
-2019-01-02 18:49:58,10
-2019-01-02 18:50:03,10
-2019-01-02 18:50:08,10
-2019-01-02 18:50:13,10
-2019-01-02 18:50:18,10
-2019-01-02 18:50:23,10
-2019-01-02 18:50:28,10
-2019-01-02 18:50:33,10
-2019-01-02 18:50:38,10
-2019-01-02 18:50:43,10
-2019-01-02 18:50:48,10
-2019-01-02 18:50:53,10
-2019-01-02 18:50:58,10
-2019-01-02 18:51:03,10
-2019-01-02 18:51:08,10
-2019-01-02 18:51:13,10
-2019-01-02 18:51:18,10
-2019-01-02 18:51:23,10
-2019-01-02 18:51:28,10
-2019-01-02 18:51:29,10
-2019-01-02 18:51:29,10
-2019-01-02 18:51:29,10
-2019-01-02 18:51:29,10
-2019-01-02 18:51:29,10
-2019-01-02 18:51:29,10
-2019-01-02 18:51:29,10
-2019-01-02 18:51:29,10
-2019-01-02 18:51:29,10
-2019-01-02 18:51:29,10
-2019-01-02 18:51:29,10
-2019-01-02 18:51:33,10
-2019-01-02 18:51:38,10
-2019-01-02 18:51:43,10
-2019-01-02 18:51:43,10
-2019-01-02 18:51:43,10
-2019-01-02 18:51:43,10
-2019-01-02 18:51:43,10
-2019-01-02 18:51:43,10
-2019-01-02 18:51:43,10
-2019-01-02 18:51:43,10
-2019-01-02 18:51:43,10
-2019-01-02 18:51:43,10
-2019-01-02 18:51:43,10
+2019-01-04 00:19:10,10
+2019-01-04 00:19:15,10
+2019-01-04 00:19:20,10
+2019-01-04 00:19:25,10
+2019-01-04 00:19:30,10
diff --git a/logs/sensors/sensor_1.log.2 b/logs/sensors/sensor_1.log.2
index 6f15a0b..5dfb63a 100644
--- a/logs/sensors/sensor_1.log.2
+++ b/logs/sensors/sensor_1.log.2
@@ -1,86 +1,5 @@
-2019-01-02 19:43:47,10
-2019-01-02 19:43:52,10
-2019-01-02 19:43:57,10
-2019-01-02 19:44:02,10
-2019-01-02 19:44:07,10
-2019-01-02 19:44:12,10
-2019-01-02 19:44:17,10
-2019-01-02 19:44:22,10
-2019-01-02 19:44:27,10
-2019-01-02 19:44:32,10
-2019-01-02 19:44:37,10
-2019-01-02 19:44:42,10
-2019-01-02 19:44:47,10
-2019-01-02 19:44:52,10
-2019-01-02 19:44:57,10
-2019-01-02 19:45:02,10
-2019-01-02 19:45:07,10
-2019-01-02 19:45:12,10
-2019-01-02 19:45:17,10
-2019-01-02 19:45:22,10
-2019-01-02 19:45:27,10
-2019-01-02 20:21:15,10
-2019-01-02 20:21:20,10
-2019-01-02 20:21:25,10
-2019-01-02 20:21:30,10
-2019-01-02 20:21:35,10
-2019-01-02 20:21:40,10
-2019-01-02 20:21:45,10
-2019-01-02 20:21:50,10
-2019-01-02 20:21:55,10
-2019-01-02 20:22:00,10
-2019-01-02 20:22:05,10
-2019-01-02 20:22:10,10
-2019-01-02 20:22:15,10
-2019-01-02 20:22:20,10
-2019-01-02 20:22:25,10
-2019-01-02 20:22:30,10
-2019-01-02 20:22:35,10
-2019-01-02 20:22:40,10
-2019-01-02 20:22:45,10
-2019-01-02 20:22:50,10
-2019-01-02 20:22:55,10
-2019-01-02 20:23:00,10
-2019-01-02 20:23:05,10
-2019-01-02 20:23:10,10
-2019-01-02 20:23:15,10
-2019-01-02 20:23:20,10
-2019-01-02 20:23:25,10
-2019-01-02 20:23:30,10
-2019-01-02 20:23:35,10
-2019-01-02 20:23:40,10
-2019-01-02 20:23:45,10
-2019-01-02 20:23:50,10
-2019-01-02 20:23:55,10
-2019-01-02 20:24:00,10
-2019-01-02 20:24:05,10
-2019-01-02 20:24:10,10
-2019-01-02 20:24:15,10
-2019-01-02 20:24:20,10
-2019-01-02 20:24:25,10
-2019-01-02 20:24:30,10
-2019-01-02 20:24:35,10
-2019-01-02 20:24:40,10
-2019-01-02 20:24:45,10
-2019-01-02 20:24:50,10
-2019-01-02 20:24:55,10
-2019-01-02 20:25:00,10
-2019-01-02 20:25:05,10
-2019-01-02 20:25:10,10
-2019-01-02 20:25:15,10
-2019-01-02 20:25:20,10
-2019-01-02 20:25:25,10
-2019-01-02 20:25:30,10
-2019-01-02 20:25:35,10
-2019-01-02 20:25:40,10
-2019-01-02 20:25:45,10
-2019-01-02 20:25:50,10
-2019-01-02 20:25:55,10
-2019-01-02 20:26:00,10
-2019-01-02 20:26:05,10
-2019-01-02 20:26:10,10
-2019-01-02 20:26:15,10
-2019-01-02 20:26:20,10
-2019-01-02 20:26:25,10
-2019-01-02 20:26:30,10
-2019-01-02 20:26:35,10
+2019-01-04 00:19:10,10
+2019-01-04 00:19:15,10
+2019-01-04 00:19:20,10
+2019-01-04 00:19:25,10
+2019-01-04 00:19:30,10
diff --git a/logs/sensors/sensor_1.log.3 b/logs/sensors/sensor_1.log.3
index d4bf941..5dfb63a 100644
--- a/logs/sensors/sensor_1.log.3
+++ b/logs/sensors/sensor_1.log.3
@@ -1,86 +1,5 @@
-2019-01-02 19:36:04,10
-2019-01-02 19:36:09,10
-2019-01-02 19:36:14,10
-2019-01-02 19:36:19,10
-2019-01-02 19:36:24,10
-2019-01-02 19:36:29,10
-2019-01-02 19:36:34,10
-2019-01-02 19:36:39,10
-2019-01-02 19:36:44,10
-2019-01-02 19:36:49,10
-2019-01-02 19:36:54,10
-2019-01-02 19:36:59,10
-2019-01-02 19:37:04,10
-2019-01-02 19:37:09,10
-2019-01-02 19:37:14,10
-2019-01-02 19:37:19,10
-2019-01-02 19:37:24,10
-2019-01-02 19:37:30,10
-2019-01-02 19:37:35,10
-2019-01-02 19:37:40,10
-2019-01-02 19:37:45,10
-2019-01-02 19:37:50,10
-2019-01-02 19:37:55,10
-2019-01-02 19:38:00,10
-2019-01-02 19:38:05,10
-2019-01-02 19:38:10,10
-2019-01-02 19:38:15,10
-2019-01-02 19:38:20,10
-2019-01-02 19:38:25,10
-2019-01-02 19:38:30,10
-2019-01-02 19:38:35,10
-2019-01-02 19:38:44,10
-2019-01-02 19:38:49,10
-2019-01-02 19:38:54,10
-2019-01-02 19:38:59,10
-2019-01-02 19:39:04,10
-2019-01-02 19:39:09,10
-2019-01-02 19:39:14,10
-2019-01-02 19:39:22,10
-2019-01-02 19:39:27,10
-2019-01-02 19:39:32,10
-2019-01-02 19:39:37,10
-2019-01-02 19:39:42,10
-2019-01-02 19:39:47,10
-2019-01-02 19:39:52,10
-2019-01-02 19:39:58,10
-2019-01-02 19:40:03,10
-2019-01-02 19:40:08,10
-2019-01-02 19:40:13,10
-2019-01-02 19:40:18,10
-2019-01-02 19:40:23,10
-2019-01-02 19:40:28,10
-2019-01-02 19:40:33,10
-2019-01-02 19:40:43,10
-2019-01-02 19:40:48,10
-2019-01-02 19:40:53,10
-2019-01-02 19:40:58,10
-2019-01-02 19:41:03,10
-2019-01-02 19:41:08,10
-2019-01-02 19:41:20,10
-2019-01-02 19:41:25,10
-2019-01-02 19:41:36,10
-2019-01-02 19:41:41,10
-2019-01-02 19:41:46,10
-2019-01-02 19:41:51,10
-2019-01-02 19:41:56,10
-2019-01-02 19:42:01,10
-2019-01-02 19:42:06,10
-2019-01-02 19:42:11,10
-2019-01-02 19:42:16,10
-2019-01-02 19:42:21,10
-2019-01-02 19:42:26,10
-2019-01-02 19:42:31,10
-2019-01-02 19:42:36,10
-2019-01-02 19:42:41,10
-2019-01-02 19:42:46,10
-2019-01-02 19:42:51,10
-2019-01-02 19:42:56,10
-2019-01-02 19:43:01,10
-2019-01-02 19:43:06,10
-2019-01-02 19:43:11,10
-2019-01-02 19:43:22,10
-2019-01-02 19:43:27,10
-2019-01-02 19:43:32,10
-2019-01-02 19:43:37,10
-2019-01-02 19:43:42,10
+2019-01-04 00:19:10,10
+2019-01-04 00:19:15,10
+2019-01-04 00:19:20,10
+2019-01-04 00:19:25,10
+2019-01-04 00:19:30,10
diff --git a/logs/sensors/sensor_1.log.4 b/logs/sensors/sensor_1.log.4
index c29dff1..5dfb63a 100644
--- a/logs/sensors/sensor_1.log.4
+++ b/logs/sensors/sensor_1.log.4
@@ -1,86 +1,5 @@
-2019-01-02 19:28:35,10
-2019-01-02 19:28:40,10
-2019-01-02 19:28:47,10
-2019-01-02 19:28:52,10
-2019-01-02 19:28:57,10
-2019-01-02 19:29:02,10
-2019-01-02 19:29:07,10
-2019-01-02 19:29:12,10
-2019-01-02 19:29:17,10
-2019-01-02 19:29:22,10
-2019-01-02 19:29:27,10
-2019-01-02 19:29:32,10
-2019-01-02 19:29:44,10
-2019-01-02 19:29:49,10
-2019-01-02 19:29:54,10
-2019-01-02 19:29:59,10
-2019-01-02 19:30:04,10
-2019-01-02 19:30:09,10
-2019-01-02 19:30:14,10
-2019-01-02 19:30:19,10
-2019-01-02 19:30:24,10
-2019-01-02 19:30:29,10
-2019-01-02 19:30:34,10
-2019-01-02 19:30:39,10
-2019-01-02 19:30:46,10
-2019-01-02 19:30:51,10
-2019-01-02 19:30:56,10
-2019-01-02 19:31:01,10
-2019-01-02 19:31:09,10
-2019-01-02 19:31:14,10
-2019-01-02 19:31:19,10
-2019-01-02 19:31:24,10
-2019-01-02 19:31:29,10
-2019-01-02 19:31:34,10
-2019-01-02 19:31:39,10
-2019-01-02 19:31:44,10
-2019-01-02 19:31:49,10
-2019-01-02 19:31:54,10
-2019-01-02 19:31:59,10
-2019-01-02 19:32:04,10
-2019-01-02 19:32:13,10
-2019-01-02 19:32:18,10
-2019-01-02 19:32:23,10
-2019-01-02 19:32:28,10
-2019-01-02 19:32:33,10
-2019-01-02 19:32:38,10
-2019-01-02 19:32:43,10
-2019-01-02 19:32:48,10
-2019-01-02 19:32:53,10
-2019-01-02 19:32:58,10
-2019-01-02 19:33:03,10
-2019-01-02 19:33:08,10
-2019-01-02 19:33:13,10
-2019-01-02 19:33:18,10
-2019-01-02 19:33:23,10
-2019-01-02 19:33:28,10
-2019-01-02 19:33:33,10
-2019-01-02 19:33:38,10
-2019-01-02 19:33:43,10
-2019-01-02 19:33:48,10
-2019-01-02 19:33:53,10
-2019-01-02 19:33:58,10
-2019-01-02 19:34:03,10
-2019-01-02 19:34:08,10
-2019-01-02 19:34:13,10
-2019-01-02 19:34:18,10
-2019-01-02 19:34:23,10
-2019-01-02 19:34:28,10
-2019-01-02 19:34:33,10
-2019-01-02 19:34:38,10
-2019-01-02 19:34:44,10
-2019-01-02 19:34:49,10
-2019-01-02 19:34:54,10
-2019-01-02 19:34:59,10
-2019-01-02 19:35:04,10
-2019-01-02 19:35:09,10
-2019-01-02 19:35:14,10
-2019-01-02 19:35:19,10
-2019-01-02 19:35:24,10
-2019-01-02 19:35:29,10
-2019-01-02 19:35:34,10
-2019-01-02 19:35:39,10
-2019-01-02 19:35:44,10
-2019-01-02 19:35:49,10
-2019-01-02 19:35:54,10
-2019-01-02 19:35:59,10
+2019-01-04 00:19:10,10
+2019-01-04 00:19:15,10
+2019-01-04 00:19:20,10
+2019-01-04 00:19:25,10
+2019-01-04 00:19:30,10
diff --git a/logs/sensors/sensor_1.log.5 b/logs/sensors/sensor_1.log.5
index 739a868..5dfb63a 100644
--- a/logs/sensors/sensor_1.log.5
+++ b/logs/sensors/sensor_1.log.5
@@ -1,86 +1,5 @@
-2019-01-02 19:21:17,10
-2019-01-02 19:21:22,10
-2019-01-02 19:21:27,10
-2019-01-02 19:21:32,10
-2019-01-02 19:21:37,10
-2019-01-02 19:21:42,10
-2019-01-02 19:21:47,10
-2019-01-02 19:21:52,10
-2019-01-02 19:21:57,10
-2019-01-02 19:22:02,10
-2019-01-02 19:22:07,10
-2019-01-02 19:22:12,10
-2019-01-02 19:22:19,10
-2019-01-02 19:22:24,10
-2019-01-02 19:22:29,10
-2019-01-02 19:22:34,10
-2019-01-02 19:22:39,10
-2019-01-02 19:22:44,10
-2019-01-02 19:22:49,10
-2019-01-02 19:22:54,10
-2019-01-02 19:22:59,10
-2019-01-02 19:23:04,10
-2019-01-02 19:23:09,10
-2019-01-02 19:23:14,10
-2019-01-02 19:23:19,10
-2019-01-02 19:23:24,10
-2019-01-02 19:23:29,10
-2019-01-02 19:23:34,10
-2019-01-02 19:23:39,10
-2019-01-02 19:23:44,10
-2019-01-02 19:23:49,10
-2019-01-02 19:23:54,10
-2019-01-02 19:24:05,10
-2019-01-02 19:24:10,10
-2019-01-02 19:24:15,10
-2019-01-02 19:24:20,10
-2019-01-02 19:24:25,10
-2019-01-02 19:24:30,10
-2019-01-02 19:24:35,10
-2019-01-02 19:24:40,10
-2019-01-02 19:24:45,10
-2019-01-02 19:24:50,10
-2019-01-02 19:24:55,10
-2019-01-02 19:25:00,10
-2019-01-02 19:25:05,10
-2019-01-02 19:25:10,10
-2019-01-02 19:25:15,10
-2019-01-02 19:25:20,10
-2019-01-02 19:25:25,10
-2019-01-02 19:25:30,10
-2019-01-02 19:25:35,10
-2019-01-02 19:25:40,10
-2019-01-02 19:25:45,10
-2019-01-02 19:25:50,10
-2019-01-02 19:25:55,10
-2019-01-02 19:26:00,10
-2019-01-02 19:26:05,10
-2019-01-02 19:26:10,10
-2019-01-02 19:26:15,10
-2019-01-02 19:26:20,10
-2019-01-02 19:26:25,10
-2019-01-02 19:26:30,10
-2019-01-02 19:26:35,10
-2019-01-02 19:26:40,10
-2019-01-02 19:26:45,10
-2019-01-02 19:26:50,10
-2019-01-02 19:26:55,10
-2019-01-02 19:27:00,10
-2019-01-02 19:27:05,10
-2019-01-02 19:27:10,10
-2019-01-02 19:27:15,10
-2019-01-02 19:27:20,10
-2019-01-02 19:27:25,10
-2019-01-02 19:27:30,10
-2019-01-02 19:27:35,10
-2019-01-02 19:27:40,10
-2019-01-02 19:27:45,10
-2019-01-02 19:27:50,10
-2019-01-02 19:27:55,10
-2019-01-02 19:28:00,10
-2019-01-02 19:28:05,10
-2019-01-02 19:28:10,10
-2019-01-02 19:28:15,10
-2019-01-02 19:28:20,10
-2019-01-02 19:28:25,10
-2019-01-02 19:28:30,10
+2019-01-04 00:19:10,10
+2019-01-04 00:19:15,10
+2019-01-04 00:19:20,10
+2019-01-04 00:19:25,10
+2019-01-04 00:19:30,10
diff --git a/logs/sensors/sensor_1.log.6 b/logs/sensors/sensor_1.log.6
index 3f8a881..5dfb63a 100644
--- a/logs/sensors/sensor_1.log.6
+++ b/logs/sensors/sensor_1.log.6
@@ -1,86 +1,5 @@
-2019-01-02 19:14:06,10
-2019-01-02 19:14:11,10
-2019-01-02 19:14:16,10
-2019-01-02 19:14:21,10
-2019-01-02 19:14:26,10
-2019-01-02 19:14:32,10
-2019-01-02 19:14:37,10
-2019-01-02 19:14:42,10
-2019-01-02 19:14:47,10
-2019-01-02 19:14:52,10
-2019-01-02 19:14:57,10
-2019-01-02 19:15:02,10
-2019-01-02 19:15:07,10
-2019-01-02 19:15:12,10
-2019-01-02 19:15:17,10
-2019-01-02 19:15:22,10
-2019-01-02 19:15:27,10
-2019-01-02 19:15:32,10
-2019-01-02 19:15:37,10
-2019-01-02 19:15:42,10
-2019-01-02 19:15:47,10
-2019-01-02 19:15:52,10
-2019-01-02 19:15:57,10
-2019-01-02 19:16:02,10
-2019-01-02 19:16:07,10
-2019-01-02 19:16:12,10
-2019-01-02 19:16:17,10
-2019-01-02 19:16:22,10
-2019-01-02 19:16:27,10
-2019-01-02 19:16:32,10
-2019-01-02 19:16:37,10
-2019-01-02 19:16:42,10
-2019-01-02 19:16:47,10
-2019-01-02 19:16:52,10
-2019-01-02 19:16:57,10
-2019-01-02 19:17:02,10
-2019-01-02 19:17:07,10
-2019-01-02 19:17:12,10
-2019-01-02 19:17:17,10
-2019-01-02 19:17:22,10
-2019-01-02 19:17:27,10
-2019-01-02 19:17:32,10
-2019-01-02 19:17:37,10
-2019-01-02 19:17:42,10
-2019-01-02 19:17:47,10
-2019-01-02 19:17:52,10
-2019-01-02 19:17:57,10
-2019-01-02 19:18:02,10
-2019-01-02 19:18:07,10
-2019-01-02 19:18:12,10
-2019-01-02 19:18:17,10
-2019-01-02 19:18:22,10
-2019-01-02 19:18:27,10
-2019-01-02 19:18:32,10
-2019-01-02 19:18:37,10
-2019-01-02 19:18:42,10
-2019-01-02 19:18:47,10
-2019-01-02 19:18:52,10
-2019-01-02 19:18:57,10
-2019-01-02 19:19:02,10
-2019-01-02 19:19:07,10
-2019-01-02 19:19:12,10
-2019-01-02 19:19:17,10
-2019-01-02 19:19:22,10
-2019-01-02 19:19:27,10
-2019-01-02 19:19:32,10
-2019-01-02 19:19:37,10
-2019-01-02 19:19:42,10
-2019-01-02 19:19:47,10
-2019-01-02 19:19:52,10
-2019-01-02 19:19:57,10
-2019-01-02 19:20:02,10
-2019-01-02 19:20:07,10
-2019-01-02 19:20:12,10
-2019-01-02 19:20:17,10
-2019-01-02 19:20:22,10
-2019-01-02 19:20:27,10
-2019-01-02 19:20:32,10
-2019-01-02 19:20:37,10
-2019-01-02 19:20:42,10
-2019-01-02 19:20:47,10
-2019-01-02 19:20:52,10
-2019-01-02 19:20:57,10
-2019-01-02 19:21:02,10
-2019-01-02 19:21:07,10
-2019-01-02 19:21:12,10
+2019-01-04 00:19:10,10
+2019-01-04 00:19:15,10
+2019-01-04 00:19:20,10
+2019-01-04 00:19:25,10
+2019-01-04 00:19:30,10
diff --git a/logs/sensors/sensor_1.log.7 b/logs/sensors/sensor_1.log.7
index f5772ca..5dfb63a 100644
--- a/logs/sensors/sensor_1.log.7
+++ b/logs/sensors/sensor_1.log.7
@@ -1,86 +1,5 @@
-2019-01-02 19:02:41,10
-2019-01-02 19:02:46,10
-2019-01-02 19:02:51,10
-2019-01-02 19:02:56,10
-2019-01-02 19:03:01,10
-2019-01-02 19:03:06,10
-2019-01-02 19:03:11,10
-2019-01-02 19:03:16,10
-2019-01-02 19:03:21,10
-2019-01-02 19:03:33,10
-2019-01-02 19:03:33,10
-2019-01-02 19:03:33,10
-2019-01-02 19:03:33,10
-2019-01-02 19:03:33,10
-2019-01-02 19:03:33,10
-2019-01-02 19:03:33,10
-2019-01-02 19:03:33,10
-2019-01-02 19:03:33,10
-2019-01-02 19:03:33,10
-2019-01-02 19:03:33,10
-2019-01-02 19:08:33,10
-2019-01-02 19:08:38,10
-2019-01-02 19:08:43,10
-2019-01-02 19:08:48,10
-2019-01-02 19:08:53,10
-2019-01-02 19:08:58,10
-2019-01-02 19:09:03,10
-2019-01-02 19:09:08,10
-2019-01-02 19:09:16,10
-2019-01-02 19:09:21,10
-2019-01-02 19:09:26,10
-2019-01-02 19:09:31,10
-2019-01-02 19:09:36,10
-2019-01-02 19:09:41,10
-2019-01-02 19:09:46,10
-2019-01-02 19:09:51,10
-2019-01-02 19:09:56,10
-2019-01-02 19:10:01,10
-2019-01-02 19:10:06,10
-2019-01-02 19:10:11,10
-2019-01-02 19:10:16,10
-2019-01-02 19:10:21,10
-2019-01-02 19:10:26,10
-2019-01-02 19:10:31,10
-2019-01-02 19:10:36,10
-2019-01-02 19:10:41,10
-2019-01-02 19:10:46,10
-2019-01-02 19:10:51,10
-2019-01-02 19:10:56,10
-2019-01-02 19:11:01,10
-2019-01-02 19:11:06,10
-2019-01-02 19:11:11,10
-2019-01-02 19:11:16,10
-2019-01-02 19:11:21,10
-2019-01-02 19:11:26,10
-2019-01-02 19:11:31,10
-2019-01-02 19:11:36,10
-2019-01-02 19:11:41,10
-2019-01-02 19:11:46,10
-2019-01-02 19:11:51,10
-2019-01-02 19:11:56,10
-2019-01-02 19:12:01,10
-2019-01-02 19:12:06,10
-2019-01-02 19:12:11,10
-2019-01-02 19:12:16,10
-2019-01-02 19:12:21,10
-2019-01-02 19:12:26,10
-2019-01-02 19:12:31,10
-2019-01-02 19:12:36,10
-2019-01-02 19:12:41,10
-2019-01-02 19:12:46,10
-2019-01-02 19:12:51,10
-2019-01-02 19:12:56,10
-2019-01-02 19:13:01,10
-2019-01-02 19:13:06,10
-2019-01-02 19:13:11,10
-2019-01-02 19:13:16,10
-2019-01-02 19:13:21,10
-2019-01-02 19:13:26,10
-2019-01-02 19:13:31,10
-2019-01-02 19:13:36,10
-2019-01-02 19:13:41,10
-2019-01-02 19:13:46,10
-2019-01-02 19:13:51,10
-2019-01-02 19:13:56,10
-2019-01-02 19:14:01,10
+2019-01-04 00:19:10,10
+2019-01-04 00:19:15,10
+2019-01-04 00:19:20,10
+2019-01-04 00:19:25,10
+2019-01-04 00:19:30,10
diff --git a/logs/sensors/sensor_1.log.8 b/logs/sensors/sensor_1.log.8
index 0b9f8e1..5dfb63a 100644
--- a/logs/sensors/sensor_1.log.8
+++ b/logs/sensors/sensor_1.log.8
@@ -1,86 +1,5 @@
-2019-01-02 18:51:48,10
-2019-01-02 18:51:53,10
-2019-01-02 18:51:53,10
-2019-01-02 18:51:53,10
-2019-01-02 18:51:53,10
-2019-01-02 18:51:58,10
-2019-01-02 18:52:03,10
-2019-01-02 18:52:08,10
-2019-01-02 18:52:13,10
-2019-01-02 18:52:18,10
-2019-01-02 18:52:23,10
-2019-01-02 18:52:28,10
-2019-01-02 18:52:33,10
-2019-01-02 18:52:38,10
-2019-01-02 18:52:43,10
-2019-01-02 18:52:48,10
-2019-01-02 18:52:53,10
-2019-01-02 18:52:58,10
-2019-01-02 18:53:03,10
-2019-01-02 18:53:08,10
-2019-01-02 18:53:13,10
-2019-01-02 18:53:13,10
-2019-01-02 18:53:13,10
-2019-01-02 18:53:13,10
-2019-01-02 18:53:13,10
-2019-01-02 18:53:13,10
-2019-01-02 18:53:13,10
-2019-01-02 18:53:13,10
-2019-01-02 18:53:13,10
-2019-01-02 18:53:13,10
-2019-01-02 18:53:13,10
-2019-01-02 18:53:13,10
-2019-01-02 18:53:22,10
-2019-01-02 18:53:27,10
-2019-01-02 18:53:32,10
-2019-01-02 18:53:37,10
-2019-01-02 18:53:42,10
-2019-01-02 18:53:47,10
-2019-01-02 18:53:52,10
-2019-01-02 18:53:57,10
-2019-01-02 18:54:02,10
-2019-01-02 18:54:07,10
-2019-01-02 18:54:12,10
-2019-01-02 18:54:17,10
-2019-01-02 18:54:22,10
-2019-01-02 18:54:27,10
-2019-01-02 18:54:32,10
-2019-01-02 18:54:37,10
-2019-01-02 18:54:42,10
-2019-01-02 18:54:47,10
-2019-01-02 18:54:52,10
-2019-01-02 18:54:57,10
-2019-01-02 18:55:02,10
-2019-01-02 18:55:07,10
-2019-01-02 18:55:12,10
-2019-01-02 18:55:17,10
-2019-01-02 18:55:22,10
-2019-01-02 18:55:27,10
-2019-01-02 18:55:32,10
-2019-01-02 18:55:37,10
-2019-01-02 18:55:42,10
-2019-01-02 18:55:47,10
-2019-01-02 18:55:52,10
-2019-01-02 18:55:57,10
-2019-01-02 18:56:02,10
-2019-01-02 18:56:07,10
-2019-01-02 18:56:12,10
-2019-01-02 18:56:17,10
-2019-01-02 18:56:22,10
-2019-01-02 18:56:27,10
-2019-01-02 18:56:32,10
-2019-01-02 18:56:37,10
-2019-01-02 18:56:42,10
-2019-01-02 18:56:47,10
-2019-01-02 18:56:52,10
-2019-01-02 18:56:57,10
-2019-01-02 18:57:02,10
-2019-01-02 18:57:07,10
-2019-01-02 18:57:12,10
-2019-01-02 18:57:17,10
-2019-01-02 18:57:22,10
-2019-01-02 18:57:27,10
-2019-01-02 18:57:32,10
-2019-01-02 18:57:37,10
-2019-01-02 19:02:31,10
-2019-01-02 19:02:36,10
+2019-01-04 00:19:10,10
+2019-01-04 00:19:15,10
+2019-01-04 00:19:20,10
+2019-01-04 00:19:25,10
+2019-01-04 00:19:30,10
diff --git a/logs/sensors/sensor_1.log.9 b/logs/sensors/sensor_1.log.9
index b283bd7..5dfb63a 100644
--- a/logs/sensors/sensor_1.log.9
+++ b/logs/sensors/sensor_1.log.9
@@ -1,9 +1,5 @@
-2019-01-02 18:51:43,10
-2019-01-02 18:51:53,10
-2019-01-02 18:51:53,10
-2019-01-02 18:51:53,10
-2019-01-02 18:51:53,10
-2019-01-02 18:51:53,10
-2019-01-02 18:51:53,10
-2019-01-02 18:51:53,10
-2019-01-02 18:51:53,10
+2019-01-04 00:19:10,10
+2019-01-04 00:19:15,10
+2019-01-04 00:19:20,10
+2019-01-04 00:19:25,10
+2019-01-04 00:19:30,10
diff --git a/tests/craftbeerpi.db b/tests/craftbeerpi.db
new file mode 100644
index 0000000000000000000000000000000000000000..eec4e68d6580bc6fefb8525f873eed308e20f44e
GIT binary patch
literal 53248
zcmeI*O>g5w7{GCRx7%dhge`~4TOqX8_L7JdZMLf5#%7lYDoTM+Koy6`jc1dniCvs2
z+a4Qw;>5>6;-m06xHI-Neo0fJXeFez{*j!QXA;jmzj<*+QPuCiI~Yjeybi*VE1g|q
z-7rn#h2t28VX334j_ECWy)u2F9?i`2yPjIc$F<XHrEFA6hsLAd-}|HbPxYtD`r6~Q
zzb&KuSLx64wJP9-00IagfWSK~(65wi+cvMZrF$|I-uY;B8Q)c3wOh@jmUGm6dC+p=
zkX5rBbsKoj{^3#Ui&oqDw!Qy#vwiG*)jD<#zd3Rae>gaJ7Qe}NN5c8B*?#q9vt9di
zr*2vGt9`3vZ*7^A<G3mry8d|R%0b{~p04Gp%@o{JK6L%wx!V(+Zs4UA?AB+hKNXkR
z+Gk3oxR6P4V`pdf)7i9Yxf-82>dbYkzPGk&?{AsL!1u((_?MyjLeg>1We~saWSZS+
zWL{JzFCUidjScg<rwLsDRI0<uCmluJf?9XLNhsdTc7iS$3x6DhN&c#HvhnA473|(F
z=nGeh^h}NEnTA1c&`sXHHw||K|Mj4k#1(v65)9{^NV;K9$c_}Fv+0<#>XVJKMy$q&
zV=2y}<6#aliY$ZpGzdKrKAqMwe-P`aygW-sUNm}c_~LdbkR-w9dwWS)Hr`01q0HAP
z{A6<Jv(A{Mr#ux>4n;Z_)%<#~TCz7c&B@QPi~gj(FXe1>>_#UyMpRe*$DIDv9iGq2
zE(enIwkO8jaBvpQ?>QntTrkd+SoM!etM+G`cTFqZ?oLBLmesNw9meGI2XWrl-8gRz
zqwiO9dF$9RqauehGf|SJC-J+cL$olctx9G}q}{mmRB?L)>B`LfO=jJk$)d+lUkrNv
znStgF)B+t%-kYUd4WAEI^zeCKPpf#9&}+qm9HWlCJ!5XzB#63m6WrZsk%%rHkMGCV
zsmY_bb#7M?#CI#Xw#A|UyJ>IkmF(?p^S2M<rg`qTe-gN%r!G;x6u!I_xSwnCt>R^x
z@13M8Ky;ba9WI7qq$=*DWja1z{9-x=YSZQF@>XPSuhgYkvY$LLuRh5qo@8`yexl1H
zI6DK?P>479>+kfJE*g&j0tg_000IagfB*srAb<b@3k2BzF94z#0R#|0009ILKmY**
z5I_Kd0tm4GFF+@f0s;sifB*srAb<b@2q1s}0t*D#|1SWd7y$$jKmY**5I_I{1Q0*~
zfdUAy|1Ur%k^%w<Ab<b@2q1s}0tg_000IjH*#9p8q8I@L5I_I{1Q0*~0R#|00D%Gs
zME}%J{nI~g2q1s}0tg_000IagfB*srAW&cde*Z6U=aL!%2q1s}0tg_000IagfB*tF
z0_^`83J4&800IagfB*srAb<b@2ozs{{eSWMm<$m>009ILKmY**5I_I{1Q6iw{}}@a
tAb<b@2q1s}0tg_000IaUUx45Li{Hm&hyVfzAb<b@2q1s}0tg_0z`s_`YW4sC

literal 0
HcmV?d00001

diff --git a/tests/test_actor.py b/tests/test_actor.py
index 8df3a38..4114c32 100644
--- a/tests/test_actor.py
+++ b/tests/test_actor.py
@@ -1,4 +1,5 @@
-import aiohttp
+from unittest import mock
+
 from aiohttp.test_utils import AioHTTPTestCase, unittest_run_loop
 
 from core.craftbeerpi import CraftBeerPi
@@ -6,14 +7,21 @@ from core.craftbeerpi import CraftBeerPi
 
 class ActorTestCase(AioHTTPTestCase):
 
-
-
-
     async def get_application(self):
         self.cbpi = CraftBeerPi()
         await self.cbpi.init_serivces()
         return self.cbpi.app
 
+    @unittest_run_loop
+    async def test_actor_mock(self):
+        with mock.patch.object(self.cbpi.bus, 'fire', wraps=self.cbpi.bus.fire) as mock_obj:
+            # Send HTTP POST
+            resp = await self.client.request("POST", "/actor/1/on")
+            # Check Result
+            assert resp.status == 204
+            # Check if Event are fired
+            assert mock_obj.call_count == 2
+
 
     @unittest_run_loop
     async def test_actor_switch(self):
@@ -92,3 +100,8 @@ class ActorTestCase(AioHTTPTestCase):
         # Update not existing actor
         resp = await self.client.put(path="/actor/%s" % 9999, json=data)
         assert resp.status == 500
+
+    @unittest_run_loop
+    async def test_actor_action(self):
+        resp = await self.client.post(path="/actor/1/action", json=dict(name="myAction", parameter=dict(name="Manuel")))
+        assert resp.status == 204
diff --git a/tests/test_gpio.py b/tests/test_gpio.py
new file mode 100644
index 0000000..d5279c0
--- /dev/null
+++ b/tests/test_gpio.py
@@ -0,0 +1,49 @@
+import unittest
+from unittest import mock
+from unittest.mock import MagicMock, patch
+
+try:
+    import RPi.GPIO as GPIO
+except Exception:
+    print("Error importing RPi.GPIO!")
+    MockRPi = MagicMock()
+    modules = {
+        "RPi": MockRPi,
+        "RPi.GPIO": MockRPi.GPIO
+    }
+    patcher = patch.dict("sys.modules", modules)
+    patcher.start()
+    import RPi.GPIO as GPIO
+
+
+class HelloWorld(object):
+
+    def test(self, a):
+        return a
+
+
+class TestSwitch(unittest.TestCase):
+
+    GPIO_NUM = 22
+
+    @patch("RPi.GPIO.setup")
+    def test_switch_inits_gpio(self, patched_setup):
+        GPIO.setmode(GPIO.BCM)
+        GPIO.setup(self.GPIO_NUM, GPIO.OUT)
+        patched_setup.assert_called_once_with(self.GPIO_NUM, GPIO.OUT)
+
+    @patch("RPi.GPIO.output")
+    def test_switch_without_scheduler_starts_disabled(self, patched_output):
+        GPIO.output(self.GPIO_NUM, GPIO.LOW)
+        patched_output.assert_called_once_with(self.GPIO_NUM, GPIO.LOW)
+
+
+    def test_hello_world(self):
+        h = HelloWorld()
+        with mock.patch.object(HelloWorld, 'test', wraps=h.test) as fake_increment:
+            #print(h.test("HALLO"))
+            print(h.test("ABC"))
+            print(fake_increment.call_args)
+            print(h.test("HALLO"))
+            print(fake_increment.call_args_list)
+
diff --git a/tests/test_index.py b/tests/test_index.py
index 3a17b36..5768081 100644
--- a/tests/test_index.py
+++ b/tests/test_index.py
@@ -18,6 +18,12 @@ class IndexTestCase(AioHTTPTestCase):
         resp = await self.client.get(path="/")
         assert resp.status == 200
 
+    @unittest_run_loop
+    async def test_404(self):
+        # Test Index Page
+        resp = await self.client.get(path="/abc")
+        assert resp.status == 200
+
     @unittest_run_loop
     async def test_wrong_login(self):
         resp = await self.client.post(path="/login", data={"username": "beer", "password": "123"})
diff --git a/tests/test_step.py b/tests/test_step.py
index 4c508e6..a7da19e 100644
--- a/tests/test_step.py
+++ b/tests/test_step.py
@@ -1,4 +1,6 @@
 import asyncio
+from unittest import mock
+
 from aiohttp.test_utils import AioHTTPTestCase, unittest_run_loop
 from core.craftbeerpi import CraftBeerPi
 
@@ -51,20 +53,46 @@ class StepTestCase(AioHTTPTestCase):
         resp = await self.client.delete(path="/step/%s" % sensor_id)
         assert resp.status == 204
 
+    def create_wait_callback(self, topic):
+        future = self.cbpi.app.loop.create_future()
+
+        async def test(**kwargs):
+            print("GOON")
+            future.set_result("OK")
+        self.cbpi.bus.register(topic, test, once=True)
+        return future
+
+    async def wait(self, future):
+        done, pending = await asyncio.wait({future})
+
+        if future in done:
+            pass
+
     @unittest_run_loop
     async def test_process(self):
-        resp = await self.client.request("GET", "/step/stop")
-        assert resp.status == 204
+        await self.cbpi.step.stop()
 
-        resp = await self.client.request("GET", "/step/start")
-        assert resp.status == 204
+        with mock.patch.object(self.cbpi.step, 'start', wraps=self.cbpi.step.start) as mock_obj:
 
-        resp = await self.client.request("GET", "/step/next")
-        assert resp.status == 204
+            future = self.create_wait_callback("step/+/started")
+            await self.cbpi.step.start()
+            await self.wait(future)
 
-        resp = await self.client.request("GET", "/step/stop")
-        assert resp.status == 204
+            future = self.create_wait_callback("step/+/started")
+            await self.cbpi.step.next()
+            await self.wait(future)
 
+            future = self.create_wait_callback("step/+/started")
+            await self.cbpi.step.next()
+            await self.wait(future)
 
+            future = self.create_wait_callback("step/+/started")
+            await self.cbpi.step.next()
+            await self.wait(future)
 
+            future = self.create_wait_callback("job/step/done")
+            await self.cbpi.step.stop()
+            await self.wait(future)
+            print("COUNT", mock_obj.call_count)
+            print("ARGS", mock_obj.call_args_list)
 
diff --git a/tests/test_ws.py b/tests/test_ws.py
new file mode 100644
index 0000000..14bd154
--- /dev/null
+++ b/tests/test_ws.py
@@ -0,0 +1,56 @@
+import asyncio
+
+import aiohttp
+from aiohttp.test_utils import AioHTTPTestCase, unittest_run_loop
+
+from core.craftbeerpi import CraftBeerPi
+
+
+class WebSocketTestCase(AioHTTPTestCase):
+
+    async def get_application(self):
+        self.cbpi = CraftBeerPi()
+        await self.cbpi.init_serivces()
+        return self.cbpi.app
+
+
+    @unittest_run_loop
+    async def test_brewing_process(self):
+
+        count_step_done = 0
+        async with self.client.ws_connect('/ws') as ws:
+            await ws.send_json(data=dict(topic="step/stop"))
+            await ws.send_json(data=dict(topic="step/start"))
+            async for msg in ws:
+                if msg.type == aiohttp.WSMsgType.TEXT:
+                    try:
+                        msg_obj = msg.json()
+                        topic = msg_obj.get("topic")
+                        if topic == "job/step/done":
+                            count_step_done = count_step_done + 1
+                        if topic == "step/brewing/finished":
+                            await ws.send_json(data=dict(topic="close"))
+                    except Exception as e:
+                        print(e)
+                        break
+                elif msg.type == aiohttp.WSMsgType.ERROR:
+                    break
+
+        assert count_step_done == 4
+
+    @unittest_run_loop
+    async def test_wrong_format(self):
+
+        async with self.client.ws_connect('/ws') as ws:
+            await ws.send_json(data=dict(a="close"))
+            async for msg in ws:
+                print("MSG TYP", msg.type, msg.data)
+                if msg.type == aiohttp.WSMsgType.TEXT:
+                    msg_obj = msg.json()
+                    if msg_obj["topic"] != "connection/success":
+                        print(msg.data)
+                        raise Exception()
+
+                else:
+                    raise Exception()
+