Version beta7. Fixes #5 and #13.

mvalla · Sep 1, 2018 · f1b92fd · f1b92fd
1 parent 81b4085
commit f1b92fd
Show file tree

Hide file tree

Showing 18 changed files with 998 additions and 205 deletions.
diff --git a/ESH-INF/binding/binding.xml b/ESH-INF/binding/binding.xml
@@ -4,7 +4,7 @@
 	xmlns:binding="http://eclipse.org/smarthome/schemas/binding/v1.0.0"
 	xsi:schemaLocation="http://eclipse.org/smarthome/schemas/binding/v1.0.0 http://eclipse.org/smarthome/schemas/binding-1.0.0.xsd">
 
-	<name>OpenWebNet Binding (beta6)</name>
+	<name>OpenWebNet Binding (beta7)</name>
 	<description>The OpenWebNet Binding integrates the BTicino/Legrand 'MyHOME' connected home system using the OpenWebNet protocol. It supports BUS (SCS) and ZigBee USB gateways to control BTicino/Legrand switches, dimmers, shutters, etc. More info: http://www.bticino.com/products-catalogue/management-of-connected-lights-and-shutters/</description>
 
 	<author>Massimo Valla</author>

diff --git a/ESH-INF/thing/BusDimmer.xml b/ESH-INF/thing/BusDimmer.xml
@@ -16,6 +16,7 @@
 
 		<channels>
 			<channel id="brightness" typeId="brightness" />
+			<!--  <channel id="dimmerLevel" typeId="dimmerLevel" /> -->
 		</channels>
 
 		<properties>

diff --git a/ESH-INF/thing/BusTempSensor.xml b/ESH-INF/thing/BusTempSensor.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<thing:thing-descriptions bindingId="openwebnet"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0 http://eclipse.org/smarthome/schemas/thing-description-1.0.0.xsd">
+
+	<!-- Thing for BUS Temperature Sensor (BTicino xxx/xxx/...) -->
+	<thing-type id="bus_temp_sensor">
+		<supported-bridge-type-refs>
+			<bridge-type-ref id="bus_gateway" />
+		</supported-bridge-type-refs>
+		<label>BUS Temperature Sensor</label>
+		<description>A OpenWebNet BUS/SCS temperature sensor. BTicino models: xxx/yyyy/etc.</description>
+
+		<channels>
+			<channel id="temperature" typeId="temperature" />
+		</channels>
+
+		<properties>
+			<property name="vendor">BTicino/Legrand</property>
+			<property name="model">BTI-xxxx/yyyy/etc.</property>
+			<property name="ownDeviceType">---</property>
+		</properties>
+
+		<config-description>
+			<parameter name="where" type="text">
+				<label>OpenWebNet Device Address (WHERE)</label>
+				<description>Example: Zone 2 --> WHERE=2. For external sensors: sensor 5 --> WHERE=500</description>
+				<required>true</required>
+			</parameter>
+		</config-description>
+
+	</thing-type>
+</thing:thing-descriptions>
+
diff --git a/ESH-INF/thing/BusThermostat.xml b/ESH-INF/thing/BusThermostat.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<thing:thing-descriptions bindingId="openwebnet"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
+	xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0 http://eclipse.org/smarthome/schemas/thing-description-1.0.0.xsd">
+
+	<!-- Thing for BUS Thermostat (BTicino xxx/xxx/...) -->
+	<thing-type id="bus_thermostat">
+		<supported-bridge-type-refs>
+			<bridge-type-ref id="bus_gateway" />
+		</supported-bridge-type-refs>
+		<label>BUS Thermostat</label>
+		<description>A OpenWebNet BUS/SCS zone thermostat. BTicino models: xxx/yyyy/etc.</description>
+
+		<channels>
+			<!-- read only -->
+			<channel id="temperature" typeId="temperature" />
+			<channel id="targetTemperature" typeId="targetTemperature" />
+            <channel id="thermoFunction" typeId="thermoFunction"/>
+            <channel id="heatingCoolingMode" typeId="heatingCoolingMode"/>
+            <channel id="heating" typeId="heating" />
+            <channel id="cooling" typeId="cooling" />
+            <channel id="activeMode" typeId="activeMode" />
+            <channel id="localMode" typeId="localMode" />
+			<!-- read/write -->
+			<channel id="setpointTemperature" typeId="setpointTemperature" />
+            <channel id="setMode" typeId="setMode" />
+		</channels>
+
+       <properties>
+			<property name="vendor">BTicino/Legrand</property>
+			<property name="model">BTI-xxxx/yyyy/etc.</property>
+			<property name="ownDeviceType">---</property>
+		</properties>
+
+		<config-description>
+			<parameter name="where" type="text">
+				<label>OpenWebNet Device Address (WHERE)</label>
+				<description>Example: Zone 2 --> WHERE=2.</description>
+				<required>true</required>
+			</parameter>
+		</config-description>
+
+	</thing-type>
+</thing:thing-descriptions>
+
diff --git a/ESH-INF/thing/Dimmer.xml b/ESH-INF/thing/Dimmer.xml
@@ -16,7 +16,7 @@
 
 		<channels>
 			<channel id="brightness" typeId="brightness" />
-			<channel id="dimmerLevel" typeId="dimmerLevel" />
+			<!--  <channel id="dimmerLevel" typeId="dimmerLevel" /> -->
 		</channels>
 
 		<properties>

diff --git a/ESH-INF/thing/channels.xml b/ESH-INF/thing/channels.xml
@@ -41,37 +41,130 @@
 	<channel-type id="shutter">
 		<item-type>Rollershutter</item-type>
 		<label>Roller shutter</label>
