Skip to content

Commit

Permalink
Fixes #7
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvalla
mvalla committed Jul 1, 2018
1 parent 87bc71d commit c8e00c5
Show file tree
Hide file tree
Showing 29 changed files with 368 additions and 276 deletions.
4 changes: 2 additions & 2 deletions ESH-INF/binding/binding.xml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<binding:binding id="openwebnet"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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 (beta5)</name>
<name>OpenWebNet Binding (beta6)</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>
Expand Down
18 changes: 9 additions & 9 deletions ESH-INF/thing/Automation.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<bridge-type-ref id="dongle" />
</supported-bridge-type-refs>

<label>OpenWebNet ZigBee Automation</label>
<label>ZigBee Automation</label>
<description>A OpenWebNet ZigBee automation device to control roller shutters, blinds, etc. BTicino models: xxx/yyyy/etc.</description>

<channels>
Expand All @@ -25,15 +25,15 @@

<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>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>
<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>
Expand Down
22 changes: 11 additions & 11 deletions ESH-INF/thing/BusAutomation.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<supported-bridge-type-refs>
<bridge-type-ref id="bus_gateway" />
</supported-bridge-type-refs>
<label>OpenWebNet BUS Automation</label>
<label>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" />
Expand All @@ -21,16 +21,16 @@
</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>
<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 (WHERE)</label>
<description>Example: A/PL address: A=1 PL=3 --> WHERE=13. On local bus: WHERE=13#4#01</description>
<required>true</required>
</parameter>
</config-description>
Expand Down
36 changes: 18 additions & 18 deletions ESH-INF/thing/BusDimmer.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,26 @@
<bridge-type-ref id="bus_gateway" />
</supported-bridge-type-refs>

<label>OpenWebNet BUS Dimmer</label>
<label>BUS Dimmer</label>
<description>A OpenWebNet BUS/SCS dimmer for the dimmer control of 1 light. BTicino models: yyyy/zzzz/etc.</description>
<channels>
<channel id="brightness" typeId="brightness" />
</channels>

<channels>
<channel id="brightness" typeId="brightness" />
</channels>

<properties>
<property name="vendor">BTicino/Legrand</property>
<property name="model">BTI-yyyy/zzzz/etc.</property>
<property name="ownDeviceType">258</property>
</properties>
<config-description>
<parameter name="where" type="text">
<label>OpenWebNet Device Address (WHERE)</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>
<property name="vendor">BTicino/Legrand</property>
<property name="model">BTI-yyyy/zzzz/etc.</property>
<property name="ownDeviceType">258</property>
</properties>

<config-description>
<parameter name="where" type="text">
<label>OpenWebNet Device Address (WHERE)</label>
<description>Example: A/PL address: A=1 PL=3 --> WHERE=13. On local bus: WHERE=13#4#01</description>
<required>true</required>
</parameter>
</config-description>

</thing-type>
</thing:thing-descriptions>
76 changes: 38 additions & 38 deletions ESH-INF/thing/BusGateway.xml
View file
Original file line number Diff line number Diff line change
@@ -1,44 +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">
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">

<!-- OpenWebNet BUS gateway -->
<bridge-type id="bus_gateway">
<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>
<!-- OpenWebNet BUS gateway -->
<bridge-type id="bus_gateway">
<label>BUS Gateway</label>
<description><![CDATA[This thing allows to connect to a OpenWebNet BUS/SCS gateway (models: F454, MyHOMEServer1, F455, MH200N, F453, etc.) using the OpenWebNet protocol]]></description>

<properties>
<property name="vendor">BTicino</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>
</parameter>
<parameter name="port" type="integer">
<label>Port</label>
<description>OpenWebNet gateway port (default: 20000)</description>
<required>false</required>
</parameter>
<parameter name="passwd" type="text">
<context>password-create</context>
<label>Password</label>
<description>OpenWebNet gateway password (default: 12345)</description>
<required>false</required>
</parameter>
</config-description>
</bridge-type>
<properties>
<property name="vendor">BTicino</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>
</parameter>

<parameter name="port" type="integer">
<label>Port</label>
<description>OpenWebNet gateway port (default: 20000)</description>
<required>false</required>
</parameter>
<parameter name="passwd" type="text">
<context>password-create</context>
<label>Password</label>
<description>OpenWebNet gateway password (default: 12345)</description>
<required>false</required>
</parameter>

</config-description>

</bridge-type>

</thing:thing-descriptions>
30 changes: 15 additions & 15 deletions ESH-INF/thing/BusOnOffSwitch.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,26 @@
<bridge-type-ref id="bus_gateway" />
</supported-bridge-type-refs>

<label>OpenWebNet BUS Switch</label>
<label>BUS Switch</label>
<description>A OpenWebNet BUS/SCS switch for the control of 1 light/load. BTicino models: xxx/yyyy/etc.</description>
<channels>
<channels>
<channel id="switch" typeId="switch" />
</channels>

