Merge pull request #1 from atennert/devel

Devel
atennert · Dec 30, 2016 · 689f52d · 689f52d
2 parents 144827e + af3272e
commit 689f52d
Show file tree

Hide file tree

Showing 70 changed files with 680 additions and 290 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ version = 3.1
 
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
         classpath("org.springframework.boot:spring-boot-gradle-plugin:1.1.6.RELEASE")
@@ -21,7 +21,8 @@ subprojects {
     targetCompatibility = 1.8
 
     repositories {
-        mavenCentral()
+        jcenter()
+        maven { url "http://dl.bintray.com/atennert/com" }
         flatDir {
             dirs 'libs'
         }

diff --git a/...homectrl/controls/AbstractController.java → ...homectrl/controls/AbstractController.java b/...homectrl/controls/AbstractController.java → ...homectrl/controls/AbstractController.java
@@ -14,9 +14,9 @@
  * the License.
  *******************************************************************************/
 
-package org.atennert.homectrl.controls;
+package de.atennert.homectrl.controls;
 
-import org.atennert.homectrl.event.EventBus;
+import de.atennert.homectrl.event.EventBus;
 
 public abstract class AbstractController<T>
 {

diff --git a/...ontrols/ActivatableHeatingController.java → ...ontrols/ActivatableHeatingController.java b/...ontrols/ActivatableHeatingController.java → ...ontrols/ActivatableHeatingController.java
@@ -14,14 +14,14 @@
  * the License.
  *******************************************************************************/
 
-package org.atennert.homectrl.controls;
-
-import org.atennert.homectrl.controls.util.IInitializable;
-import org.atennert.homectrl.event.EControlUpdate;
-import org.atennert.homectrl.event.EDeviceValueUpdate;
-import org.atennert.homectrl.event.Subscribe;
-import org.atennert.homectrl.util.ConfigurationField;
-import org.atennert.homectrl.util.DeviceValue;
+package de.atennert.homectrl.controls;
+
+import de.atennert.homectrl.controls.util.IInitializable;
+import de.atennert.homectrl.event.EControlUpdate;
+import de.atennert.homectrl.event.EDeviceValueUpdate;
+import de.atennert.homectrl.event.Subscribe;
+import de.atennert.homectrl.util.ConfigurationField;
+import de.atennert.homectrl.util.DeviceValue;
 
 /**
  * Heating controller that uses an inside and an outside temperature sensor

diff --git a/...trl/controls/SimpleHeatingController.java → ...trl/controls/SimpleHeatingController.java b/...trl/controls/SimpleHeatingController.java → ...trl/controls/SimpleHeatingController.java
@@ -14,14 +14,14 @@
  * the License.
  *******************************************************************************/
 
-package org.atennert.homectrl.controls;
-
-import org.atennert.homectrl.controls.util.IInitializable;
-import org.atennert.homectrl.event.EControlUpdate;
-import org.atennert.homectrl.event.EDeviceValueUpdate;
-import org.atennert.homectrl.event.Subscribe;
-import org.atennert.homectrl.util.ConfigurationField;
-import org.atennert.homectrl.util.DeviceValue;
+package de.atennert.homectrl.controls;
+
+import de.atennert.homectrl.controls.util.IInitializable;
+import de.atennert.homectrl.event.EControlUpdate;
+import de.atennert.homectrl.event.EDeviceValueUpdate;
+import de.atennert.homectrl.event.Subscribe;
+import de.atennert.homectrl.util.ConfigurationField;
+import de.atennert.homectrl.util.DeviceValue;
 
 /**
  * Simple heating controller that uses an inside and an outside temperature sensor

diff --git a/...rl/controls/TwoModeHeatingController.java → ...rl/controls/TwoModeHeatingController.java b/...rl/controls/TwoModeHeatingController.java → ...rl/controls/TwoModeHeatingController.java
@@ -14,14 +14,14 @@
  * the License.
  *******************************************************************************/
 
-package org.atennert.homectrl.controls;
-
-import org.atennert.homectrl.controls.util.IInitializable;
-import org.atennert.homectrl.event.EControlUpdate;
-import org.atennert.homectrl.event.EDeviceValueUpdate;
-import org.atennert.homectrl.event.Subscribe;
-import org.atennert.homectrl.util.ConfigurationField;
-import org.atennert.homectrl.util.DeviceValue;
+package de.atennert.homectrl.controls;
+
+import de.atennert.homectrl.controls.util.IInitializable;
+import de.atennert.homectrl.event.EControlUpdate;
+import de.atennert.homectrl.event.EDeviceValueUpdate;
+import de.atennert.homectrl.event.Subscribe;
+import de.atennert.homectrl.util.ConfigurationField;
+import de.atennert.homectrl.util.DeviceValue;
 
 /**
  * Heating controller that uses an inside and an outside temperature sensor

diff --git a/...omectrl/controls/util/ControlManager.java → ...omectrl/controls/util/ControlManager.java b/...omectrl/controls/util/ControlManager.java → ...omectrl/controls/util/ControlManager.java
@@ -1,9 +1,9 @@
-package org.atennert.homectrl.controls.util;
+package de.atennert.homectrl.controls.util;
 
 import java.util.Set;
 
-import org.atennert.homectrl.controls.AbstractController;
-import org.atennert.homectrl.event.EventBus;
+import de.atennert.homectrl.controls.AbstractController;
+import de.atennert.homectrl.event.EventBus;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class ControlManager

diff --git a/...omectrl/controls/util/IInitializable.java → ...omectrl/controls/util/IInitializable.java b/...omectrl/controls/util/IInitializable.java → ...omectrl/controls/util/IInitializable.java
@@ -1,4 +1,4 @@
-package org.atennert.homectrl.controls.util;
+package de.atennert.homectrl.controls.util;
 
 /**
  * Since controllers are generated from a special device configuration

diff --git a/...dataprocessing/AbstractDataProcessor.java → ...dataprocessing/AbstractDataProcessor.java b/...dataprocessing/AbstractDataProcessor.java → ...dataprocessing/AbstractDataProcessor.java
@@ -1,7 +1,7 @@
 
-package org.atennert.homectrl.dataprocessing;
+package de.atennert.homectrl.dataprocessing;
 
-import org.atennert.homectrl.event.EventBus;
+import de.atennert.homectrl.event.EventBus;
 
 public abstract class AbstractDataProcessor<T>
 {

diff --git a/.../dataprocessing/HighIntegerProcessor.java → .../dataprocessing/HighIntegerProcessor.java b/.../dataprocessing/HighIntegerProcessor.java → .../dataprocessing/HighIntegerProcessor.java
@@ -14,13 +14,13 @@
  * the License.
  *******************************************************************************/
 
-package org.atennert.homectrl.dataprocessing;
+package de.atennert.homectrl.dataprocessing;
 
 import java.util.HashMap;
 
-import org.atennert.homectrl.event.EDeviceValueUpdate;
-import org.atennert.homectrl.event.Subscribe;
-import org.atennert.homectrl.util.ConfigurationField;
+import de.atennert.homectrl.event.EDeviceValueUpdate;
+import de.atennert.homectrl.event.Subscribe;
+import de.atennert.homectrl.util.ConfigurationField;
 
 /**
  * Virtual sensor which returns the highest integer value from a set of sensors.

diff --git a/...cessing/IntegerIsUnderLimitProcessor.java → ...cessing/IntegerIsUnderLimitProcessor.java b/...cessing/IntegerIsUnderLimitProcessor.java → ...cessing/IntegerIsUnderLimitProcessor.java
@@ -14,13 +14,13 @@
  * the License.
  *******************************************************************************/
 
-package org.atennert.homectrl.dataprocessing;
+package de.atennert.homectrl.dataprocessing;
 
 import java.util.Map;
 
-import org.atennert.homectrl.event.EDeviceValueUpdate;
-import org.atennert.homectrl.event.Subscribe;
-import org.atennert.homectrl.util.ConfigurationField;
+import de.atennert.homectrl.event.EDeviceValueUpdate;
+import de.atennert.homectrl.event.Subscribe;
+import de.atennert.homectrl.util.ConfigurationField;
 
 /**
  * Virtual sensor which checks if a sensor value is larger than a given limit.

diff --git a/...l/dataprocessing/LogicalAndProcessor.java → ...l/dataprocessing/LogicalAndProcessor.java b/...l/dataprocessing/LogicalAndProcessor.java → ...l/dataprocessing/LogicalAndProcessor.java
@@ -14,14 +14,14 @@
  * the License.
  *******************************************************************************/
 
-package org.atennert.homectrl.dataprocessing;
+package de.atennert.homectrl.dataprocessing;
 
 import java.util.Collection;
 import java.util.HashMap;
 
-import org.atennert.homectrl.event.EDeviceValueUpdate;
-import org.atennert.homectrl.event.Subscribe;
-import org.atennert.homectrl.util.ConfigurationField;
+import de.atennert.homectrl.event.EDeviceValueUpdate;
+import de.atennert.homectrl.event.Subscribe;
+import de.atennert.homectrl.util.ConfigurationField;
 
 /**
  * Virtual sensor which computes the logical AND from a set of boolean

diff --git a/dataprocessing/src/main/java/de/atennert/homectrl/dataprocessing/LogicalOrProcessor.java b/dataprocessing/src/main/java/de/atennert/homectrl/dataprocessing/LogicalOrProcessor.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright 2016 Andreas Tennert
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ *******************************************************************************/
+package de.atennert.homectrl.dataprocessing;
+
+import de.atennert.homectrl.event.EDeviceValueUpdate;
+import de.atennert.homectrl.event.Subscribe;
+import de.atennert.homectrl.util.ConfigurationField;
+
+import java.util.Map;
+
+/**
+ * This sensor is used to combine sensor values with an or combinator.
+ * It forwards <code>true</code> if at least one of the inputs is
+ * <code>true</code>, <code>false</code> otherwise.
+ */
+public class LogicalOrProcessor extends AbstractDataProcessor<Boolean> {
+
+    private final Map<Integer, Boolean> sensors;
+
+    public LogicalOrProcessor(
+            @ConfigurationField(fieldId = "id") int id,
+            @ConfigurationField(fieldId = "resources") Map<Integer, Boolean> sensors)
+    {
+        super(id, false);
+
+        this.sensors = sensors;
+    }
+
+    @Subscribe
+    public void update(EDeviceValueUpdate event)
+    {
+        if (sensors.containsKey(event.deviceId))
+        {
+            sensors.put(event.deviceId, (Boolean)event.value);
+
+            final boolean oldProcessorValue = processorValue;
+            processorValue = sensors.values().stream().anyMatch(status -> status);
+
+            if (oldProcessorValue != processorValue) {
+                eventBus.post(processorId, new EDeviceValueUpdate(processorId, processorValue));
+            }
+        }
+    }
+}
diff --git a/...ssing/LowPrioritizingDoubleProcessor.java → ...ssing/LowPrioritizingDoubleProcessor.java b/...ssing/LowPrioritizingDoubleProcessor.java → ...ssing/LowPrioritizingDoubleProcessor.java
@@ -14,13 +14,13 @@
  * the License.
  *******************************************************************************/
 
-package org.atennert.homectrl.dataprocessing;
+package de.atennert.homectrl.dataprocessing;
 
 import java.util.HashMap;
 
-import org.atennert.homectrl.event.EDeviceValueUpdate;
-import org.atennert.homectrl.event.Subscribe;
-import org.atennert.homectrl.util.ConfigurationField;
+import de.atennert.homectrl.event.EDeviceValueUpdate;
+import de.atennert.homectrl.event.Subscribe;
+import de.atennert.homectrl.util.ConfigurationField;
 
 /**
  * Virtual sensor for temperature calculation that listens to other temperature sensors

diff --git a/...dataprocessing/util/ProcessorManager.java → ...dataprocessing/util/ProcessorManager.java b/...dataprocessing/util/ProcessorManager.java → ...dataprocessing/util/ProcessorManager.java
@@ -1,9 +1,9 @@
-package org.atennert.homectrl.dataprocessing.util;
+package de.atennert.homectrl.dataprocessing.util;
 
 import java.util.Set;
 
-import org.atennert.homectrl.dataprocessing.AbstractDataProcessor;
-import org.atennert.homectrl.event.EventBus;
+import de.atennert.homectrl.dataprocessing.AbstractDataProcessor;
+import de.atennert.homectrl.event.EventBus;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class ProcessorManager

diff --git a/...main/resources/example-configuration.json → example-configuration.json b/...main/resources/example-configuration.json → example-configuration.json
@@ -142,7 +142,7 @@
 {
     "type": "processor",
     "name": "estimatedOutsideTemperature",
-    "class": "org.atennert.homectrl.dataprocessing.LowPrioritizingDoubleProcessor",
+    "class": "de.atennert.homectrl.dataprocessing.LowPrioritizingDoubleProcessor",
     "id": 5,
     "value": 20,
     "data": "double",
@@ -152,7 +152,7 @@
 {
     "type": "processor",
     "name": "highestOutsideBrightness",
-    "class": "org.atennert.homectrl.dataprocessing.HighIntegerProcessor",
+    "class": "de.atennert.homectrl.dataprocessing.HighIntegerProcessor",
     "id": 8,
     "value": 600,
     "data": "integer",
@@ -161,7 +161,7 @@
 {
     "type": "processor",
     "name": "isItCloudyOrDark",
-    "class": "org.atennert.homectrl.dataprocessing.IntegerIsUnderLimitProcessor",
+    "class": "de.atennert.homectrl.dataprocessing.IntegerIsUnderLimitProcessor",
     "id": 9,
     "value": false,
     "data": "boolean",
@@ -171,7 +171,7 @@
 {
     "type": "processor",
     "name": "heatingActive",
-    "class": "org.atennert.homectrl.dataprocessing.LogicalAndProcessor",
+    "class": "de.atennert.homectrl.dataprocessing.LogicalAndProcessor",
     "id": 10,
     "value": false,
     "data": "boolean",
@@ -180,7 +180,7 @@
 {
     "type": "control",
     "name": "workRoomHeatingController",
-    "class": "org.atennert.homectrl.controls.ActivatableHeatingController",
+    "class": "de.atennert.homectrl.controls.ActivatableHeatingController",
     "actorId": 10001,
     "value": false,
     "outsideSensorId": 5,
@@ -192,7 +192,7 @@
 {
     "type": "control",
     "name": "livingRoomHeatingController",
-    "class": "org.atennert.homectrl.controls.ActivatableHeatingController",
+    "class": "de.atennert.homectrl.controls.ActivatableHeatingController",
     "actorId": 10002,
     "value": false,
     "outsideSensorId": 5,

diff --git a/example-server.properties b/example-server.properties
@@ -0,0 +1,10 @@
+
+# communication address properties
+homectrl.server.address.http=192.168.0.2:80
+homectrl.server.address.enocean=/dev/ttyUSB0
+
+# database information
+homectrl.server.logDb.driverClassName = org.sqlite.JDBC
+homectrl.server.logDb.url = jdbc:sqlite:homectrlLog.sqlite
+homectrl.server.logDb.username = "user"
+homectrl.server.logDb.password = "pwd"
diff --git a/homectrl-com-if/build.gradle b/homectrl-com-if/build.gradle
@@ -7,4 +7,5 @@ version = "0.0.2"
 
 dependencies {
     compile project(':homectrl')
+    compile 'de.atennert:com:2+'
 }
diff --git a/...l/communication/AbstractHttpReceiver.java → ...l/communication/AbstractHttpReceiver.java b/...l/communication/AbstractHttpReceiver.java → ...l/communication/AbstractHttpReceiver.java
@@ -14,9 +14,9 @@
  * the License.
  *******************************************************************************/
 
-package org.atennert.homectrl.communication;
+package de.atennert.homectrl.communication;
 
-import org.atennert.com.communication.AbstractReceiver;
+import de.atennert.com.communication.AbstractReceiver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Required;

diff --git a/...t/homectrl/communication/Base64Coder.java → ...t/homectrl/communication/Base64Coder.java b/...t/homectrl/communication/Base64Coder.java → ...t/homectrl/communication/Base64Coder.java
@@ -14,7 +14,7 @@
 //Please contact the author if you need another license.
 //This module is provided "as is", without warranties of any kind.
 
-package org.atennert.homectrl.communication;
+package de.atennert.homectrl.communication;
 
 /**
 * A Base64 encoder/decoder.

diff --git a/.../homectrl/communication/CodingHelper.java → .../homectrl/communication/CodingHelper.java b/.../homectrl/communication/CodingHelper.java → .../homectrl/communication/CodingHelper.java
@@ -11,7 +11,7 @@
  * Boston, MA 02110-1301, USA.
  *******************************************************************************/
 
-package org.atennert.homectrl.communication;
+package de.atennert.homectrl.communication;
 
 /**
  * This class contains hepler methods for encoding and decoding EnOcean data