Move current development master

addons/binding/org.openhab.binding.mysensors/.classpath

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/test"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

addons/binding/org.openhab.binding.mysensors/.gitignore

@@ -0,0 +1 @@
+/*.cached

addons/binding/org.openhab.binding.mysensors/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8

addons/binding/org.openhab.binding.mysensors/ESH-INF/thing/thing-types.xml

@@ -11,13 +11,11 @@
 		</description>
 		<config-description>
 			<parameter name="serialPort" type="text" required="true">
-				<context>serial-port</context>
 				<label>Serial Port</label>
 				<description>The serial port the MySensors Gateway is connected to
 				</description>
 			</parameter>
 			<parameter name="sendDelay" type="integer" required="false" min="1" max="1000">
-				<context>senddelay</context>
 				<label>Send Delay</label>
 				<description>The delay between messages send to the gateway 
 				</description>
@@ -30,17 +28,20 @@
 				<default>115200</default>
 			</parameter>
 			<parameter name="skipStartupCheck" type="boolean" required="false">
-				<context>skipstartupchek</context>
 				<label>Skip startup connection check</label>
 				<description>Allow the user to bypass the I_VERSION check on startup</description>
 				<default>false</default>
 			</parameter>
 			<parameter name="imperial" type="boolean" required="false">
-				<context>imperialconfig</context>
 				<label>Imperial/Metric selection</label>
 				<description>Metric answer with imperial instead of metric</description>
 				<default>false</default>
 			</parameter>
+			<parameter name="enableNetworkSanCheck" type="boolean" required="false">
+                <label>Disable network sanity check</label>
+                <description>Network sanity check periodically unsure that gateway is up and running</description>
+                <default>false</default>
+            </parameter>
 		</config-description>
 
 	</bridge-type>
@@ -51,37 +52,37 @@
 		</description>
 		<config-description>
 			<parameter name="ipAddress" type="text" required="true">
-				<context>ipAddress</context>
 				<label>IP Address</label>
 				<description>The IP Address the MySensors Gateway uses
 				</description>
 			</parameter>
 			<parameter name="tcpPort" type="integer" required="true" min="1" max="65535">
-				<context>tcpport</context>
 				<label>TCP Port</label>
 				<description>The TCP Port the MySensors Gateway uses (usually 5003)
 				</description>
 				<default>5003</default>
 			</parameter>
 			<parameter name="sendDelay" type="integer" required="false" min="1" max="1000">
-				<context>senddelay</context>
 				<label>Send Delay</label>
 				<description>The delay between messages send to the gateway 
 				</description>
 				<default>100</default>
 			</parameter>
 			<parameter name="skipStartupCheck" type="boolean" required="false">
-				<context>skipstartupchek</context>
 				<label>Skip startup connection check</label>
 				<description>Allow the user to bypass the I_VERSION check on startup</description>
 				<default>false</default>
 			</parameter>
 			<parameter name="imperial" type="boolean" required="false">
-				<context>imperialconfig</context>
 				<label>Imperial/Metric selection</label>
 				<description>Metric answer with imperial instead of metric</description>
 				<default>false</default>
 			</parameter>
+			<parameter name="enableNetworkSanCheck" type="boolean" required="false">
+                <label>Disable network sanity check</label>
+                <description>Network sanity check periodically unsure that gateway is up and running</description>
+                <default>false</default>
+            </parameter>
 		</config-description>
 
 	</bridge-type>
@@ -895,7 +896,133 @@
 			</parameter>
 		</config-description>
 	</thing-type>
+	<thing-type id="mysensorsMessage">
+        <supported-bridge-type-refs>
+            <bridge-type-ref id="bridge-ser" />
+            <bridge-type-ref id="bridge-eth" />
+        </supported-bridge-type-refs>
 
+        <label>MySensors Message</label>
+        <description>Shows the complete MySensors Message</description>
+
+        <channels>
+            <channel id="mySensorsMessage" typeId="mySensorsMessage-channel" />
+            <channel id="lastupdate" typeId="lastupdate-channel"/>
+        </channels>
+
+        <config-description>
+            <parameter name="nodeId" type="text" required="true">
+                <context>NodeId</context>
+                <label>NodeId</label>
+                <description>The ID of the node in the MySensors network
+                </description>
+                <default>999</default>
+            </parameter>
+            <parameter name="childId" type="text" required="true">
+                <context>ChildId</context>
+                <label>ChildId</label>
+                <description>The ID of the child of a node in the MySensors network
+                </description>
+                <default>999</default>
+            </parameter>
+        </config-description>
+    </thing-type>
+
+    <thing-type id="text">
+        <supported-bridge-type-refs>
+            <bridge-type-ref id="bridge-ser" />
+            <bridge-type-ref id="bridge-eth" />
+        </supported-bridge-type-refs>
+
+        <label>Text</label>
+        <description>V_TEXT</description>
+
+        <channels>
+            <channel id="text" typeId="text-channel" />
+            <channel id="lastupdate" typeId="lastupdate-channel"/>
+        </channels>
+
+        <config-description>
+            <parameter name="nodeId" type="text" required="true">
+                <context>NodeId</context>
+                <label>NodeId</label>
+                <description>The ID of the node in the MySensors network
+                </description>
+                <default>999</default>
+            </parameter>
+            <parameter name="childId" type="text" required="true">
+                <context>ChildId</context>
+                <label>ChildId</label>
+                <description>The ID of the child of a node in the MySensors network
+                </description>
+                <default>999</default>
+            </parameter>
+        </config-description>
+    </thing-type>
+
+    <thing-type id="irSend">
+        <supported-bridge-type-refs>
+            <bridge-type-ref id="bridge-ser" />
+            <bridge-type-ref id="bridge-eth" />
+        </supported-bridge-type-refs>
+
+        <label>IR Send</label>
+        <description>Send IR codes</description>
+
+        <channels>
+            <channel id="irSend" typeId="irSend-channel" />
+            <channel id="lastupdate" typeId="lastupdate-channel"/>
+        </channels>
+
+        <config-description>
+            <parameter name="nodeId" type="text" required="true">
+                <context>NodeId</context>
+                <label>NodeId</label>
+                <description>The ID of the node in the MySensors network
+                </description>
+                <default>999</default>
+            </parameter>
+            <parameter name="childId" type="text" required="true">
+                <context>ChildId</context>
+                <label>ChildId</label>
+                <description>The ID of the child of a node in the MySensors network
+                </description>
+                <default>999</default>
+            </parameter>
+        </config-description>
+    </thing-type>
+
+    <thing-type id="irReceive">
+        <supported-bridge-type-refs>
+            <bridge-type-ref id="bridge-ser" />
+            <bridge-type-ref id="bridge-eth" />
+        </supported-bridge-type-refs>
+
+        <label>IR Receive</label>
+        <description>Receive IR codes</description>
+
+        <channels>
+            <channel id="irReceive" typeId="irReceive-channel" />
+            <channel id="lastupdate" typeId="lastupdate-channel"/>
+        </channels>
+
+        <config-description>
+            <parameter name="nodeId" type="text" required="true">
+                <context>NodeId</context>
+                <label>NodeId</label>
+                <description>The ID of the node in the MySensors network
+                </description>
+                <default>999</default>
+            </parameter>
+            <parameter name="childId" type="text" required="true">
+                <context>ChildId</context>
+                <label>ChildId</label>
+                <description>The ID of the child of a node in the MySensors network
+                </description>
+                <default>999</default>
+            </parameter>
+        </config-description>
+    </thing-type>
 
 	<!-- CHANNELS -->
 
@@ -1153,4 +1280,28 @@
 		<description>MySensors Water Electric Condictivity Channel</description>
 		<state readOnly="false"></state>
 	</channel-type>
+	<channel-type id="mysensorsMessage-channel">
+        <item-type>String</item-type>
+        <label>MySensors Message</label>
+        <description>MySensors Message Channel</description>
+        <state readOnly="false"></state>
+    </channel-type>
+    <channel-type id="text-channel">
+        <item-type>String</item-type>
+        <label>Text</label>
+        <description>MySensors Text Channel</description>
+        <category>Variable</category>
+    </channel-type>
+    <channel-type id="irSend-channel">
+        <item-type>String</item-type>
+        <label>Text</label>
+        <description>MySensors IR Send Channel</description>
+        <category>Variable</category>
+    </channel-type>
+    <channel-type id="irReceive-channel">
+        <item-type>String</item-type>
+        <label>Text</label>
+        <description>MySensors IR Receive Channel</description>
+        <category>Variable</category>
+    </channel-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.mysensors/META-INF/MANIFEST.MF

@@ -7,12 +7,11 @@ Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ClassPath: .
 Import-Package: 
- com.google.common.collect,
  com.google.common.base,
+ com.google.common.collect,
+ com.google.gson;version="2.2.4",
  gnu.io,
  org.apache.commons.lang,
- org.openhab.binding.mysensors,
- org.openhab.binding.mysensors.handler,
  org.eclipse.smarthome.config.core,
  org.eclipse.smarthome.config.discovery,
  org.eclipse.smarthome.core.library.types,
@@ -21,11 +20,15 @@ Import-Package:
  org.eclipse.smarthome.core.thing.binding.builder,
  org.eclipse.smarthome.core.thing.type,
  org.eclipse.smarthome.core.types,
+ org.openhab.binding.mysensors,
+ org.openhab.binding.mysensors.internal.handler,
+ org.osgi.framework,
  org.osgi.service.cm,
  org.osgi.service.component,
- org.osgi.framework,
  org.slf4j
 Service-Component: OSGI-INF/*.xml
 Export-Package: org.openhab.binding.mysensors,
- org.openhab.binding.mysensors.handler
-Require-Bundle: org.eclipse.smarthome.core
+ org.openhab.binding.mysensors.internal.handler
+Require-Bundle: org.eclipse.smarthome.core,
+ org.openhab.io.transport.serial,
+ com.google.gson

addons/binding/org.openhab.binding.mysensors/OSGI-INF/MySensorsHandlerFactory.xml

@@ -8,10 +8,9 @@
     http://www.eclipse.org/legal/epl-v10.html
 
 -->
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.openhab.binding.mysensors.internal.MySensorsHandlerFactory">
-
-   <implementation class="org.openhab.binding.mysensors.internal.MySensorsHandlerFactory"/>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="org.openhab.binding.mysensors.internal.factory.MySensorsHandlerFactory">
 
+   <implementation class="org.openhab.binding.mysensors.internal.factory.MySensorsHandlerFactory"/>
    <service>
       <provide interface="org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory"/>
    </service>

addons/binding/org.openhab.binding.mysensors/src/main/java/org/openhab/binding/mysensors/MySensorsBindingConstants.java

@@ -13,7 +13,7 @@
 import java.util.Set;
 
 import org.eclipse.smarthome.core.thing.ThingTypeUID;
-import org.openhab.binding.mysensors.internal.MySensorsMessage;
+import org.openhab.binding.mysensors.internal.protocol.message.MySensorsMessage;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
@@ -61,6 +61,7 @@ public class MySensorsBindingConstants {
     public static final int MYSENSORS_SUBTYPE_S_DISTANCE = 15;
     public static final int MYSENSORS_SUBTYPE_S_LIGHT_LEVEL = 16;
     public static final int MYSENSORS_SUBTYPE_S_LOCK = 19;
+    public static final int MYSENSORS_SUBTYPE_S_IR = 20;
     public static final int MYSENSORS_SUBTYPE_S_WATER = 21;
     public static final int MYSENSORS_SUBTYPE_S_CUSTOM = 23;
     public static final int MYSENSORS_SUBTYPE_S_RGB_LIGHT = 26;
@@ -197,6 +198,10 @@ public class MySensorsBindingConstants {
     public final static ThingTypeUID THING_TYPE_RGB_LIGHT = new ThingTypeUID(BINDING_ID, "rgbLight");
     public final static ThingTypeUID THING_TYPE_RGBW_LIGHT = new ThingTypeUID(BINDING_ID, "rgbwLight");
     public final static ThingTypeUID THING_TYPE_WATER_QUALITY = new ThingTypeUID(BINDING_ID, "waterQuality");
+    public final static ThingTypeUID THING_TYPE_MYSENSORS_MESSAGE = new ThingTypeUID(BINDING_ID, "mySensorsMessage");
+    public final static ThingTypeUID THING_TYPE_TEXT = new ThingTypeUID(BINDING_ID, "text");
+    public final static ThingTypeUID THING_TYPE_IR_SEND = new ThingTypeUID(BINDING_ID, "irSend");
+    public final static ThingTypeUID THING_TYPE_IR_RECEIVE = new ThingTypeUID(BINDING_ID, "irReceive");
 
     public final static ThingTypeUID THING_TYPE_BRIDGE_SER = new ThingTypeUID(BINDING_ID, "bridge-ser");
     public final static ThingTypeUID THING_TYPE_BRIDGE_ETH = new ThingTypeUID(BINDING_ID, "bridge-eth");
@@ -254,7 +259,9 @@ public class MySensorsBindingConstants {
     public final static String CHANNEL_VAR = "var";
     public final static String CHANNEL_VA = "va";
     public final static String CHANNEL_POWER_FACTOR = "power-factor";
-
+    public final static String CHANNEL_IR_SEND = "irSend";
+    public final static String CHANNEL_IR_RECEIVE = "irReceive";
+    public final static String CHANNEL_MYSENSORS_MESSAGE = "mySensorsMessage";
     public final static String CHANNEL_LAST_UPDATE = "lastupdate";
 
     // Wait time Arduino reset
@@ -322,7 +329,9 @@ public class MySensorsBindingConstants {
             put(MYSENSORS_SUBTYPE_V_VAR, CHANNEL_VAR);
             put(MYSENSORS_SUBTYPE_V_VA, CHANNEL_VA);
             put(MYSENSORS_SUBTYPE_V_POWER_FACTOR, CHANNEL_POWER_FACTOR);
-
+            put(MYSENSORS_SUBTYPE_V_TEXT, CHANNEL_TEXT);
+            put(MYSENSORS_SUBTYPE_V_IR_SEND, CHANNEL_IR_SEND);
+            put(MYSENSORS_SUBTYPE_V_IR_RECEIVE, CHANNEL_IR_RECEIVE);
         }
     };
 
@@ -344,7 +353,8 @@ public class MySensorsBindingConstants {
             THING_TYPE_DOOR, THING_TYPE_MOTION, THING_TYPE_SMOKE, THING_TYPE_DIMMER, THING_TYPE_COVER, THING_TYPE_WIND,
             THING_TYPE_RAIN, THING_TYPE_UV, THING_TYPE_WEIGHT, THING_TYPE_DISTANCE, THING_TYPE_LIGHT_LEVEL,
             THING_TYPE_HVAC, THING_TYPE_WATER, THING_TYPE_CUSTOM, THING_TYPE_LOCK, THING_TYPE_SOUND,
-            THING_TYPE_RGB_LIGHT, THING_TYPE_RGBW_LIGHT, THING_TYPE_WATER_QUALITY);
+            THING_TYPE_RGB_LIGHT, THING_TYPE_RGBW_LIGHT, THING_TYPE_WATER_QUALITY, THING_TYPE_MYSENSORS_MESSAGE,
+            THING_TYPE_TEXT, THING_TYPE_IR_SEND, THING_TYPE_IR_RECEIVE);
     /** Supported bridges */
     public final static Set<ThingTypeUID> SUPPORTED_BRIDGE_THING_TYPES_UIDS = ImmutableSet.of(THING_TYPE_BRIDGE_SER,
             THING_TYPE_BRIDGE_ETH);