<properties>
<property name="vendor">BTicino/Legrand</property>
<property name="model">BTI-xxxx/yyyy/etc.</property>
<property name="ownDeviceType">261</property>
</properties>
<config-description>
<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>
<property name="vendor">BTicino/Legrand</property>
<property name="model">BTI-xxxx/yyyy/etc.</property>
<property name="ownDeviceType">261</property>
</properties>
<config-description>
<parameter name="where" type="text">
<label>OpenWebNet Device Address (WHERE)</label>
<description>Example: A/PL address: A=1 PL=3 --> WHERE=13. On local bus: WHERE=13#4#01</description>
<required>true</required>
</parameter>
</config-description>

</thing-type>
</thing:thing-descriptions>
31 changes: 15 additions & 16 deletions ESH-INF/thing/Device.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,22 @@
<bridge-type-ref id="dongle" />
</supported-bridge-type-refs>

<label>OpenWebNet Generic Device</label>
<label>Generic Device</label>
<description>An OpenWebNet Generic Device.</description>


<properties>
<property name="vendor">BTicino/Legrand</property>
<property name="model">Unknown</property>
<property name="ownDeviceType">0</property>
</properties>

<config-description>
<parameter name="where" type="text">
<label>OpenWebNet Device Address</label>
<description>It identifies one OpenWebNet device</description>
<required>true</required>
</parameter>
</config-description>

<properties>
<property name="vendor">BTicino/Legrand</property>
<property name="model">Unknown</property>
<property name="ownDeviceType">0</property>
</properties>

<config-description>
<parameter name="where" type="text">
<label>OpenWebNet Device Address (WHERE)</label>
<description>It identifies one OpenWebNet device</description>
<required>true</required>
</parameter>
</config-description>

</thing-type>
</thing:thing-descriptions>
38 changes: 19 additions & 19 deletions ESH-INF/thing/Dimmer.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,27 @@
<bridge-type-ref id="dongle" />
</supported-bridge-type-refs>

<label>OpenWebNet ZigBee Dimmer</label>
<label>ZigBee Dimmer</label>
<description>A OpenWebNet ZigBee dimmer for the dimmer control of 1 light. BTicino models: 4585/4594/etc.</description>
<channels>
<channel id="brightness" typeId="brightness" />
<channel id="dimmerLevel" typeId="dimmerLevel" />
</channels>
<channels>
<channel id="brightness" typeId="brightness" />
<channel id="dimmerLevel" typeId="dimmerLevel" />
</channels>
<properties>
<property name="vendor">BTicino/Legrand</property>
<property name="model">BTI-4585/4594/etc.</property>
<property name="ownDeviceType">258</property>
</properties>
<config-description>
<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>
<property name="vendor">BTicino/Legrand</property>
<property name="model">BTI-4585/4594/etc.</property>
<property name="ownDeviceType">258</property>
</properties>
<config-description>
<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>
44 changes: 22 additions & 22 deletions ESH-INF/thing/Dongle.xml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<?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">
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">

<!-- OpenWebNet USB Dongle -->
<bridge-type id="dongle">
<label>OpenWebNet ZigBee USB Dongle</label>
<description><![CDATA[This gateway (BTicino/Legrand models: BTI-3578/088328) connects via USB to a BTicino/Legrand ZigBee network using the OpenWebNet protocol.<br>For more information see:<li>http://www.catalogue.bticino.com/BTI-3578-EN</li><li>http://ecatalogue.legrand.fr/088328-interface-open-radio-permet-piloter-installation.html</li>]]></description>
<!-- OpenWebNet USB Dongle -->
<bridge-type id="dongle">
<label>ZigBee USB Dongle</label>
<description><![CDATA[This gateway (BTicino/Legrand models: BTI-3578/088328) connects via USB to a BTicino/Legrand ZigBee network using the OpenWebNet protocol.<br>For more information see:<li>http://www.catalogue.bticino.com/BTI-3578-EN</li><li>http://ecatalogue.legrand.fr/088328-interface-open-radio-permet-piloter-installation.html</li>]]></description>

<properties>
<property name="vendor">BTicino/Legrand</property>
<property name="model">BTI-3578/088328</property>
<property name="firmwareVersion"></property>
</properties>
<config-description>
<parameter name="serialPort" type="text">
<label>serialPort</label>
<description>Serial port to which the USB dongle is connected. Example: COM3 (Win), /dev/ttyUSB0 (Linux), etc.</description>
<required>true</required>
</parameter>
</config-description>
</bridge-type>
<properties>
<property name="vendor">BTicino/Legrand</property>
<property name="model">BTI-3578/088328</property>
<property name="firmwareVersion"></property>
</properties>
<config-description>
<parameter name="serialPort" type="text">
<label>serialPort</label>
<description>Serial port to which the USB dongle is connected. Example: COM3 (Win), /dev/ttyUSB0 (Linux), etc.</description>
<required>true</required>
</parameter>
</config-description>

</bridge-type>

</thing:thing-descriptions>
Loading

0 comments on commit c8e00c5

Please sign in to comment.