-		<description>Control the shutter position</description>
+		<description>Control the roller shutter position</description>
 		<category>Blinds</category>
 	</channel-type>
 
 	<!--  Thermo channels -->
 	<channel-type id="temperature">
 		<item-type>Number:Temperature</item-type>
 		<label>Temperature</label>
-		<description>Current temperature</description>
+		<description>Current temperature (read only)</description>
 		<category>Temperature</category>
-		<state readOnly="true" pattern="%.1f %unit%" />
+		<tags>
+            <tag>CurrentTemperature</tag>
+        </tags>
+        <state readOnly="true" pattern="%.1f %unit%" />
 	</channel-type>
-	
-    <channel-type id="setPoint">
+    
+    <channel-type id="targetTemperature">
         <item-type>Number:Temperature</item-type>
-        <label>Set Point</label>
-        <description>The set point temperature</description>
+        <label>Target Temperature</label>
+        <description>Target temperature (read only)</description>
+        <category>Temperature</category>
+        <state readOnly="true" pattern="%.1f %unit%" />
+    </channel-type>
+
+    <channel-type id="thermoFunction">
+        <item-type>String</item-type>
+        <label>Thermo Function</label>
+        <description>Thermo function of the thermostat (read only)</description>
+        <state readOnly="true" >
+            <options>
+                <option value="COOL">COOL</option>
+                <option value="HEAT">HEAT</option>
+                <option value="GENERIC">GENERIC</option>
+            </options>
+        </state>
+    </channel-type>
+
+    <channel-type id="heatingCoolingMode" advanced="true" >
+        <item-type>String</item-type>
+        <label>HeatingCoolingMode</label>
+        <description>HeatingCoolingMode of the thermostat (read only)</description>
+        <tags>
+            <tag>homekit:HeatingCoolingMode</tag>
+        </tags>
+        <state readOnly="true" >
+            <options>
+                <option value="cool">cool</option>
+                <option value="heat">heat</option>
+                <option value="heatcool">heatcool</option>
+                <option value="off">off</option>
+            </options>
+        </state>
+    </channel-type>
+
+    <channel-type id="heating"  advanced="true">
+        <item-type>Switch</item-type>
+        <label>Heating Is</label>
+        <description>Heating is active (read only)</description>
+        <state readOnly="true" />
+    </channel-type>
+
+    <channel-type id="cooling" advanced="true" >
+        <item-type>Switch</item-type>
+        <label>Cooling Is</label>
+        <description>Cooling is active (read only)</description>
+        <state readOnly="true" />
+    </channel-type>
+
+     <channel-type id="activeMode">
+        <item-type>String</item-type>
+        <label>Operation Mode</label>
+        <description>Current operation mode (active mode) of the thermostat (read only)</description>
+        <state readOnly="true" >
+            <options>
+                <option value="AUTO">Auto</option>
+                <option value="MANUAL">Manual</option>
+                <option value="PROTECTION">Protection</option>
+                <option value="OFF">Off</option>
+            </options>
+        </state>
+    </channel-type>
+
+    <channel-type id="localMode">
+        <item-type>String</item-type>
+        <label>Local Mode</label>
+        <description>Local mode of the thermostat (read only)</description>
+        <state readOnly="true" >
+            <options>
+                <option value="3">+3</option>
+                <option value="2">+2</option>
+                <option value="1">+1</option>
+                <option value="NORMAL">Normal</option>
+                <option value="-1">-1</option>
+                <option value="-2">-2</option>
+                <option value="-3">-3</option>
+                <option value="PROTECTION">Protection</option>
+                <option value="OFF">Off</option>
+            </options>
+        </state>
+    </channel-type>
+
+
+    <channel-type id="setpointTemperature">
+        <!--  <item-type>Number:Temperature</item-type>  -->
+        <item-type>Number</item-type>
+        <label>Setpoint Temperature</label>
+        <description>Setpoint temperature (read/write)</description>
         <category>Temperature</category>
-        <state pattern="%.1f %unit%" step="0.5" />
+        <tags>
+            <tag>TargetTemperature</tag>
+        </tags>
+        <!--  <state pattern="%.1f %unit%" step="0.5" /> -->
+        <!--  <state pattern="%.1f" step="0.5" /> -->
     </channel-type>
 
-    <channel-type id="operationMode">
+    <channel-type id="setMode">
         <item-type>String</item-type>
-        <label>Mode</label>
-        <description>Current mode of the thermostat</description>
+        <label>Set Mode</label>
+        <description>Set mode of the thermostat from Central Unit/openHAB (read/write)</description>
         <state>
             <options>
-                <option value="HEAT">Heating</option>
-                <option value="COOL">Cooling</option>
+                <option value="AUTO">Auto</option>
                 <option value="MANUAL">Manual</option>
-                <option value="AUTO">Automatic</option>
+                <option value="PROTECTION">Protection</option>
                 <option value="OFF">Off</option>
             </options>
         </state>

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
@@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2
 Bundle-Name: OpenWebNet Binding
 Bundle-SymbolicName: org.openhab.binding.openwebnet;singleton:=true
 Bundle-Vendor: openHAB
-Bundle-Version: 2.4.0.b6
+Bundle-Version: 2.4.0.b7
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: 
  ., 
- lib/openwebnet-lib-0.9.7.jar
+ lib/openwebnet-lib-0.9.14.jar
 Import-Package: com.google.common.base,
  com.google.common.collect,
  gnu.io,