@@ -355,6 +365,6 @@ public class MySensorsBindingConstants {
             THING_TYPE_DOOR, THING_TYPE_MOTION, THING_TYPE_SMOKE, THING_TYPE_DIMMER, THING_TYPE_COVER, THING_TYPE_WIND,
             THING_TYPE_RAIN, THING_TYPE_UV, THING_TYPE_WEIGHT, THING_TYPE_DISTANCE, THING_TYPE_LIGHT_LEVEL,
             THING_TYPE_HVAC, THING_TYPE_WATER, THING_TYPE_CUSTOM, THING_TYPE_LOCK, THING_TYPE_SOUND,
-            THING_TYPE_RGB_LIGHT, THING_TYPE_RGBW_LIGHT, THING_TYPE_WATER_QUALITY, THING_TYPE_BRIDGE_SER,
-            THING_TYPE_BRIDGE_ETH);
+            THING_TYPE_RGB_LIGHT, THING_TYPE_RGBW_LIGHT, THING_TYPE_WATER_QUALITY, THING_TYPE_MYSENSORS_MESSAGE,
+            THING_TYPE_TEXT, THING_TYPE_IR_SEND, THING_TYPE_IR_RECEIVE, THING_TYPE_BRIDGE_SER, THING_TYPE_BRIDGE_ETH);
 }

addons/binding/org.openhab.binding.mysensors/src/main/java/org/openhab/binding/mysensors/config/MySensorsBridgeConfiguration.java

@@ -16,5 +16,5 @@ public class MySensorsBridgeConfiguration {
     public Integer baudRate;
     public Boolean imperial;
     public Boolean skipStartupCheck;
-
+    public Boolean enableNetworkSanCheck;
 }