diff --git a/bundles/org.openhab.binding.openwebnet/README.md b/bundles/org.openhab.binding.openwebnet/README.md index 36bead496..d51539c82 100644 --- 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 7b646831e..54e20a79f 100644 --- 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 9fcb938e2..31b5f3252 100644 --- 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 @@ - Example: alarm zone 2 --> where=2. + Example: alarm zone 2 --> where="2". 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 4eb2eb27a..c78d3e267 100644 --- 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 @@ - Example: A/PL address: A=1 PL=3 --> where=13. On local bus: where=13#4#01 + Example: A/PL address: A=1 PL=3 --> where="13". On local bus: where="13#4#01" 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 b31e25b67..e901d658d 100644 --- 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 @@ - Example: Where=1 + Example: AUX 1 --> where="1" 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 f3bb61f86..45dc8809d 100644 --- 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 @@ - Example: scenario control module address 53 --> where=53. On local bus: where=53#4#01 + Example: scenario control module address 53 --> where="53". On local bus: where="53#4#01" 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 8ad0c0f30..bcebc86de 100644 --- 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 @@ - Use 2+N[0-2047]. Example: scenario control 5 --> where=25 + Use 2+N[0-2047]. Example: scenario control 5 --> where="25" 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 8d4913913..1c2d3274e 100644 --- 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 @@ - Example: A/PL address: A=1 PL=3 --> where=13. On local bus: where=13#4#01 + Example: A/PL address: A=1 PL=3 --> where="13". On local bus: where="13#4#01" 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 db237c9ca..71e2fbd36 100644 --- 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 @@ - Example: A/PL address: A=1 PL=3 --> where=13. On local bus: where=13#4#01 + Example: A/PL address: A=1 PL=3 --> where="13". On local bus: where="13#4#01" 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 3bbeb964f..a13d32e03 100644 --- 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 @@ - 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 + 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" 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 208dc53e0..4dbc8bc78 100644 --- 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 @@ - Example: 5N with N=[1-255] + A "5" must be added before the energy meter address: 5N with N=[1-255]. Example energy meter "42" --> + where="542" 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 2e01ac03f..9b800e1dd 100644 --- 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 @@ - Example: A/PL address: A=1 PL=3 --> where=13. On local bus: where=13#4#01 + Example: A/PL address: A=1 PL=3 --> where="13". On local bus: where="13#4#01" 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 e0879bcc3..edcf2711d 100644 --- 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 @@ - For Thermo Central Unit 99-zones --> where=#0, for 4-zones --> where=#0#1 + For Thermo Central Unit 99-zones --> where="#0", for 4-zones --> where="#0#1" 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 75411e635..a80ea24cd 100644 --- 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 @@ - Example: sensor 3 of zone 2 --> where=302. Sensor 5 of external zone 00 --> where=500 + Example: sensor 3 of zone 2 --> where="302". Sensor 5 of external zone 00 --> where="500" 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 63d4c95b4..587e18afe 100644 --- 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 @@ - Example: zone 2 --> where=2. + Example: zone 2 --> where="2". 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 2ce69d876..7674f84d2 100644 --- 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 @@ - It identifies one Zigbee device. Example: 765432101#9 + It identifies one Zigbee device. Example: where="765432101#9" 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 d1580460e..226af4fb7 100644 --- 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 @@ - It identifies one Zigbee device. Example: 765432101#9 + It identifies one Zigbee device. Example: where="765432101#9" 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 41a5cd3fc..0d7be28e1 100644 --- 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 @@ - It identifies one Zigbee device. Example: 765432101#9 + It identifies one Zigbee device. Example: where="765432101#9" 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 4c795c689..4ecfa8a97 100644 --- 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 @@ - It identifies one Zigbee device. Example: 765432100#9 (use unit=00 at the end) + It identifies one Zigbee device. Example: where="765432100#9" (use unit=00 at the end) 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 779d9ebf1..d502160cb 100644 --- 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 @@ String - Set mode of the thermostat (read/write) + Set mode of the zone (read/write) - + + @@ -132,6 +133,7 @@ Set speed of the Fan Coil (read/write) + @@ -146,18 +148,18 @@ Conditioning Valves status (read only) - - + + - - - - - - - + + + + + + + @@ -168,18 +170,18 @@ Heating Valves status (read only) - - + + - - - - - - - + + + + + + + @@ -190,18 +192,18 @@ Actuators status (read only) - - + + - - - - - - - + + + + + + + @@ -212,8 +214,8 @@ Local knob status (read only) - - + + @@ -232,7 +234,7 @@ - + @@ -286,8 +288,8 @@ Central Unit Remote Control status (read only) - - + + @@ -298,8 +300,8 @@ Central Unit Battery status (read only) - - + + @@ -321,7 +323,7 @@ Switch - At least one probe in PROTECTION (Anti Freeze/Thermal Protection) indicator in Central Unit (read only) + At least one probe in PROTECTION (Antifreeze / Heat Protection) indicator in Central Unit (read only)