Fixes #1, added WHO=2 Automation, HMAC auth

mvalla · May 25, 2018 · 38d8ef8 · 38d8ef8
1 parent f4514eb
commit 38d8ef8
Show file tree

Hide file tree

Showing 20 changed files with 1,127 additions and 157 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</name>
+	<name>OpenWebNet Binding (beta5)</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/i18n/openwebnet.properties b/ESH-INF/i18n/openwebnet.properties
@@ -0,0 +1,14 @@
+# Config status messages
+#config-status.error.missing-ip-address-configuration=No IP address for the hue bridge has been provided.
+
+# Thing status descriptions
+offline.conf-error-no-ip-address = Cannot connect to BTicino bridge. No IP/host has been provided in configuration.
+offline.wrong-configuration = Invalid configuration. Check Thing configuration parameters.
+#offline.conf-error-no-username = Cannot connect to hue bridge. User name for authentication not available in configuration.
+#offline.conf-error-invalid-username = Authentication failed. Remove user name from configuration to generate a new one.
+#offline.conf-error-press-pairing-button = Not authenticated. Press pairing button on the hue bridge or set a valid user name in configuration.
+#offline.conf-error-creation-username = Failed to create new user on hue bridge.
+#offline.bridge-connection-lost = Hue bridge connection lost.
+#offline.conf-error-no-light-id = Light ID not available in configuration.
+#offline.light-not-reachable = Hue bridge reports light as not reachable.
+#offline.light-removed = Hue bridge reports light as removed.
diff --git a/ESH-INF/thing/Automation.xml b/ESH-INF/thing/Automation.xml
@@ -0,0 +1,44 @@
+<?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 Automation (BTicino xxx/xxx/...) -->
+	<thing-type id="automation">
+		<supported-bridge-type-refs>
+			<bridge-type-ref id="dongle" />
+		</supported-bridge-type-refs>
+
+		<label>OpenWebNet ZigBee Automation</label>
+		<description>A OpenWebNet ZigBee automation device to control roller shutters, blinds, etc. BTicino models: xxx/yyyy/etc.</description>
+
+		<channels>
+			<channel id="shutter" typeId="shutter" />
+		</channels>
+
+		<properties>
+			<property name="vendor">BTicino/Legrand</property>
+			<property name="model">BTI-xxxx/yyyy/etc.</property>
+			<property name="ownDeviceType">512</property>
+		</properties>
+
+		<config-description>
+			<parameter name="shutterRun" type="text">
+                <label>Shutter Run</label>
+                <description>Time (in ms) to go from max position (e.g. CLOSED) to the other position (e.g. OPEN). Example: 12000 (=12sec).
+                Use AUTO (default) to calibrate the shutter automatically (UP->DOWN->Position%) the first time a Position command (%) is sent.</description>
+                <required>true</required>
+                <default>AUTO</default>
+            </parameter>
+            <parameter name="where" type="text">
+				<label>OpenWebNet Device Address</label>
+                <description>It identifies one ZigBee device. Use decimal format address without the UNIT part and network: ZigBee WHERE=414122201#9 -> OpenWebNet Device Address = 4141222</description>
+				<required>true</required>
+			</parameter>
+		</config-description>
+
+	</thing-type>
+</thing:thing-descriptions>
+
+
diff --git a/ESH-INF/thing/BusAutomation.xml b/ESH-INF/thing/BusAutomation.xml
@@ -0,0 +1,39 @@
+<?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 Automation (BTicino xxx/xxx/...) -->
+	<thing-type id="bus_automation">
+		<supported-bridge-type-refs>
+			<bridge-type-ref id="bus_gateway" />
+		</supported-bridge-type-refs>
+		<label>OpenWebNet BUS Automation</label>
+		<description>A OpenWebNet BUS/SCS automation device to control roller shutters, blinds, etc. BTicino models: xxx/yyyy/etc.</description>
+		<channels>
+			<channel id="shutter" typeId="shutter" />
+		</channels>
+		<properties>
+			<property name="vendor">BTicino/Legrand</property>
+			<property name="model">BTI-xxxx/yyyy/etc.</property>
+			<property name="ownDeviceType">514</property>
+		</properties>
+		<config-description>
+			<parameter name="shutterRun" type="text">
+                <label>Shutter Run</label>
+                <description>Time (in ms) to go from max position (e.g. CLOSED) to the other position (e.g. OPEN). Example: 12000 (=12sec).
+                Use AUTO (default) to calibrate the shutter automatically (UP->DOWN->Position%) the first time a Position command (%) is sent.</description>
+                <required>true</required>
+                <default>AUTO</default>
+            </parameter>
+
+            <parameter name="where" type="text">
+				<label>OpenWebNet Device Address</label>
+				<description>Example: A/PL address: A=1 PL=1 --> WHERE=11. On local bus: WHERE=11#4#01</description>
+				<required>true</required>
+			</parameter>
+		</config-description>
+	</thing-type>
+</thing:thing-descriptions>
+
diff --git a/ESH-INF/thing/BusDimmer.xml b/ESH-INF/thing/BusDimmer.xml
@@ -11,7 +11,7 @@
 			<bridge-type-ref id="bus_gateway" />
 		</supported-bridge-type-refs>
 
