refs #13 * Things can be assigned to new tcpbridge

fruggy83 · Jun 8, 2018 · 5392350 · 5392350
1 parent 1b2a344
commit 5392350
Show file tree

Hide file tree

Showing 15 changed files with 14 additions and 0 deletions.
diff --git a/ESH-INF/thing/CentralCommand.xml b/ESH-INF/thing/CentralCommand.xml
@@ -7,6 +7,7 @@
 	<thing-type id="centralCommand">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="bridge" />
+			<bridge-type-ref id="tcpbridge" />
 		</supported-bridge-type-refs>
 
 		<label>A5-38 - Central command</label>

diff --git a/ESH-INF/thing/ContactAndSwitch.xml b/ESH-INF/thing/ContactAndSwitch.xml
@@ -7,6 +7,7 @@
 	<thing-type id="contactSwitch">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="bridge" />
+			<bridge-type-ref id="tcpbridge" />
 		</supported-bridge-type-refs>
 
 		<label>D5-00 - Single input contact</label>

diff --git a/ESH-INF/thing/EltakoFSB.xml b/ESH-INF/thing/EltakoFSB.xml
@@ -7,6 +7,7 @@
 	<thing-type id="eltakoFSB">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="bridge" />
+			<bridge-type-ref id="tcpbridge" />
 		</supported-bridge-type-refs>
 
 		<label>Eltako rollershutter</label>

diff --git a/ESH-INF/thing/GenericThing.xml b/ESH-INF/thing/GenericThing.xml
@@ -7,6 +7,7 @@
 	<thing-type id="genericThing">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="bridge" />
+			<bridge-type-ref id="tcpbridge" />
 		</supported-bridge-type-refs>
 
 		<label>00-00 - Generic thing</label>

diff --git a/ESH-INF/thing/HumidityTemperatureSensor.xml b/ESH-INF/thing/HumidityTemperatureSensor.xml
@@ -7,6 +7,7 @@
 	<thing-type id="humidityTemperatureSensor">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="bridge" />
+			<bridge-type-ref id="tcpbridge" />
 		</supported-bridge-type-refs>
 
 		<label>A5-04 - Temperature and humidity sensor</label>

diff --git a/ESH-INF/thing/LightTemperatureOccupancySensor.xml b/ESH-INF/thing/LightTemperatureOccupancySensor.xml
@@ -7,6 +7,7 @@
 	<thing-type id="lightTemperatureOccupancySensor">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="bridge" />
+			<bridge-type-ref id="tcpbridge" />
 		</supported-bridge-type-refs>
 
 		<label>A5-08 - Light, temperature and occupancy sensor</label>

diff --git a/ESH-INF/thing/MeasurementSwitch.xml b/ESH-INF/thing/MeasurementSwitch.xml
@@ -7,6 +7,7 @@
 	<thing-type id="measurementSwitch">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="bridge" />
+			<bridge-type-ref id="tcpbridge" />
 		</supported-bridge-type-refs>
 
 		<label>D2-01 - Energy measurement switch</label>

diff --git a/ESH-INF/thing/MechanicalHandle.xml b/ESH-INF/thing/MechanicalHandle.xml
@@ -8,6 +8,7 @@
 	<thing-type id="mechanicalHandle">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="bridge" />
+			<bridge-type-ref id="tcpbridge" />
 		</supported-bridge-type-refs>
 
 		<label>F6-10 - Mechanical Handle</label>

diff --git a/ESH-INF/thing/PushButton.xml b/ESH-INF/thing/PushButton.xml
@@ -8,6 +8,7 @@
 	<thing-type id="pushButton">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="bridge" />
+			<bridge-type-ref id="tcpbridge" />
 		</supported-bridge-type-refs>
 
 		<label>F6-01 - Simple push button</label>

diff --git a/ESH-INF/thing/RockerSwitch.xml b/ESH-INF/thing/RockerSwitch.xml
@@ -8,6 +8,7 @@
 	<thing-type id="rockerSwitch">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="bridge" />
+			<bridge-type-ref id="tcpbridge" />
 		</supported-bridge-type-refs>
 
 		<label>F6-02 - Rocker Switch</label>

diff --git a/ESH-INF/thing/RoomOperatingPanel.xml b/ESH-INF/thing/RoomOperatingPanel.xml
@@ -7,6 +7,7 @@
 	<thing-type id="roomOperatingPanel">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="bridge" />
+			<bridge-type-ref id="tcpbridge" />
 		</supported-bridge-type-refs>
 
 		<label>A5-10 - Room operating panel</label>

diff --git a/ESH-INF/thing/TemperatureSensor.xml b/ESH-INF/thing/TemperatureSensor.xml
@@ -7,6 +7,7 @@
 	<thing-type id="temperatureSensor">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="bridge" />
+			<bridge-type-ref id="tcpbridge" />
 		</supported-bridge-type-refs>
 
 		<label>A5-02 - Temperature sensor</label>

diff --git a/ESH-INF/thing/VirtualRockerSwitch.xml b/ESH-INF/thing/VirtualRockerSwitch.xml
@@ -8,6 +8,7 @@
 	<thing-type id="virtualRockerSwitch">
 		<supported-bridge-type-refs>
 			<bridge-type-ref id="bridge" />
+			<bridge-type-ref id="tcpbridge" />
 		</supported-bridge-type-refs>
 
 		<label>F6-02 - Virtual Rocker Switch</label>

diff --git a/precompiled/org.openhab.binding.openocean-2.4.0-SNAPSHOT.jar b/precompiled/org.openhab.binding.openocean-2.4.0-SNAPSHOT.jar
diff --git a/src/main/java/org/openhab/binding/openocean/handler/OpenOceanBaseThingHandler.java b/src/main/java/org/openhab/binding/openocean/handler/OpenOceanBaseThingHandler.java
@@ -69,6 +69,7 @@ public OpenOceanBaseThingHandler(Thing thing) {
     @Override
     public void initialize() {
         logger.debug("Initializing open ocean base thing handler.");
+        this.gateway = null; // reset gateway
         initializeThing((getBridge() == null) ? null : getBridge().getStatus());
     }