[openwebnet] Binding documentation update for OH4 release (#15250)

Updated: README, `where` parameter description for Things and channels descriptions.
Added `AUTO` option for mode channel-type.
Added `OFF` option for speedFanCoil channel-type.
Updated default translations.

Signed-off-by: Massimo Valla <mvcode00@gmail.com>

diff --git a/bundles/org.openhab.binding.openwebnet/README.md b/bundles/org.openhab.binding.openwebnet/README.md
index 36bead496d92d4e6e322552501812b0c4f6d2fff..d51539c82b1bb31798a714754e2a4e8620cdb290 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/README.md
+++ b/bundles/org.openhab.binding.openwebnet/README.md
@@ -29,7 +29,7 @@ These gateways have been tested with the binding:
 [MH200N](https://www.homesystems-legrandgroup.com/home?p_p_id=it_smc_bticino_homesystems_search_AutocompletesearchPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_it_smc_bticino_homesystems_search_AutocompletesearchPortlet_journalArticleId=2469209&_it_smc_bticino_homesystems_search_AutocompletesearchPortlet_mvcPath=%2Fview_journal_article_content.jsp),
 [F453](https://www.homesystems-legrandgroup.com/home?p_p_id=it_smc_bticino_homesystems_search_AutocompletesearchPortlet&p_p_lifecycle=0&p_p_state=normal&p_p_mode=view&_it_smc_bticino_homesystems_search_AutocompletesearchPortlet_journalArticleId=2703566&_it_smc_bticino_homesystems_search_AutocompletesearchPortlet_mvcPath=%2Fview_journal_article_content.jsp),  etc.
 
-- **Zigbee USB Gateways**, such as [BTicino 3578](https://catalogo.bticino.it/BTI-3578-IT), also known as Legrand 088328
+- **Zigbee USB Gateways**, such as [BTicino 3578](https://catalogo.bticino.it/low_res/395950_501016_MQ00493_b_IT.pdf), also known as [Legrand 088328](https://assets.legrand.com/general/legrand-exp/pc/ex218001_412.pdf)
 
 **NOTE** The new BTicino Living Now® and Livinglight Smart® wireless systems are not supported by this binding as they do not use the OpenWebNet protocol.
 
@@ -148,7 +148,7 @@ Thermo zones can be configured defining a `bus_thermo_zone` Thing for each zone
 
 - the `where` configuration parameter (`OpenWebNet Address`):
   - example BUS/SCS zone `1` --> `where="1"`
-- the `standAlone` configuration parameter (`boolean`, default: `true`): identifies if the zone is managed or not by a Central Unit (4- or 99-zones). `standAlone=true` means no Central Unit is present in the system.
+- the `standAlone` configuration parameter (`boolean`, default: `true`): identifies if the zone is managed or not by a Central Unit (4- or 99-zones). `standAlone=true` means the zone is indipendent and no Central Unit is present in the system.
 
 Temperature sensors can be configured defining a `bus_thermo_sensor` Thing with the following parameters:
 
@@ -156,7 +156,7 @@ Temperature sensors can be configured defining a `bus_thermo_sensor` Thing with
   - example sensor `5` of external zone `00` --> `where="500"`
   - example: slave sensor `3` of zone `2` --> `where="302"`
 
-The (optional) Central Unit can be configured defining a `bus_themo_cu` Thing with the `where` configuration parameter (`OpenWebNet Address`) set to `where="#0"` for a 99-zone Central Unit or `where="#0#1"` for a 4-zone Central Unit.
+The (optional) Central Unit can be configured defining a `bus_themo_cu` Thing with the `where` configuration parameter (`OpenWebNet Address`) set to `where="#0"` for a 99-zone Central Unit or `where="#0#1"` for a 4-zone Central Unit configured as zone 1.
 
 ##### Thermo Central Unit integration missing points
 

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet.properties b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet.properties
index 7b646831e9fe608ecd50a6677c4321321c31afc1..54e20a79f317778a4cd52917d5650b7d2ce84348 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet.properties
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/i18n/openwebnet.properties
@@ -53,27 +53,27 @@ thing-type.openwebnet.zb_on_off_switch2u.description = An OpenWebNet Zigbee 2-un
 thing-type.config.openwebnet.bus_alarm_system.where.label = OpenWebNet Address (where)
 thing-type.config.openwebnet.bus_alarm_system.where.description = The alarm system has no where address (set where to 0 as default).
 thing-type.config.openwebnet.bus_alarm_zone.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.bus_alarm_zone.where.description = Example: alarm zone 2 --> where=2.
+thing-type.config.openwebnet.bus_alarm_zone.where.description = Example: alarm zone 2 --> where="2".
 thing-type.config.openwebnet.bus_automation.shutterRun.label = Shutter Run
 thing-type.config.openwebnet.bus_automation.shutterRun.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.
 thing-type.config.openwebnet.bus_automation.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.bus_automation.where.description = Example: A/PL address: A=1 PL=3 --> where=13. On local bus: where=13#4#01
+thing-type.config.openwebnet.bus_automation.where.description = Example: A/PL address: A=1 PL=3 --> where="13". On local bus: where="13#4#01"
 thing-type.config.openwebnet.bus_aux.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.bus_aux.where.description = Example: Where=1
+thing-type.config.openwebnet.bus_aux.where.description = Example: AUX 1 --> where="1"
 thing-type.config.openwebnet.bus_cen_scenario_control.buttons.label = Configured Buttons
 thing-type.config.openwebnet.bus_cen_scenario_control.buttons.description = List (comma separated) of buttons numbers [0-31] configured for this scenario device. Example: buttons=1,2,4
 thing-type.config.openwebnet.bus_cen_scenario_control.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.bus_cen_scenario_control.where.description = Example: A/PL address: A=1 PL=3 --> where=13. On local bus: where=13#4#01
+thing-type.config.openwebnet.bus_cen_scenario_control.where.description = Example: A/PL address: A=1 PL=3 --> where="13". On local bus: where="13#4#01"
 thing-type.config.openwebnet.bus_cenplus_scenario_control.buttons.label = Configured Buttons
 thing-type.config.openwebnet.bus_cenplus_scenario_control.buttons.description = List (comma separated) of buttons numbers [0-31] configured for this scenario device, example: buttons=1,2,4
 thing-type.config.openwebnet.bus_cenplus_scenario_control.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.bus_cenplus_scenario_control.where.description = Use 2+N[0-2047]. Example: scenario control 5 --> where=25
+thing-type.config.openwebnet.bus_cenplus_scenario_control.where.description = Use 2+N[0-2047]. Example: scenario control 5 --> where="25"
 thing-type.config.openwebnet.bus_dimmer.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.bus_dimmer.where.description = Example: A/PL address: A=1 PL=3 --> where=13. On local bus: where=13#4#01
+thing-type.config.openwebnet.bus_dimmer.where.description = Example: A/PL address: A=1 PL=3 --> where="13". On local bus: where="13#4#01"
 thing-type.config.openwebnet.bus_dry_contact_ir.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.bus_dry_contact_ir.where.description = Automation Dry Contacts (N=1-201): example N=60 --> where=360. Alarm Dry Contacts and IR sensors (Zone=1-9, N=1-9): example Zone=4, N=5 --> where=345
+thing-type.config.openwebnet.bus_dry_contact_ir.where.description = A "3" must be added before the address. Automation Dry Contacts 3N with N=[1-201]; example N=60 --> where="360". Alarm Dry Contacts and IR sensors 3ZN with Zone Z=[1-9], N=[1-9]; example Z=4, N=5 --> where="345"
 thing-type.config.openwebnet.bus_energy_meter.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.bus_energy_meter.where.description = Example: 5N with N=[1-255]
+thing-type.config.openwebnet.bus_energy_meter.where.description = A "5" must be added before the energy meter address: 5N with N=[1-255]. Example energy meter "42" --> where="542"
 thing-type.config.openwebnet.bus_gateway.dateTimeSynch.label = Date Time Synchronisation
 thing-type.config.openwebnet.bus_gateway.dateTimeSynch.description = Synchronise date and time of slave elements on the SCS BUS using openHAB timestamp (default: false)
 thing-type.config.openwebnet.bus_gateway.discoveryByActivation.label = Discovery By Activation
@@ -85,48 +85,48 @@ thing-type.config.openwebnet.bus_gateway.passwd.description = OpenWebNet gateway
 thing-type.config.openwebnet.bus_gateway.port.label = Port
 thing-type.config.openwebnet.bus_gateway.port.description = OpenWebNet gateway port (default: 20000)
 thing-type.config.openwebnet.bus_on_off_switch.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.bus_on_off_switch.where.description = Example: A/PL address: A=1 PL=3 --> where=13. On local bus: where=13#4#01
+thing-type.config.openwebnet.bus_on_off_switch.where.description = Example: A/PL address: A=1 PL=3 --> where="13". On local bus: where="13#4#01"
 thing-type.config.openwebnet.bus_scenario_control.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.bus_scenario_control.where.description = Example: scenario control module address 53 --> where=53. On local bus: where=53#4#01
+thing-type.config.openwebnet.bus_scenario_control.where.description = Example: scenario control module address 53 --> where="53". On local bus: where="53#4#01"
 thing-type.config.openwebnet.bus_thermo_cu.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.bus_thermo_cu.where.description = For Thermo Central Unit 99-zones --> where=#0, for 4-zones --> where=#0#1
+thing-type.config.openwebnet.bus_thermo_cu.where.description = For Thermo Central Unit 99-zones --> where="#0", for 4-zones --> where="#0#1"
 thing-type.config.openwebnet.bus_thermo_sensor.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.bus_thermo_sensor.where.description = Example: sensor 3 of zone 2 --> where=302. Sensor 5 of external zone 00 --> where=500
+thing-type.config.openwebnet.bus_thermo_sensor.where.description = Example: sensor 3 of zone 2 --> where="302". Sensor 5 of external zone 00 --> where="500"
 thing-type.config.openwebnet.bus_thermo_zone.standAlone.label = Stand-alone
 thing-type.config.openwebnet.bus_thermo_zone.standAlone.description = Distinguishes between a zone managed by a Central Unit (false) or stand-alone (true, default)
 thing-type.config.openwebnet.bus_thermo_zone.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.bus_thermo_zone.where.description = Example: zone 2 --> where=2.
+thing-type.config.openwebnet.bus_thermo_zone.where.description = Example: zone 2 --> where="2".
 thing-type.config.openwebnet.generic_device.where.label = OpenWebNet Address (where)
 thing-type.config.openwebnet.generic_device.where.description = It identifies one OpenWebNet device
 thing-type.config.openwebnet.zb_automation.shutterRun.label = Shutter Run
 thing-type.config.openwebnet.zb_automation.shutterRun.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.
 thing-type.config.openwebnet.zb_automation.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.zb_automation.where.description = It identifies one Zigbee device. Example: 765432101#9
+thing-type.config.openwebnet.zb_automation.where.description = It identifies one Zigbee device. Example: where="765432101#9"
 thing-type.config.openwebnet.zb_dimmer.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.zb_dimmer.where.description = It identifies one Zigbee device. Example: 765432101#9
+thing-type.config.openwebnet.zb_dimmer.where.description = It identifies one Zigbee device. Example: where="765432101#9"
 thing-type.config.openwebnet.zb_gateway.serialPort.label = Serial Port
 thing-type.config.openwebnet.zb_gateway.serialPort.description = Serial port where the OpenWebNet Zigbee USB Gateway is connected. Example: COM3 (Win), /dev/ttyUSB0 (Linux), etc.
 thing-type.config.openwebnet.zb_on_off_switch.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.zb_on_off_switch.where.description = It identifies one Zigbee device. Example: 765432101#9
+thing-type.config.openwebnet.zb_on_off_switch.where.description = It identifies one Zigbee device. Example: where="765432101#9"
 thing-type.config.openwebnet.zb_on_off_switch2u.where.label = OpenWebNet Address (where)
-thing-type.config.openwebnet.zb_on_off_switch2u.where.description = It identifies one Zigbee device. Example: 765432100#9 (use unit=00 at the end)
+thing-type.config.openwebnet.zb_on_off_switch2u.where.description = It identifies one Zigbee device. Example: where="765432100#9" (use unit=00 at the end)
 
 # channel types
 
 channel-type.openwebnet.actuators.label = Actuators Status
 channel-type.openwebnet.actuators.description = Actuators status (read only)
-channel-type.openwebnet.actuators.state.option.OFF = OFF
-channel-type.openwebnet.actuators.state.option.ON = ON
+channel-type.openwebnet.actuators.state.option.OFF = Off
+channel-type.openwebnet.actuators.state.option.ON = On
 channel-type.openwebnet.actuators.state.option.OPENED = Opened
 channel-type.openwebnet.actuators.state.option.CLOSED = Closed
 channel-type.openwebnet.actuators.state.option.STOP = Stop
-channel-type.openwebnet.actuators.state.option.OFF_FAN_COIL = OFF Fan Coil
-channel-type.openwebnet.actuators.state.option.ON_SPEED_1 = ON speed 1
-channel-type.openwebnet.actuators.state.option.ON_SPEED_2 = ON speed 2
-channel-type.openwebnet.actuators.state.option.ON_SPEED_3 = ON speed 3
-channel-type.openwebnet.actuators.state.option.OFF_SPEED_1 = OFF speed 1
-channel-type.openwebnet.actuators.state.option.OFF_SPEED_2 = OFF speed 2
-channel-type.openwebnet.actuators.state.option.OFF_SPEED_3 = OFF speed 3
+channel-type.openwebnet.actuators.state.option.OFF_FAN_COIL = Off Fan Coil
+channel-type.openwebnet.actuators.state.option.ON_SPEED_1 = On speed 1
+channel-type.openwebnet.actuators.state.option.ON_SPEED_2 = On speed 2
+channel-type.openwebnet.actuators.state.option.ON_SPEED_3 = On speed 3
+channel-type.openwebnet.actuators.state.option.OFF_SPEED_1 = Off speed 1
+channel-type.openwebnet.actuators.state.option.OFF_SPEED_2 = Off speed 2
+channel-type.openwebnet.actuators.state.option.OFF_SPEED_3 = Off speed 3
 channel-type.openwebnet.alarmBattery.label = Battery State
 channel-type.openwebnet.alarmBattery.description = Alarm system battery state (read only).
 channel-type.openwebnet.alarmBattery.state.option.OK = Ok
@@ -145,7 +145,7 @@ channel-type.openwebnet.atLeastOneProbeManual.description = At least one probe i
 channel-type.openwebnet.atLeastOneProbeOff.label = At least one probe OFF
 channel-type.openwebnet.atLeastOneProbeOff.description = At least one probe OFF indicator in Central Unit (read only)
 channel-type.openwebnet.atLeastOneProbeProtection.label = At least one probe in PROTECTION
-channel-type.openwebnet.atLeastOneProbeProtection.description = At least one probe in PROTECTION (Anti Freeze/Thermal Protection) indicator in Central Unit (read only)
+channel-type.openwebnet.atLeastOneProbeProtection.description = At least one probe in PROTECTION (Antifreeze / Heat Protection) indicator in Central Unit (read only)
 channel-type.openwebnet.aux.label = Auxiliary
 channel-type.openwebnet.aux.description = Controls an Auxiliary command (read/write)
 channel-type.openwebnet.aux.state.option.OFF = Off
@@ -161,8 +161,8 @@ channel-type.openwebnet.aux.state.option.RESET_BI = Reset bi
 channel-type.openwebnet.aux.state.option.RESET_TRI = Reset tri
 channel-type.openwebnet.batteryStatus.label = Battery Status
 channel-type.openwebnet.batteryStatus.description = Central Unit Battery status (read only)
-channel-type.openwebnet.batteryStatus.state.option.OK = OK
-channel-type.openwebnet.batteryStatus.state.option.KO = KO
+channel-type.openwebnet.batteryStatus.state.option.OK = Ok
+channel-type.openwebnet.batteryStatus.state.option.KO = Ko
 channel-type.openwebnet.brightness.label = Brightness
 channel-type.openwebnet.brightness.description = Control the brightness and switch the light ON and OFF (read/write)
 channel-type.openwebnet.cenButtonEvent.label = CEN Button Event
@@ -171,18 +171,18 @@ channel-type.openwebnet.cenPlusButtonEvent.label = CEN+ Button Event
 channel-type.openwebnet.cenPlusButtonEvent.description = Event corresponding to the button press (read only)
 channel-type.openwebnet.conditioningValves.label = Conditioning Valves
 channel-type.openwebnet.conditioningValves.description = Conditioning Valves status (read only)
-channel-type.openwebnet.conditioningValves.state.option.OFF = OFF
-channel-type.openwebnet.conditioningValves.state.option.ON = ON
+channel-type.openwebnet.conditioningValves.state.option.OFF = Off
+channel-type.openwebnet.conditioningValves.state.option.ON = On
 channel-type.openwebnet.conditioningValves.state.option.OPENED = Opened
 channel-type.openwebnet.conditioningValves.state.option.CLOSED = Closed
 channel-type.openwebnet.conditioningValves.state.option.STOP = Stop
-channel-type.openwebnet.conditioningValves.state.option.OFF_FAN_COIL = OFF Fan Coil
-channel-type.openwebnet.conditioningValves.state.option.ON_SPEED_1 = ON speed 1
-channel-type.openwebnet.conditioningValves.state.option.ON_SPEED_2 = ON speed 2
-channel-type.openwebnet.conditioningValves.state.option.ON_SPEED_3 = ON speed 3
-channel-type.openwebnet.conditioningValves.state.option.OFF_SPEED_1 = OFF speed 1
-channel-type.openwebnet.conditioningValves.state.option.OFF_SPEED_2 = OFF speed 2
-channel-type.openwebnet.conditioningValves.state.option.OFF_SPEED_3 = OFF speed 3
+channel-type.openwebnet.conditioningValves.state.option.OFF_FAN_COIL = Off Fan Coil
+channel-type.openwebnet.conditioningValves.state.option.ON_SPEED_1 = On speed 1
+channel-type.openwebnet.conditioningValves.state.option.ON_SPEED_2 = On speed 2
+channel-type.openwebnet.conditioningValves.state.option.ON_SPEED_3 = On speed 3
+channel-type.openwebnet.conditioningValves.state.option.OFF_SPEED_1 = Off speed 1
+channel-type.openwebnet.conditioningValves.state.option.OFF_SPEED_2 = Off speed 2
+channel-type.openwebnet.conditioningValves.state.option.OFF_SPEED_3 = Off speed 3
 channel-type.openwebnet.dryContactIR.label = Sensor
 channel-type.openwebnet.dryContactIR.description = Dry Contact Interface or IR Interface sensor movement (read only)
 channel-type.openwebnet.failureDiscovered.label = Failure Discovered
@@ -198,22 +198,22 @@ channel-type.openwebnet.functionCentralUnit.state.option.HEATING = Heating
 channel-type.openwebnet.functionCentralUnit.state.option.COOLING = Cooling
 channel-type.openwebnet.heatingValves.label = Heating Valves
 channel-type.openwebnet.heatingValves.description = Heating Valves status (read only)
-channel-type.openwebnet.heatingValves.state.option.OFF = OFF
-channel-type.openwebnet.heatingValves.state.option.ON = ON
+channel-type.openwebnet.heatingValves.state.option.OFF = Off
+channel-type.openwebnet.heatingValves.state.option.ON = On
 channel-type.openwebnet.heatingValves.state.option.OPENED = Opened
 channel-type.openwebnet.heatingValves.state.option.CLOSED = Closed
 channel-type.openwebnet.heatingValves.state.option.STOP = Stop
-channel-type.openwebnet.heatingValves.state.option.OFF_FAN_COIL = OFF Fan Coil
-channel-type.openwebnet.heatingValves.state.option.ON_SPEED_1 = ON speed 1
-channel-type.openwebnet.heatingValves.state.option.ON_SPEED_2 = ON speed 2
-channel-type.openwebnet.heatingValves.state.option.ON_SPEED_3 = ON speed 3
-channel-type.openwebnet.heatingValves.state.option.OFF_SPEED_1 = OFF speed 1
-channel-type.openwebnet.heatingValves.state.option.OFF_SPEED_2 = OFF speed 2
-channel-type.openwebnet.heatingValves.state.option.OFF_SPEED_3 = OFF speed 3
+channel-type.openwebnet.heatingValves.state.option.OFF_FAN_COIL = Off Fan Coil
+channel-type.openwebnet.heatingValves.state.option.ON_SPEED_1 = On speed 1
+channel-type.openwebnet.heatingValves.state.option.ON_SPEED_2 = On speed 2
+channel-type.openwebnet.heatingValves.state.option.ON_SPEED_3 = On speed 3
+channel-type.openwebnet.heatingValves.state.option.OFF_SPEED_1 = Off speed 1
+channel-type.openwebnet.heatingValves.state.option.OFF_SPEED_2 = Off speed 2
+channel-type.openwebnet.heatingValves.state.option.OFF_SPEED_3 = Off speed 3
 channel-type.openwebnet.localOffset.label = Local Offset
 channel-type.openwebnet.localOffset.description = Local knob status (read only)
-channel-type.openwebnet.localOffset.state.option.OFF = OFF
-channel-type.openwebnet.localOffset.state.option.PROTECTION = PROTECTION
+channel-type.openwebnet.localOffset.state.option.OFF = Off
+channel-type.openwebnet.localOffset.state.option.PROTECTION = Antifreeze / Heat Protection
 channel-type.openwebnet.localOffset.state.option.PLUS_3 = +3
 channel-type.openwebnet.localOffset.state.option.PLUS_2 = +2
 channel-type.openwebnet.localOffset.state.option.PLUS_1 = +1
@@ -222,14 +222,15 @@ channel-type.openwebnet.localOffset.state.option.MINUS_1 = -1
 channel-type.openwebnet.localOffset.state.option.MINUS_2 = -2
 channel-type.openwebnet.localOffset.state.option.MINUS_3 = -3
 channel-type.openwebnet.mode.label = Mode
-channel-type.openwebnet.mode.description = Set mode of the thermostat (read/write)
+channel-type.openwebnet.mode.description = Set mode of the zone (read/write)
 channel-type.openwebnet.mode.state.option.MANUAL = Manual
-channel-type.openwebnet.mode.state.option.PROTECTION = Protection
+channel-type.openwebnet.mode.state.option.PROTECTION = Antifreeze / Heat Protection
 channel-type.openwebnet.mode.state.option.OFF = Off
+channel-type.openwebnet.mode.state.option.AUTO = Automatic
 channel-type.openwebnet.modeCentralUnit.label = Central Unit Mode
 channel-type.openwebnet.modeCentralUnit.description = Set mode of the Central Unit (read/write)
 channel-type.openwebnet.modeCentralUnit.state.option.MANUAL = Manual
-channel-type.openwebnet.modeCentralUnit.state.option.PROTECTION = Protection
+channel-type.openwebnet.modeCentralUnit.state.option.PROTECTION = Antifreeze / Heat Protection
 channel-type.openwebnet.modeCentralUnit.state.option.OFF = Off
 channel-type.openwebnet.modeCentralUnit.state.option.WEEKLY = Weekly
 channel-type.openwebnet.modeCentralUnit.state.option.SCENARIO = Scenario
@@ -237,8 +238,8 @@ channel-type.openwebnet.power.label = Power
 channel-type.openwebnet.power.description = Current active power
 channel-type.openwebnet.remoteControl.label = Remote Control
 channel-type.openwebnet.remoteControl.description = Central Unit Remote Control status (read only)
-channel-type.openwebnet.remoteControl.state.option.DISABLED = DISABLED
-channel-type.openwebnet.remoteControl.state.option.ENABLED = ENABLED
+channel-type.openwebnet.remoteControl.state.option.DISABLED = Disabled
+channel-type.openwebnet.remoteControl.state.option.ENABLED = Enabled
 channel-type.openwebnet.scenarioEvent.label = Activated Scenario Event
 channel-type.openwebnet.scenarioEvent.description = Event corresponding to the number of Basic Scenario that has been activated (read only)
 channel-type.openwebnet.scenarioProgramCentralUnit.label = Scenario Program Number
@@ -265,6 +266,7 @@ channel-type.openwebnet.shutter.label = Roller Shutter
 channel-type.openwebnet.shutter.description = Control the roller shutter position (read/write)
 channel-type.openwebnet.speedFanCoil.label = Set Fan Speed
 channel-type.openwebnet.speedFanCoil.description = Set speed of the Fan Coil (read/write)
+channel-type.openwebnet.speedFanCoil.state.option.OFF = Off
 channel-type.openwebnet.speedFanCoil.state.option.AUTO = Auto
 channel-type.openwebnet.speedFanCoil.state.option.SPEED_1 = Fan speed 1
 channel-type.openwebnet.speedFanCoil.state.option.SPEED_2 = Fan speed 2

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusAlarmZone.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusAlarmZone.xml
index 9fcb938e2c9b517cc6d2383a57386ac98a8209dc..31b5f3252577b4b285df6d7e6cad679b419f4c6c 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusAlarmZone.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusAlarmZone.xml
@@ -32,7 +32,7 @@
                <config-description>
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>Example: alarm zone 2 --> where=2.</description>
+                               <description>Example: alarm zone 2 --> where="2".</description>
                        </parameter>
                </config-description>
 

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusAutomation.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusAutomation.xml
index 4eb2eb27aee791727ea5d69579020d739a5328dd..c78d3e267af6796df3f4ffc8b52404caa37674fb 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusAutomation.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusAutomation.xml
@@ -39,7 +39,7 @@
 
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>Example: A/PL address: A=1 PL=3 --> where=13. On local bus: where=13#4#01</description>
+                               <description>Example: A/PL address: A=1 PL=3 --> where="13". On local bus: where="13#4#01"</description>
                        </parameter>
                </config-description>
        </thing-type>

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusAux.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusAux.xml
index b31e25b67d854e8f264ef0ffdae906d912117659..e901d658d477f8a9b11e4ea6d1adb7b92d21d308 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusAux.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusAux.xml
@@ -26,7 +26,7 @@
                <config-description>
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>Example: Where=1</description>
+                               <description>Example: AUX 1 --> where="1"</description>
                        </parameter>
                </config-description>
 

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusBasicScenarioControl.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusBasicScenarioControl.xml
index f3bb61f867d8afbd7fbc450079239bd92ca98b97..45dc8809dc2a2751c0971c76c7bc50d0f6ec5ed9 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusBasicScenarioControl.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusBasicScenarioControl.xml
@@ -28,7 +28,7 @@
                <config-description>
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>Example: scenario control module address 53 --> where=53. On local bus: where=53#4#01</description>
+                               <description>Example: scenario control module address 53 --> where="53". On local bus: where="53#4#01"</description>
                        </parameter>
                </config-description>
 

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusCENPlusScenarioControl.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusCENPlusScenarioControl.xml
index 8ad0c0f30d4be7724f11b70d8a15e5b0798cf7e2..bcebc86de1501d1d9efbf1eb631976bfe3287de3 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusCENPlusScenarioControl.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusCENPlusScenarioControl.xml
@@ -31,7 +31,7 @@
                        </parameter>
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>Use 2+N[0-2047]. Example: scenario control 5 --> where=25</description>
+                               <description>Use 2+N[0-2047]. Example: scenario control 5 --> where="25"</description>
                        </parameter>
                </config-description>
 

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusCENScenarioControl.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusCENScenarioControl.xml
index 8d49139130f91003b2df7b66e05867762922ab1d..1c2d3274ee1d2ea6c45a06be1b959608ab57c63d 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusCENScenarioControl.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusCENScenarioControl.xml
@@ -31,7 +31,7 @@
                        </parameter>
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>Example: A/PL address: A=1 PL=3 --> where=13. On local bus: where=13#4#01</description>
+                               <description>Example: A/PL address: A=1 PL=3 --> where="13". On local bus: where="13#4#01"</description>
                        </parameter>
 
                </config-description>

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusDimmer.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusDimmer.xml
index db237c9caac72b697a9d8d99f313e521d9d01be7..71e2fbd3676746888e179e9b9279f6cd39ea0f24 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusDimmer.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusDimmer.xml
@@ -28,7 +28,7 @@
                <config-description>
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>Example: A/PL address: A=1 PL=3 --> where=13. On local bus: where=13#4#01</description>
+                               <description>Example: A/PL address: A=1 PL=3 --> where="13". On local bus: where="13#4#01"</description>
                        </parameter>
                </config-description>
 

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusDryContactIR.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusDryContactIR.xml
index 3bbeb964faaa10878bb86fd95d9ded2b6d730014..a13d32e0369d3a9a86731bdeed3535c17e7065be 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusDryContactIR.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusDryContactIR.xml
@@ -29,8 +29,9 @@
                <config-description>
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>Automation Dry Contacts (N=1-201): example N=60 --> where=360. Alarm Dry Contacts and IR sensors
-                                       (Zone=1-9, N=1-9): example Zone=4, N=5 --> where=345</description>
+                               <description>A "3" must be added before the address. Automation Dry Contacts 3N with N=[1-201]; example N=60 -->
+                                       where="360". Alarm Dry Contacts and IR sensors
+                                       3ZN with Zone Z=[1-9], N=[1-9]; example Z=4, N=5 --> where="345"</description>
                        </parameter>
                </config-description>
 

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusEnergyMeter.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusEnergyMeter.xml
index 208dc53e014f5a31a4d7f166a98849aa3972273b..4dbc8bc787b19ad5c086210f432aa84a469b31d7 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusEnergyMeter.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusEnergyMeter.xml
@@ -28,7 +28,8 @@
                <config-description>
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>Example: 5N with N=[1-255]</description>
+                               <description>A "5" must be added before the energy meter address: 5N with N=[1-255]. Example energy meter "42" -->
+                                       where="542"</description>
                        </parameter>
                </config-description>
 

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusOnOffSwitch.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusOnOffSwitch.xml
index 2e01ac03f858e18625f568fdc4267c845a00a692..9b800e1dd7ff9371e66d0683f49957dba9647f23 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusOnOffSwitch.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusOnOffSwitch.xml
@@ -28,7 +28,7 @@
                <config-description>
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>Example: A/PL address: A=1 PL=3 --> where=13. On local bus: where=13#4#01</description>
+                               <description>Example: A/PL address: A=1 PL=3 --> where="13". On local bus: where="13#4#01"</description>
                        </parameter>
                </config-description>
 

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusThermoCentralUnit.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusThermoCentralUnit.xml
index e0879bcc353118ae7417c17eb1d230cb62977026..edcf2711d3d0764c83fd0e7f236751f856bff54c 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusThermoCentralUnit.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusThermoCentralUnit.xml
@@ -40,7 +40,7 @@
                <config-description>
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>For Thermo Central Unit 99-zones --> where=#0, for 4-zones --> where=#0#1</description>
+                               <description>For Thermo Central Unit 99-zones --> where="#0", for 4-zones --> where="#0#1"</description>
                        </parameter>
 
                </config-description>

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusThermoSensor.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusThermoSensor.xml
index 75411e6353431d2a8c9d42e18cad44a792d3e347..a80ea24cda0670347dc393aea5108f40b80947fe 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusThermoSensor.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusThermoSensor.xml
@@ -28,7 +28,7 @@
                <config-description>
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>Example: sensor 3 of zone 2 --> where=302. Sensor 5 of external zone 00 --> where=500</description>
+                               <description>Example: sensor 3 of zone 2 --> where="302". Sensor 5 of external zone 00 --> where="500"</description>
                        </parameter>
                </config-description>
 

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusThermoZone.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusThermoZone.xml
index 63d4c95b46464f97f5df19c474647cbe7033f6aa..587e18afea7bf32881daf149f2efa1752440ad6e 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusThermoZone.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/BusThermoZone.xml
@@ -38,7 +38,7 @@
                <config-description>
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>Example: zone 2 --> where=2.</description>
+                               <description>Example: zone 2 --> where="2".</description>
                        </parameter>
 
                        <parameter name="standAlone" type="boolean">

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBAutomation.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBAutomation.xml
index 2ce69d8765ebd0c3c52f9887a6deabe475f5ca56..7674f84d28582b8583e9641f50423572d02e95b2 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBAutomation.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBAutomation.xml
@@ -38,7 +38,7 @@
                        </parameter>
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>It identifies one Zigbee device. Example: 765432101#9</description>
+                               <description>It identifies one Zigbee device. Example: where="765432101#9"</description>
                        </parameter>
                </config-description>
 

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBDimmer.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBDimmer.xml
index d1580460e900dba4cac5513f235b11801d3e641b..226af4fb71184f84e7116e882a5500955b353335 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBDimmer.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBDimmer.xml
@@ -28,7 +28,7 @@
                <config-description>
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>It identifies one Zigbee device. Example: 765432101#9</description>
+                               <description>It identifies one Zigbee device. Example: where="765432101#9"</description>
                        </parameter>
                </config-description>
 

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBOnOffSwitch.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBOnOffSwitch.xml
index 41a5cd3fcb286de526200a773b74a899a559cf11..0d7be28e1b5465830dac40a4ee89d777b56f58b7 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBOnOffSwitch.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBOnOffSwitch.xml
@@ -28,7 +28,7 @@
                <config-description>
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>It identifies one Zigbee device. Example: 765432101#9</description>
+                               <description>It identifies one Zigbee device. Example: where="765432101#9"</description>
                        </parameter>
                </config-description>
 

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBOnOffSwitch2Units.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBOnOffSwitch2Units.xml
index 4c795c689cc1ca69359564dd2593592598b37c70..4ecfa8a97cc98375f4a0c17448235888eca3005f 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBOnOffSwitch2Units.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBOnOffSwitch2Units.xml
@@ -29,7 +29,7 @@
                <config-description>
                        <parameter name="where" type="text" required="true">
                                <label>OpenWebNet Address (where)</label>
-                               <description>It identifies one Zigbee device. Example: 765432100#9 (use unit=00 at the end)</description>
+                               <description>It identifies one Zigbee device. Example: where="765432100#9" (use unit=00 at the end)</description>
                        </parameter>
                </config-description>
 

diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/channels.xml
index 779d9ebf1352eb1d71045499ed2d7ca906a3d235..d502160cb81815b0a9e325b24e65be0d30254ddd 100644 (file)
--- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/channels.xml
@@ -116,12 +116,13 @@
        <channel-type id="mode">
                <item-type>String</item-type>
                <label>Mode</label>
-               <description>Set mode of the thermostat (read/write)</description>
+               <description>Set mode of the zone (read/write)</description>
                <state>
                        <options>
                                <option value="MANUAL">Manual</option>
-                               <option value="PROTECTION">Protection</option>
+                               <option value="PROTECTION">Antifreeze / Heat Protection</option>
                                <option value="OFF">Off</option>
+                               <option value="AUTO">Automatic</option>
                        </options>
                </state>
        </channel-type>
@@ -132,6 +133,7 @@
                <description>Set speed of the Fan Coil (read/write)</description>
                <state>
                        <options>
+                               <option value="OFF">Off</option>
                                <option value="AUTO">Auto</option>
                                <option value="SPEED_1">Fan speed 1</option>
                                <option value="SPEED_2">Fan speed 2</option>
@@ -146,18 +148,18 @@
                <description>Conditioning Valves status (read only)</description>
                <state readOnly="true">
                        <options>
-                               <option value="OFF">OFF</option>
-                               <option value="ON">ON</option>
+                               <option value="OFF">Off</option>
+                               <option value="ON">On</option>
                                <option value="OPENED">Opened</option>
                                <option value="CLOSED">Closed</option>
                                <option value="STOP">Stop</option>
-                               <option value="OFF_FAN_COIL">OFF Fan Coil</option>
-                               <option value="ON_SPEED_1">ON speed 1</option>
-                               <option value="ON_SPEED_2">ON speed 2</option>
-                               <option value="ON_SPEED_3">ON speed 3</option>
-                               <option value="OFF_SPEED_1">OFF speed 1</option>
-                               <option value="OFF_SPEED_2">OFF speed 2</option>
-                               <option value="OFF_SPEED_3">OFF speed 3</option>
+                               <option value="OFF_FAN_COIL">Off Fan Coil</option>
+                               <option value="ON_SPEED_1">On speed 1</option>
+                               <option value="ON_SPEED_2">On speed 2</option>
+                               <option value="ON_SPEED_3">On speed 3</option>
+                               <option value="OFF_SPEED_1">Off speed 1</option>
+                               <option value="OFF_SPEED_2">Off speed 2</option>
+                               <option value="OFF_SPEED_3">Off speed 3</option>
                        </options>
                </state>
        </channel-type>
@@ -168,18 +170,18 @@
                <description>Heating Valves status (read only)</description>
                <state readOnly="true">
                        <options>
-                               <option value="OFF">OFF</option>
-                               <option value="ON">ON</option>
+                               <option value="OFF">Off</option>
+                               <option value="ON">On</option>
                                <option value="OPENED">Opened</option>
                                <option value="CLOSED">Closed</option>
                                <option value="STOP">Stop</option>
-                               <option value="OFF_FAN_COIL">OFF Fan Coil</option>
-                               <option value="ON_SPEED_1">ON speed 1</option>
-                               <option value="ON_SPEED_2">ON speed 2</option>
-                               <option value="ON_SPEED_3">ON speed 3</option>
-                               <option value="OFF_SPEED_1">OFF speed 1</option>
-                               <option value="OFF_SPEED_2">OFF speed 2</option>
-                               <option value="OFF_SPEED_3">OFF speed 3</option>
+                               <option value="OFF_FAN_COIL">Off Fan Coil</option>
+                               <option value="ON_SPEED_1">On speed 1</option>
+                               <option value="ON_SPEED_2">On speed 2</option>
+                               <option value="ON_SPEED_3">On speed 3</option>
+                               <option value="OFF_SPEED_1">Off speed 1</option>
+                               <option value="OFF_SPEED_2">Off speed 2</option>
+                               <option value="OFF_SPEED_3">Off speed 3</option>
                        </options>
                </state>
        </channel-type>
@@ -190,18 +192,18 @@
                <description>Actuators status (read only)</description>
                <state readOnly="true">
                        <options>
-                               <option value="OFF">OFF</option>
-                               <option value="ON">ON</option>
+                               <option value="OFF">Off</option>
+                               <option value="ON">On</option>
                                <option value="OPENED">Opened</option>
                                <option value="CLOSED">Closed</option>
                                <option value="STOP">Stop</option>
-                               <option value="OFF_FAN_COIL">OFF Fan Coil</option>
-                               <option value="ON_SPEED_1">ON speed 1</option>
-                               <option value="ON_SPEED_2">ON speed 2</option>
-                               <option value="ON_SPEED_3">ON speed 3</option>
-                               <option value="OFF_SPEED_1">OFF speed 1</option>
-                               <option value="OFF_SPEED_2">OFF speed 2</option>
-                               <option value="OFF_SPEED_3">OFF speed 3</option>
+                               <option value="OFF_FAN_COIL">Off Fan Coil</option>
+                               <option value="ON_SPEED_1">On speed 1</option>
+                               <option value="ON_SPEED_2">On speed 2</option>
+                               <option value="ON_SPEED_3">On speed 3</option>
+                               <option value="OFF_SPEED_1">Off speed 1</option>
+                               <option value="OFF_SPEED_2">Off speed 2</option>
+                               <option value="OFF_SPEED_3">Off speed 3</option>
                        </options>
                </state>
        </channel-type>
@@ -212,8 +214,8 @@
                <description>Local knob status (read only)</description>
                <state readOnly="true">
                        <options>
-                               <option value="OFF">OFF</option>
-                               <option value="PROTECTION">PROTECTION</option>
+                               <option value="OFF">Off</option>
+                               <option value="PROTECTION">Antifreeze / Heat Protection</option>
                                <option value="PLUS_3">+3</option>
                                <option value="PLUS_2">+2</option>
                                <option value="PLUS_1">+1</option>
@@ -232,7 +234,7 @@
                <state>
                        <options>
                                <option value="MANUAL">Manual</option>
-                               <option value="PROTECTION">Protection</option>
+                               <option value="PROTECTION">Antifreeze / Heat Protection</option>
                                <option value="OFF">Off</option>
                                <option value="WEEKLY">Weekly</option>
                                <option value="SCENARIO">Scenario</option>
@@ -286,8 +288,8 @@
                <description>Central Unit Remote Control status (read only)</description>
                <state readOnly="true">
                        <options>
-                               <option value="DISABLED">DISABLED</option>
-                               <option value="ENABLED">ENABLED</option>
+                               <option value="DISABLED">Disabled</option>
+                               <option value="ENABLED">Enabled</option>
                        </options>
                </state>
        </channel-type>
@@ -298,8 +300,8 @@
                <description>Central Unit Battery status (read only)</description>
                <state readOnly="true">
                        <options>
-                               <option value="OK">OK</option>
-                               <option value="KO">KO</option>
+                               <option value="OK">Ok</option>
+                               <option value="KO">Ko</option>
                        </options>
                </state>
        </channel-type>
@@ -321,7 +323,7 @@
        <channel-type id="atLeastOneProbeProtection" advanced="true">
                <item-type>Switch</item-type>
                <label>At least one probe in PROTECTION</label>
-               <description>At least one probe in PROTECTION (Anti Freeze/Thermal Protection) indicator in Central Unit (read only)</description>
+               <description>At least one probe in PROTECTION (Antifreeze / Heat Protection) indicator in Central Unit (read only)</description>
                <state readOnly="true"></state>
        </channel-type>