-		<label>OpenWebNet BUS/SCS Dimmer</label>
+		<label>OpenWebNet BUS Dimmer</label>
 		<description>A OpenWebNet BUS/SCS dimmer for the dimmer control of 1 light. BTicino models: yyyy/zzzz/etc.</description>
 
         <channels>

diff --git a/ESH-INF/thing/BusGateway.xml b/ESH-INF/thing/BusGateway.xml
@@ -6,18 +6,19 @@
 
     <!-- OpenWebNet BUS gateway -->
     <bridge-type id="bus_gateway">
-        <label>OpenWebNet BUS/SCS Gateway</label>
-        <description><![CDATA[This thing allows to connect to a OpenWebNet BUS gateway (models: MH200N, F453, F454) using the OpenWebNet protocol]]></description>
+        <label>OpenWebNet BUS Gateway</label>
+        <description><![CDATA[This thing allows to connect to a OpenWebNet BUS/SCS gateway (models: F454, MyHOMEServer1, MH200N, F453, etc.) using the OpenWebNet protocol]]></description>
 
         <properties>
             <property name="vendor">BTicino</property>
-            <property name="model">MH200N, F453, F454, etc.</property> 
+            <property name="model">Unknown</property> 
             <property name="firmwareVersion"></property>
         </properties>
 
         <config-description>
 
             <parameter name="host" type="text">
+                <context>network-address</context>
                 <label>Host</label>
                 <description>OpenWebNet gateway IP address / hostname (example: 192.168.1.35)</description>
                 <required>true</required>
@@ -30,6 +31,7 @@
             </parameter>
 
             <parameter name="passwd" type="text">
+                <context>password-create</context>
                 <label>Password</label>
                 <description>OpenWebNet gateway password (default: 12345)</description>
                 <required>false</required>

diff --git a/ESH-INF/thing/BusOnOffSwitch.xml b/ESH-INF/thing/BusOnOffSwitch.xml
@@ -11,7 +11,7 @@
 			<bridge-type-ref id="bus_gateway" />
 		</supported-bridge-type-refs>
 
-		<label>OpenWebNet BUS/SCS On/Off Switch</label>
+		<label>OpenWebNet BUS Switch</label>
 		<description>A OpenWebNet BUS/SCS switch for the control of 1 light/load. BTicino models: xxx/yyyy/etc.</description>
 
         <channels>

diff --git a/ESH-INF/thing/OnOffSwitch.xml b/ESH-INF/thing/OnOffSwitch.xml
@@ -11,7 +11,7 @@
 			<bridge-type-ref id="dongle" />
 		</supported-bridge-type-refs>
 
-		<label>OpenWebNet ZigBee On/Off Switch</label>
+		<label>OpenWebNet ZigBee Switch</label>
 		<description>A OpenWebNet ZigBee switch (actuator) for the control of 1 load/light. BTicino models: 4591/3684/etc.</description>
 
         <channels>

diff --git a/ESH-INF/thing/OnOffSwitch2Units.xml b/ESH-INF/thing/OnOffSwitch2Units.xml
@@ -11,7 +11,7 @@
 			<bridge-type-ref id="dongle" />
 		</supported-bridge-type-refs>
 
-		<label>OpenWebNet ZigBee 2-units On/Off Switch</label>
+		<label>OpenWebNet ZigBee 2-units Switch</label>
 		<description>A OpenWebNet ZigBee 2-units switch (actuator) for the control of 2 loads/lights. BTicino model: 4592</description>
 
         <channels>

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: OpenWebNet Binding
+Bundle-Name: OpenWebNet Binding (beta5)
 Bundle-SymbolicName: org.openhab.binding.openwebnet;singleton:=true
 Bundle-Vendor: openHAB
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.3.0.b5
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: 
  ., 
- lib/openwebnet-lib-0.9.2-SNAPSHOT.jar
+ lib/openwebnet-lib-0.9.4.jar
 Import-Package: com.google.common.base,
  com.google.common.collect,
  gnu.io,
@@ -31,6 +31,6 @@ Service-Component: OSGI-INF/*.xml
 Export-Package: org.openhab.binding.openwebnet,
  org.openhab.binding.openwebnet.handler
 Bundle-ActivationPolicy: lazy
-COMMENT: comment the following line before release
-COMEMNT1: Require-Bundle: openwebnet-lib
+COMMENT: COMMENT the following line to release, UNCOMMENT for development
+COMMENT: Require-Bundle: openwebnet-lib