diff --git a/ESH-INF/thing/_channels.xml b/ESH-INF/thing/_channels.xml
index 751e44109..8d8bf15da 100644
--- a/ESH-INF/thing/_channels.xml
+++ b/ESH-INF/thing/_channels.xml
@@ -645,14 +645,8 @@
Switch
- Switch the light on and off
- Light
-
-
-
-
-
-
+ Switch the power on and off
+ Switch
diff --git a/ESH-INF/thing/aeon_zw099_0_0.xml b/ESH-INF/thing/aeon_zw099_0_0.xml
index 59eba4fdc..fb0b2d4aa 100644
--- a/ESH-INF/thing/aeon_zw099_0_0.xml
+++ b/ESH-INF/thing/aeon_zw099_0_0.xml
@@ -8,7 +8,7 @@
Overview
Turn the primary controller of Z-Wave network into inclusion mode, short press the product’s Action button that you can find on the product's housing.
Inclusion Information
1. Insert the Smart Dimmer to power socket, The RGB LED will be colorful gradient status. 2. Let the primary controller into inclusion mode (If you don’t know how to do this, refer to its manual). 3. Press the Action button. 4. If the inclusion success, Smart Dimmer LED will be solid. Otherwise, the LED will remain colorful gradient status, in which you need to repeat the process from step 2.
Exclusion Information
1. Insert the Smart Dimmer to power socket, The Smart Dimmer LED will be solid. 2. Let the primary controller into remove mode (If you don’t know how to do this, refer to its manual). 3. Press the Action button. 4. If the remove is successful, Smart Dimmer LED will be colorful gradient status. If Smart Dimmer LED still be solid, please repeat the process from step 2.
+Smart Dimmer 6
Overview
Turn the primary controller of Z-Wave network into inclusion mode, short press the product’s Action button that you can find on the product's housing.
Endpoint 1 is used to Set/Get the state of output load.
Endpoint 2 is used to Set/Get the brightness level of RGB LED when it is in Night light mode.
Inclusion Information
1. Insert the Smart Dimmer to power socket, The RGB LED will be colorful gradient status. 2. Let the primary controller into inclusion mode (If you don’t know how to do this, refer to its manual). 3. Press the Action button. 4. If the inclusion success, Smart Dimmer LED will be solid. Otherwise, the LED will remain colorful gradient status, in which you need to repeat the process from step 2.
Exclusion Information
1. Insert the Smart Dimmer to power socket, The Smart Dimmer LED will be solid. 2. Let the primary controller into remove mode (If you don’t know how to do this, refer to its manual). 3. Press the Action button. 4. If the remove is successful, Smart Dimmer LED will be colorful gradient status. If Smart Dimmer LED still be solid, please repeat the process from step 2.
Aspire RF Accessory Switch Compatible
+
+
+ setup
+
+
+
+
+
+ The time in seconds the switch will delay when trigger the delayed off feature
+ 0
+
+
link
diff --git a/ESH-INF/thing/fibaro_fgd212_0_0.xml b/ESH-INF/thing/fibaro_fgd212_0_0.xml
index bb0457151..4a3e791b5 100644
--- a/ESH-INF/thing/fibaro_fgd212_0_0.xml
+++ b/ESH-INF/thing/fibaro_fgd212_0_0.xml
@@ -6,8 +6,8 @@
http://eclipse.org/smarthome/schemas/thing-description/v1.0.0">
-
- Fibaro Dimmer 2
+
+ Dimmer 2
diff --git a/ESH-INF/thing/fibaro_fgr221_0_0.xml b/ESH-INF/thing/fibaro_fgr221_0_0.xml
index 557bd016b..06934cb39 100644
--- a/ESH-INF/thing/fibaro_fgr221_0_0.xml
+++ b/ESH-INF/thing/fibaro_fgr221_0_0.xml
@@ -6,8 +6,8 @@
http://eclipse.org/smarthome/schemas/thing-description/v1.0.0">
-
- Fibaro FGR221 Roller Shutter Controller
+
+ Roller Shutter Controller
@@ -32,7 +32,7 @@
Fibaro SystemFGR221010F
- 0300:100A,0300:0106,0300:0104,0300:0107
+ 0300:0104,0300:0106,0300:0107,0300:100A1323
diff --git a/ESH-INF/thing/fibaro_fgrgbw_0_0.xml b/ESH-INF/thing/fibaro_fgrgbw_0_0.xml
index f78875274..656b69658 100644
--- a/ESH-INF/thing/fibaro_fgrgbw_0_0.xml
+++ b/ESH-INF/thing/fibaro_fgrgbw_0_0.xml
@@ -6,8 +6,8 @@
http://eclipse.org/smarthome/schemas/thing-description/v1.0.0">
-
- Fibaro RGBW Controller
+
+ RGBW Controller
@@ -84,7 +84,7 @@
Fibaro SystemFGRGBW010F
- 0900:1000,0900:2000,0900:4000,0900:3000
+ 0900:1000,0900:2000,0900:3000,0900:4000131getSupported=falsegetSupported=false
diff --git a/ESH-INF/thing/fibaro_fgrm222_0_0.xml b/ESH-INF/thing/fibaro_fgrm222_0_0.xml
index 8cadbccee..8844aec16 100644
--- a/ESH-INF/thing/fibaro_fgrm222_0_0.xml
+++ b/ESH-INF/thing/fibaro_fgrm222_0_0.xml
@@ -51,6 +51,7 @@
FGRM222010F0301:1001,0302:1000
+ 2.21163
diff --git a/ESH-INF/thing/fibaro_fgrm222_25_25.xml b/ESH-INF/thing/fibaro_fgrm222_25_25.xml
new file mode 100644
index 000000000..bbe48479e
--- /dev/null
+++ b/ESH-INF/thing/fibaro_fgrm222_25_25.xml
@@ -0,0 +1,263 @@
+
+
+
+
+
+ Roller Shutter
+
+
+
+
+
+
+ SWITCH_BINARY
+
+
+
+
+
+ SWITCH_MULTILEVEL,BASIC
+ SWITCH_MULTILEVEL,BASIC
+
+
+
+
+
+ SENSOR_MULTILEVEL;type=POWER
+
+
+
+
+
+ METER;type=E_W
+
+
+
+
+
+ METER;type=E_KWh
+
+
+
+
+
+
+ Fibaro System
+ FGRM222
+ 010F
+ 0302:1000
+ 25.25
+ 413
+ 3
+
+
+
+
+
+
+
+ setup
+
+
+
+
+
+ Parameters value shoud be set to 1 if the module operates in Venetian Blind mode.
+ 0
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+ In Venetian Blind mode (parameter 10 set to 2) the parameter determines time of full turn of the lamellas. In Gate Mode (parameter 10 set to 3 or 4) the parameter defines the delay time after which an open gate starts closing. Type range
+ 150
+
+
+
+
+ Parameter influences the lamellas positioning in venetian blind mode (parameter 10 set to 2)
+ 2
+
+
+
+
+
+
+
+
+
+ parameter settings are relevant for Roller Blind Mode and Venetian Blind Mode (parameter 10 set to 0, 1, 2).
+ 0
+
+
+
+
+
+
+
+
+
+ In roller blind mode or venetian blind mode (parameter 10 set to 0, 1, 2) the parameter determines when the Roller Shutter relays are turned off after reaching a limit switch. In Gate Mode (parameter 10 set to 3 or 4) the parameter determines a time perio
+ 10
+
+
+
+
+ Power threshold to be interpreted as reaching a limit switch.
+ 10
+
+
+
+
+ Time period for the motor to continue operation.
+ 10
+
+
+
+
+ Seting the parameter to 1 Roller Shutter enters the calibration mode. Parameter is only only relevant if a Roller Shutter is set to work in positioning mode (parameter 10 set to 1, 2 or 4).
+ 0
+
+
+
+
+
+
+
+
+ 2
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+
+
+ In Venetian Blind Mode (parameter 10 set to 2), the parameter determines how the lamellas will react upon alarm detection.
+ 1
+
+
+
+
+
+
+
+
+ Power level change that will result in new power value report being sent. value is a percentage of the previous report.
+ 10
+
+
+
+
+ Time to the next report. Value of 0 means the reports are turned off.
+ 3600
+
+
+
+
+ Energy level change which will result in new energy value report being sent. Value of 0 means the reports are turned off.
+ 10
+
+
+
+
+ Enables/disables to include the power and energy used by itself in reports to main controller.
+ 0
+
+
+
+
+
+
+
+
+ Parameter determines whether scenes or associations are activated by the switch keys.
+ 0
+
+
+
+
+
+
+
+
+ link
+
+
+
+
+
+ 16
+
+
+
+
+ 16
+
+
+
+
+
+
+
+
+
+
diff --git a/ESH-INF/thing/fibaro_fgs223_0_0.xml b/ESH-INF/thing/fibaro_fgs223_0_0.xml
new file mode 100644
index 000000000..1ca300638
--- /dev/null
+++ b/ESH-INF/thing/fibaro_fgs223_0_0.xml
@@ -0,0 +1,542 @@
+
+
+
+
+
+
Overview
FIBARO Switch 2 is designed to be installed in standard wall switch boxes or anywhere else where it is necessary to control electric devices. FIBARO Switch 2 allows to control connected devices either via the Z-Wave+ network or via a switch connected directly to it and is equipped with active power and energy consumption metering functionality.
Main features of FIBARO Switch 2:
Compatible with any Z-Wave or Z-Wave+ Controller,
Supports protected mode (Z-Wave network security mode) with
AES-128 encryption,
Advanced microprocessor control,
Active power and energy metering functionality,
Works with various types of switches – momentary, toggle, three-way, etc,
To be installed in wall switch boxes of dimensions allowing for installation, conforming to provisions of applicable regulations,
FIBARO Switch 2 is an extension unit.
Inclusion Information
Put controller into inclusion mode and triple click S1 switch
Exclusion Information
Put controller into exclusion mode and triple click S1 switch
This parameter defines how commands are sent in specified association groups: as secure or non-secure. Parameter is active only in Z-Wave network security mode. This parameter does not apply to 1st „Lifeline” group.
+ ]]>
+ 15
+
+
+
+
+
+
+
+
+
+
+
+
+
Overview
This parameter determines which actions result in sending scene IDs assigned to them
+ ]]>
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
Overview
This parameter determines which actions result in sending scene IDs assigned to them.
+ ]]>
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
Overview
This parameter determines which actions are ignored when sending commands to devices associated in 2nd and 3rd association group. All actions are active by default.
+ ]]>
+ 0
+
+
+
+
+
+
+
+
+
+
+
+ S1 switch - Switch ON value sent to 2nd and 3rd association groups
+ 255
+
+
+
+
+
Overview
This parameter defines value sent with Switch OFF command to devices associated in 2nd and 3rd association group.
+ ]]>
+ 0
+
+
+
+
+
Overview
This parameter defines value sent with Double Click command to devices associated in 2nd and 3rd association group.
+ ]]>
+ 99
+
+
+
+
+
Overview
This parameter determines which actions result in sending commands to devices associated in 4th and 5th association group. All actions are active by default.
+ ]]>
+ 0
+
+
+
+
+
+
+
+
+
+
+
+ S2 switch - Switch ON value sent to 4th and 5th association groups
+ 255
+
+
+
+
+ S2 switch - Switch OFF value sent to 4th and 5th association groups
+ 0
+
+
+
+
+ 99
+
+
+
+
+
Overview
This parameter determines how the device will react to General Alarm frame.
This parameter allows to set duration of flashing alarm mode.
Available settings: 1-32000 (1-32000s, 1s step) - duration
Default setting: 600 (10min)
+ ]]>
+ 600
+
+
+
+
+
Overview
This parameter determines the minimum change in consumed power that will result in sending new power report to the main controller.
Available settings:
0 - reports are disabled
1-100 (1-100%) - change in power
+ ]]>
+ 20
+
+
+
+
+
Overview
This parameter determines minimum time that has to elapse before sending new power report to the main controller.
Available settings:
0 - reports are disabled
1-120 (1-120s) - report interval
Default setting: 10 (10s)
+ ]]>
+ 10
+
+
+
+
+
Overview
This parameter determines minimum time that has to elapse before
sending new power report to the main controller.
Available settings:
0 - reports are disabled
1-32000 (0.01 - 320 kWh) - change in energy
Default: 100 (1 KWh)
+ ]]>
+ 100
+
+
+
+
+
Overview
This parameter determines the minimum change in consumed power that will result in sending new power report to the main controller.
Available settings:
0 - reports are disabled
1-100 (1-100%) - change in power
+ ]]>
+ 20
+
+
+
+
+
Overview
This parameter determines minimum time that has to elapse before sending new power report to the main controller.
Available settings:
0 - periodic reports are disabled
1-120 (1-120s) - report interval
Default setting: 10 (10s)
+ ]]>
+ 10
+
+
+
+
+
Overview
This parameter determines the minimum change in consumed energy that will result in sending new energy report to the main controller.
Available settings:
0 - reports are disabled
1-32000 (0.01 - 320 kWh) - change in energy
Default setting: 100 (1 KWh)
+ ]]>
+ 100
+
+
+
+
+
Overview
This parameter determines in what time interval the periodic power reports are sent to the main controller.
Available settings:
0 - periodic reports are disabled
1-32000 (1-32000s) - report interval
Default setting: 3600 (1h)
+ ]]>
+ 3600
+
+
+
+
+
Overview
This parameter determines in what time interval the periodic energy reports are sent to the main controller.
Available settings:
0 - periodic reports are disabled
1-32000 (1-32000s) - report interval
Default setting: 3600 (1h)
+ ]]>
+ 3600
+
+
+
+
+
Overview
This parameter determines whether energy metering should include the amount of energy consumed by the device itself. Results are being added to energy reports for first endpoint.
+ ]]>
+ 0
+
+
+
+
+
+
+
+
+ link
+
+
+
+
+
+
Overview
1st association group – “Lifeline” reports the device status and allows for assigning single device only (main controller by default).
+ ]]>
+
+
+
+
+
Overview
2nd association group – “On/Off (S1)” is assigned to switch connected to the S1 terminal (uses Basic command class).
+ ]]>
+ 5
+
+
+
+
+
Overview
“Dimmer (S1)” is assigned to switch connected to the S1 terminal (uses Switch Multilevel command class)
+ ]]>
+ 5
+
+
+
+
+
Overview
On/Off (S2) is assigned to switch connected to the S2 terminal (uses Basic command class)
+ ]]>
+ 5
+
+
+
+
+
Overview
Dimmer (S2) is assigned to switch connected to the S2 terminal (uses Switch Multilevel command class)
This Configuration is for the 1
- SWITCH_BINARY
+ SWITCH_BINARY,BASIC
- METER
+ METER;type=E_W
- METER
+ METER;type=E_KWh
diff --git a/ESH-INF/thing/linear_ws15z_0_0.xml b/ESH-INF/thing/linear_ws15z_0_0.xml
index b3303176a..dbbb9f41f 100644
--- a/ESH-INF/thing/linear_ws15z_0_0.xml
+++ b/ESH-INF/thing/linear_ws15z_0_0.xml
@@ -20,8 +20,8 @@
- SWITCH_MULTILEVEL
- SWITCH_MULTILEVEL
+ SWITCH_MULTILEVEL,BASIC
+ SWITCH_MULTILEVEL,BASIC
diff --git a/ESH-INF/thing/popp_123665_0_0.xml b/ESH-INF/thing/popp_123665_0_0.xml
index 8cdd5d2e8..2ec92e4ab 100644
--- a/ESH-INF/thing/popp_123665_0_0.xml
+++ b/ESH-INF/thing/popp_123665_0_0.xml
@@ -14,7 +14,7 @@
- SWITCH_BINARY
+ SWITCH_BINARY,BASIC
diff --git a/ESH-INF/thing/vision_zm1702_0_0.xml b/ESH-INF/thing/vision_zm1702_0_0.xml
new file mode 100644
index 000000000..d2ebe636b
--- /dev/null
+++ b/ESH-INF/thing/vision_zm1702_0_0.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
Overview
The ZM1702 is a Z-Wave controllable, single dead bolt lock. The mechanics can be adopted to right or left opening doors. The door lock can be applied for doors from a thickness of 38 mm and up. The door can be locked and unlocked using the inner side turn piece and/or the key pad. The wireless control allows to lock/unlock the lock, set/unset up to 15 different key codes (4 - 8 key long) and to limit the validity of certain key code.
Inclusion Information
Press Keypads 'C', '8', '8', '8' and manually turn the door lock from inside to be included.
Exclusion Information
Press Keypads 'C', '8', '8', '8' and manually turn the door lock from inside to be excluded.