From 6753234e32c3d0afcc325154045f9d7dc33b90f0 Mon Sep 17 00:00:00 2001 From: Jacob Laursen Date: Sat, 17 Dec 2022 17:25:38 +0100 Subject: [PATCH] Fix Zigbee name stylization (#13954) Signed-off-by: Jacob Laursen --- .../OH-INF/i18n/draytonwiser.properties | 2 +- .../resources/OH-INF/thing/thing-types.xml | 2 +- bundles/org.openhab.binding.hue/README.md | 16 +++---- bundles/org.openhab.binding.miele/README.md | 4 +- .../org.openhab.binding.mielecloud/README.md | 2 +- bundles/org.openhab.binding.mihome/README.md | 2 +- .../org.openhab.binding.openwebnet/README.md | 44 +++++++++---------- .../internal/OpenWebNetBindingConstants.java | 10 ++--- .../OpenWebNetDeviceDiscoveryService.java | 2 +- .../discovery/UsbGatewayDiscoveryService.java | 20 ++++----- .../handler/OpenWebNetBridgeHandler.java | 8 ++-- .../config/OpenWebNetZigBeeBridgeConfig.java | 2 +- .../main/resources/OH-INF/binding/binding.xml | 2 +- .../OH-INF/i18n/openwebnet.properties | 32 +++++++------- .../resources/OH-INF/thing/ZBAutomation.xml | 6 +-- .../main/resources/OH-INF/thing/ZBDimmer.xml | 8 ++-- .../main/resources/OH-INF/thing/ZBGateway.xml | 8 ++-- .../resources/OH-INF/thing/ZBOnOffSwitch.xml | 6 +-- .../OH-INF/thing/ZBOnOffSwitch2Units.xml | 8 ++-- .../org.openhab.binding.plugwise/README.md | 10 ++--- .../handler/PlugwiseStickHandler.java | 4 +- .../main/resources/OH-INF/binding/binding.xml | 2 +- .../main/resources/OH-INF/config/config.xml | 4 +- .../resources/OH-INF/i18n/plugwise.properties | 10 ++--- .../resources/OH-INF/thing/circleplus.xml | 2 +- .../src/main/resources/OH-INF/thing/stick.xml | 2 +- .../org.openhab.binding.plugwiseha/README.md | 2 +- bundles/org.openhab.binding.tacmi/README.md | 2 +- bundles/org.openhab.binding.tradfri/README.md | 4 +- bundles/org.openhab.binding.wemo/README.md | 2 +- 30 files changed, 114 insertions(+), 114 deletions(-) diff --git a/bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/i18n/draytonwiser.properties b/bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/i18n/draytonwiser.properties index bcb9bdd506838..7b513230c4ab1 100644 --- a/bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/i18n/draytonwiser.properties +++ b/bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/i18n/draytonwiser.properties @@ -112,4 +112,4 @@ channel-type.draytonwiser.wiserBatteryLevel-channel.description = Current Batter channel-type.draytonwiser.wiserSignalStrength-channel.label = Signal Strength (Wiser) channel-type.draytonwiser.wiserSignalStrength-channel.description = The reported network signal strength channel-type.draytonwiser.zigbeeConnected-channel.label = Device Connected -channel-type.draytonwiser.zigbeeConnected-channel.description = Is the device still connected to the ZigBee network +channel-type.draytonwiser.zigbeeConnected-channel.description = Is the device still connected to the Zigbee network diff --git a/bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/thing/thing-types.xml index e87d7a6f85cdb..4ca3e766807f4 100644 --- a/bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.draytonwiser/src/main/resources/OH-INF/thing/thing-types.xml @@ -364,7 +364,7 @@ Switch - Is the device still connected to the ZigBee network + Is the device still connected to the Zigbee network diff --git a/bundles/org.openhab.binding.hue/README.md b/bundles/org.openhab.binding.hue/README.md index 9901dabb28f56..2986f1b2090e0 100644 --- a/bundles/org.openhab.binding.hue/README.md +++ b/bundles/org.openhab.binding.hue/README.md @@ -8,21 +8,21 @@ The integration happens through the Hue Bridge, which acts as an IP gateway to t ## Supported Things The Hue Bridge is required as a "bridge" for accessing any other Hue device. -It supports the ZigBee LightLink protocol as well as the upwards compatible ZigBee 3.0 protocol. +It supports the Zigbee Light Link protocol as well as the upwards compatible Zigbee 3.0 protocol. There are two types of Hue Bridges, generally referred to as v1 (the rounded version) and v2 (the squared version). Only noticeable difference between the two generation of bridges is the added support for Apple HomeKit in v2. Both bridges are fully supported by this binding. Almost all available Hue devices are supported by this binding. This includes not only the "Friends of Hue", but also products like the LivingWhites adapter. -Additionally, it is possible to use OSRAM Lightify devices as well as other ZigBee LightLink compatible products, including the IKEA TRÅDFRI lights (when updated). -Beside bulbs and luminaires the Hue binding also supports some ZigBee sensors. Currently only Hue specific sensors are tested successfully (Hue Motion Sensor and Hue Dimmer Switch). +Additionally, it is possible to use OSRAM Lightify devices as well as other Zigbee Light Link compatible products, including the IKEA TRÅDFRI lights (when updated). +Beside bulbs and luminaires the Hue binding also supports some Zigbee sensors. Currently only Hue specific sensors are tested successfully (Hue Motion Sensor and Hue Dimmer Switch). Please note that the devices need to be registered with the Hue Bridge before it is possible for this binding to use them. -The Hue binding supports all seven types of lighting devices defined for ZigBee LightLink ([see page 24, table 2](https://www.nxp.com/docs/en/user-guide/JN-UG-3091.pdf). +The Hue binding supports all seven types of lighting devices defined for Zigbee Light Link ([see page 24, table 2](https://www.nxp.com/docs/en/user-guide/JN-UG-3091.pdf). These are: -| Device type | ZigBee Device ID | Thing type | +| Device type | Zigbee Device ID | Thing type | |--------------------------|------------------|------------| | On/Off Light | 0x0000 | 0000 | | On/Off Plug-in Unit | 0x0010 | 0010 | @@ -46,13 +46,13 @@ The following matrix lists the capabilities (channels) for each type: | 0210 | X | | X | X | | 0220 | X | X | | X | -Beside bulbs and luminaires the Hue binding supports some ZigBee sensors. +Beside bulbs and luminaires the Hue binding supports some Zigbee sensors. Currently only Hue specific sensors are tested successfully (e.g. Hue Motion Sensor, Hue Dimmer Switch, Hue Tap, CLIP Sensor). The Hue Motion Sensor registers a `ZLLLightLevel` sensor (0106), a `ZLLPresence` sensor (0107) and a `ZLLTemperature` sensor (0302) in one device. The Hue CLIP Sensor saves scene states with status or flag for HUE rules. -They are presented by the following ZigBee Device ID and _Thing type_: +They are presented by the following Zigbee Device ID and _Thing type_: -| Device type | ZigBee Device ID | Thing type | +| Device type | Zigbee Device ID | Thing type | |-----------------------------|------------------|----------------| | Light Sensor | 0x0106 | 0106 | | Occupancy Sensor | 0x0107 | 0107 | diff --git a/bundles/org.openhab.binding.miele/README.md b/bundles/org.openhab.binding.miele/README.md index 08403d3219d5b..e0fa72c5581cb 100644 --- a/bundles/org.openhab.binding.miele/README.md +++ b/bundles/org.openhab.binding.miele/README.md @@ -2,14 +2,14 @@ This binding integrates Miele@home appliances. Miele@home allows controlling Miele appliances that are equipped with special communication modules. -There are devices that communicate through ZigBee and others that use WiFi. +There are devices that communicate through Zigbee and others that use WiFi. See [www.miele.de](https://www.miele.de) for the list of available appliances. ## Supported Things This binding requires the XGW3000 gateway from Miele as all integration with openHAB is done through this gateway. -While users with ZigBee-enabled Miele appliances usually own such a gateway, this is often not the case for people that have only WiFi-enabled appliances. +While users with Zigbee-enabled Miele appliances usually own such a gateway, this is often not the case for people that have only WiFi-enabled appliances. The types of appliances that are supported by this binding are: diff --git a/bundles/org.openhab.binding.mielecloud/README.md b/bundles/org.openhab.binding.mielecloud/README.md index 82750a3ab6d9d..eca75279f5b09 100644 --- a/bundles/org.openhab.binding.mielecloud/README.md +++ b/bundles/org.openhab.binding.mielecloud/README.md @@ -7,7 +7,7 @@ The latter can be requested from the [Miele Developer Portal](https://www.miele. ## Supported Things Most Miele appliances that directly connect to the cloud via a Wi-Fi module are supported. -Appliances connecting to the XGW3000 gateway via ZigBee are also supported when registered with the cloud account. +Appliances connecting to the XGW3000 gateway via Zigbee are also supported when registered with the cloud account. However they might be better supported by the [gateway-based Miele binding](https://www.openhab.org/addons/bindings/miele/). Depending on the age of your appliance the functionality of the binding might be limited. Appliances from recent generations will support all functionality. diff --git a/bundles/org.openhab.binding.mihome/README.md b/bundles/org.openhab.binding.mihome/README.md index 38b838266d60f..f71e732392e4e 100644 --- a/bundles/org.openhab.binding.mihome/README.md +++ b/bundles/org.openhab.binding.mihome/README.md @@ -1,7 +1,7 @@ # Xiaomi Mi Smart Home Binding This binding allows your openHAB to communicate with the Xiaomi Smart Home Suite. -It consists of devices communicating over a ZigBee network with a ZigBee - WiFi gateway. +It consists of devices communicating over a Zigbee network with a Zigbee - WiFi gateway. The devices are very affordable and you can get them from your favourite Chinese markets like [AliExpress](https://www.aliexpress.com/) or [GearBest](https://www.gearbest.com). The sensors run on a coin cell battery for over a year. diff --git a/bundles/org.openhab.binding.openwebnet/README.md b/bundles/org.openhab.binding.openwebnet/README.md index 42e3470d2ca45..c75c33c3ddf63 100644 --- a/bundles/org.openhab.binding.openwebnet/README.md +++ b/bundles/org.openhab.binding.openwebnet/README.md @@ -1,16 +1,16 @@ # OpenWebNet (BTicino/Legrand) Binding -This binding integrates BTicino / Legrand MyHOME® BUS and ZigBee wireless (MyHOME_Play®) devices using the [OpenWebNet](https://en.wikipedia.org/wiki/OpenWebNet) protocol. +This binding integrates BTicino / Legrand MyHOME® BUS and Zigbee wireless (MyHOME_Play®) devices using the [OpenWebNet](https://en.wikipedia.org/wiki/OpenWebNet) protocol. The binding supports: -- both wired BUS/SCS (MyHOME) and wireless setups (MyHOME ZigBee). The two networks can be configured simultaneously -- auto discovery of BUS/SCS IP and ZigBee USB gateways; auto discovery of devices +- both wired BUS/SCS (MyHOME) and wireless setups (MyHOME Zigbee). The two networks can be configured simultaneously +- auto discovery of BUS/SCS IP and Zigbee USB gateways; auto discovery of devices - commands from openHAB and feedback (events) from BUS/SCS and wireless network ![MyHOMEServer1 Gateway](doc/MyHOMEServer1_gateway.jpg) ![F454 Gateway](doc/F454_gateway.png) -![ZigBee USB Gateway](doc/USB_gateway.jpg) +![Zigbee USB Gateway](doc/USB_gateway.jpg) ## Supported Things @@ -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/BTI-3578-IT), also known as Legrand 088328 **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. @@ -49,13 +49,13 @@ The following Things and OpenWebNet `WHOs` are supported: | Dry Contact and IR Interfaces | `25` | `bus_dry_contact_ir` | Dry Contacts and IR Interfaces | Successfully tested: contact interfaces F428 and 3477; IR sensors: HC/HD/HS/L/N/NT4610 | | Energy Management | `18` | `bus_energy_meter` | Energy Management | Successfully tested: F520, F521. Partially tested: F522, F523 | -### For ZigBee (Radio) +### For Zigbee (Radio) | Category | WHO | Thing Type IDs | Description | Status | | -------------------- | :----: | :---------------------------------------------------: | :-------------------------------------------------------------------: | ------------------------------------ | -| Gateway Management | `13` | `zb_gateway` | ZigBee USB Gateway (models: BTI-3578 / LG 088328) | Tested: BTI-3578 and LG 088328 | -| Lighting | `1` | `zb_dimmer`, `zb_on_off_switch`, `zb_on_off_switch2u` | ZigBee dimmers, switches and 2-unit switches | Tested: BTI-4591, BTI-3584, BTI-4585 | -| Automation | `2` | `zb_automation` | ZigBee roller shutters | | +| Gateway Management | `13` | `zb_gateway` | Zigbee USB Gateway (models: BTI-3578 / LG 088328) | Tested: BTI-3578 and LG 088328 | +| Lighting | `1` | `zb_dimmer`, `zb_on_off_switch`, `zb_on_off_switch2u` | Zigbee dimmers, switches and 2-unit switches | Tested: BTI-4591, BTI-3584, BTI-4585 | +| Automation | `2` | `zb_automation` | Zigbee roller shutters | | ## Discovery @@ -78,9 +78,9 @@ Setting the parameter `discoveryByActivation=true` for a BUS gateway Thing makes If a device cannot be discovered automatically from Inbox it's always possible to add it manually, see [Configuring Devices](#configuring-devices). -### ZigBee Discovery +### Zigbee Discovery -- The ZigBee USB Gateway must be inserted in one of the USB ports of the openHAB computer before a discovery is started +- The Zigbee USB Gateway must be inserted in one of the USB ports of the openHAB computer before a discovery is started - _**IMPORTANT NOTE:**_ As for other openHAB bindings using the USB/serial ports, on Linux the `openhab` user must be member of the `dialout` group to be able to use USB/serial port; set the group with the following command: ```shell @@ -88,10 +88,10 @@ sudo usermod -a -G dialout openhab ``` - The user will need to logout and login to see the new group added. If you added your user to this group and still cannot get permission, reboot Linux to ensure the new group permission is attached to the `openhab` user. -- Once the ZigBee USB Gateway is added and online, a second Inbox Scan will discover devices connected to it. Because of the ZigBee radio network, device discovery will take ~40-60 sec. Be patient! -- Wireless devices must be part of the same ZigBee network of the ZigBee USB Gateway to discover them. Please refer to [this video by BTicino](https://www.youtube.com/watch?v=CoIgg_Xqhbo) to setup a ZigBee wireless network which includes the ZigBee USB Gateway -- Only powered wireless devices part of the same ZigBee network and within radio coverage of the ZigBee USB Gateway will be discovered. Unreachable or not powered devices will be discovered as _GENERIC_ devices and cannot be controlled -- Wireless control units cannot be discovered by the ZigBee USB Gateway and therefore are not supported +- Once the Zigbee USB Gateway is added and online, a second Inbox Scan will discover devices connected to it. Because of the Zigbee radio network, device discovery will take ~40-60 sec. Be patient! +- Wireless devices must be part of the same Zigbee network of the Zigbee USB Gateway to discover them. Please refer to [this video by BTicino](https://www.youtube.com/watch?v=CoIgg_Xqhbo) to setup a Zigbee wireless network which includes the Zigbee USB Gateway +- Only powered wireless devices part of the same Zigbee network and within radio coverage of the Zigbee USB Gateway will be discovered. Unreachable or not powered devices will be discovered as _GENERIC_ devices and cannot be controlled +- Wireless control units cannot be discovered by the Zigbee USB Gateway and therefore are not supported ## Thing Configuration @@ -110,14 +110,14 @@ Configuration parameters are: Alternatively the BUS/SCS Gateway thing can be configured using the `.things` file, see `openwebnet.things` example [below](#full-example). -### Configuring Wireless ZigBee USB Gateway +### Configuring Wireless Zigbee USB Gateway Configuration parameters are: -- `serialPort` : the serial port where the ZigBee USB Gateway is connected (`String`, _mandatory_) +- `serialPort` : the serial port where the Zigbee USB Gateway is connected (`String`, _mandatory_) - Examples: `/dev/ttyUSB0` (Linux/RaPi), `COM3` (Windows) -Alternatively the ZigBee USB Gateway thing can be configured using the `.things` file, see `openwebnet.things` example [below](#full-example). +Alternatively the Zigbee USB Gateway thing can be configured using the `.things` file, see `openwebnet.things` example [below](#full-example). ### Configuring Devices @@ -137,7 +137,7 @@ For any manually added device, you must configure: - energy meter F520/F521 numbered `1`: add `5` before --> `where="51"` - energy meter F522/F523 numbered `4`: add `7` before and `#0` after --> `where="74#0"` - alarm zone `2` --> `where="2"` - - example for ZigBee devices: `where=765432101#9`. The ID of the device (ADDR part) is usually written in hexadecimal on the device itself, for example `ID 0074CBB1`: convert to decimal (`7654321`) and add `01#9` at the end to obtain `where=765432101#9`. For 2-unit switch devices (`zb_on_off_switch2u`), last part should be `00#9`. + - example for Zigbee devices: `where=765432101#9`. The ID of the device (ADDR part) is usually written in hexadecimal on the device itself, for example `ID 0074CBB1`: convert to decimal (`7654321`) and add `01#9` at the end to obtain `where=765432101#9`. For 2-unit switch devices (`zb_on_off_switch2u`), last part should be `00#9`. #### Configuring Thermo @@ -210,7 +210,7 @@ OPEN command to execute: *5*8#134## | Channel Type ID (channel ID) | Applies to Thing Type IDs | Item Type | Description | Read/Write | |-----------------------------------------|---------------------------------------------------------------|---------------|-----------------------------------------------------------------------------------------------------------------------|:-----------:| -| `switch` or `switch_01`/`02` for ZigBee | `bus_on_off_switch`, `zb_on_off_switch`, `zb_on_off_switch2u` | Switch | To switch the device `ON` and `OFF` | R/W | +| `switch` or `switch_01`/`02` for Zigbee | `bus_on_off_switch`, `zb_on_off_switch`, `zb_on_off_switch2u` | Switch | To switch the device `ON` and `OFF` | R/W | | `brightness` | `bus_dimmer`, `zb_dimmer` | Dimmer | To adjust the brightness value (Percent, `ON`, `OFF`) | R/W | | `shutter` | `bus_automation` | Rollershutter | To activate roller shutters (`UP`, `DOWN`, `STOP`, Percent - [see Shutter position](#shutter-position)) | R/W | | `scenario`   | `bus_scenario_control` | String | Trigger channel for Basic scenario events [see possible values](#scenario-channels) | R (TRIGGER) | @@ -334,7 +334,7 @@ Bridge openwebnet:bus_gateway:mybridge "MyHOMEServer1" [ host="192.168.1.35", pa } ``` -ZigBee USB Gateway and things configuration - for radio devices: +Zigbee USB Gateway and things configuration - for radio devices: ```java Bridge openwebnet:zb_gateway:myZBgateway [ serialPort="COM3" ] { @@ -400,7 +400,7 @@ Switch iAlarm_Zone_3_State "Zone 3 state" ( String iAlarm_Zone_3_Alarm "Zone 3 alarm" (gAlarm) { channel="openwebnet:bus_alarm_zone:mybridge:Alarm_Zone_3:alarm" } ``` -Example items linked to OpenWebNet ZigBee devices: +Example items linked to OpenWebNet Zigbee devices: ```java Dimmer iDimmer "Dimmer [%.0f %%]" (gKitchen) [ "Lighting" ] { channel="openwebnet:zb_dimmer:myZBgateway:myZB_dimmer:brightness" } diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/OpenWebNetBindingConstants.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/OpenWebNetBindingConstants.java index 4b7f32ea392b4..d384c2080d8c7 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/OpenWebNetBindingConstants.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/OpenWebNetBindingConstants.java @@ -44,7 +44,7 @@ public class OpenWebNetBindingConstants { public static final String THING_LABEL_GENERIC_DEVICE = "GENERIC Device"; // bridges public static final ThingTypeUID THING_TYPE_ZB_GATEWAY = new ThingTypeUID(BINDING_ID, "zb_gateway"); - public static final String THING_LABEL_ZB_GATEWAY = "ZigBee USB Gateway"; + public static final String THING_LABEL_ZB_GATEWAY = "Zigbee USB Gateway"; public static final ThingTypeUID THING_TYPE_BUS_GATEWAY = new ThingTypeUID(BINDING_ID, "bus_gateway"); public static final String THING_LABEL_BUS_GATEWAY = "BUS Gateway"; // other thing types @@ -81,14 +81,14 @@ public class OpenWebNetBindingConstants { public static final String THING_LABEL_BUS_AUX = "Auxiliary"; // ZIGBEE public static final ThingTypeUID THING_TYPE_ZB_ON_OFF_SWITCH = new ThingTypeUID(BINDING_ID, "zb_on_off_switch"); - public static final String THING_LABEL_ZB_ON_OFF_SWITCH = "ZigBee Switch"; + public static final String THING_LABEL_ZB_ON_OFF_SWITCH = "Zigbee Switch"; public static final ThingTypeUID THING_TYPE_ZB_ON_OFF_SWITCH_2UNITS = new ThingTypeUID(BINDING_ID, "zb_on_off_switch2u"); - public static final String THING_LABEL_ZB_ON_OFF_SWITCH_2UNITS = "ZigBee 2-units Switch"; + public static final String THING_LABEL_ZB_ON_OFF_SWITCH_2UNITS = "Zigbee 2-units Switch"; public static final ThingTypeUID THING_TYPE_ZB_DIMMER = new ThingTypeUID(BINDING_ID, "zb_dimmer"); - public static final String THING_LABEL_ZB_DIMMER = "ZigBee Dimmer"; + public static final String THING_LABEL_ZB_DIMMER = "Zigbee Dimmer"; public static final ThingTypeUID THING_TYPE_ZB_AUTOMATION = new ThingTypeUID(BINDING_ID, "zb_automation"); - public static final String THING_LABEL_ZB_AUTOMATION = "ZigBee Automation"; + public static final String THING_LABEL_ZB_AUTOMATION = "Zigbee Automation"; // #SUPPORTED THINGS SETS // ## Generic diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/OpenWebNetDeviceDiscoveryService.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/OpenWebNetDeviceDiscoveryService.java index c14d30c4b70cc..a1a110314f1fb 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/OpenWebNetDeviceDiscoveryService.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/OpenWebNetDeviceDiscoveryService.java @@ -206,7 +206,7 @@ public void newDiscoveryResult(@Nullable Where where, OpenDeviceType deviceType, default: logger.warn("Device type {} is not supported, default to GENERIC device (WHERE={})", deviceType, where); if (where instanceof WhereZigBee) { - thingLabel = "ZigBee " + thingLabel; + thingLabel = "Zigbee " + thingLabel; } if (baseMsg != null) { deviceWho = baseMsg.getWho(); diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/UsbGatewayDiscoveryService.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/UsbGatewayDiscoveryService.java index f5d49e38a47d9..0744d04f0a82e 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/UsbGatewayDiscoveryService.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/discovery/UsbGatewayDiscoveryService.java @@ -44,9 +44,9 @@ import org.slf4j.LoggerFactory; /** - * The {@link UsbGatewayDiscoveryService} extends {@link AbstractDiscoveryService} to detect ZigBee USB gateways + * The {@link UsbGatewayDiscoveryService} extends {@link AbstractDiscoveryService} to detect Zigbee USB gateways * connected via serial port. The service will iterate over the available serial ports and open each one to test if a - * OpenWebNet ZigBee USB gateway is connected. On successful connection, a new DiscoveryResult is created. + * OpenWebNet Zigbee USB gateway is connected. On successful connection, a new DiscoveryResult is created. * * @author Massimo Valla - Initial contribution */ @@ -74,7 +74,7 @@ public class UsbGatewayDiscoveryService extends AbstractDiscoveryService impleme private boolean scanning; /** - * Constructs a new UsbGatewayDiscoveryService with the specified ZigBee USB Bridge ThingTypeUID + * Constructs a new UsbGatewayDiscoveryService with the specified Zigbee USB Bridge ThingTypeUID */ @Activate public UsbGatewayDiscoveryService(final @Reference SerialPortManager spm) { @@ -89,7 +89,7 @@ public UsbGatewayDiscoveryService(final @Reference SerialPortManager spm) { */ @Override protected void startScan() { - logger.debug("Started OpenWebNet ZigBee USB Gateway discovery scan"); + logger.debug("Started OpenWebNet Zigbee USB Gateway discovery scan"); removeOlderResults(getTimestampOfLastScan()); scanning = true; Stream portEnum = serialPortManager.getIdentifiers(); @@ -103,7 +103,7 @@ protected void startScan() { logger.debug("[{}] serial port is owned by: {}", currentScannedPortName, portIdentifier.getCurrentOwner()); } else { - logger.debug("[{}] trying to connect to a ZigBee USB Gateway...", currentScannedPortName); + logger.debug("[{}] trying to connect to a Zigbee USB Gateway...", currentScannedPortName); USBGateway gw = new USBGateway(currentScannedPortName); zbGateway = gw; gw.subscribe(this); @@ -117,7 +117,7 @@ protected void startScan() { gw.connect(); portCheckLatch.await(); } catch (OWNException e) { - logger.debug("[{}] OWNException while trying to connect to a ZigBee USB Gateway: {}", + logger.debug("[{}] OWNException while trying to connect to a Zigbee USB Gateway: {}", currentScannedPortName, e.getMessage()); cancelConnectTimeout(); endGwConnection(); @@ -141,7 +141,7 @@ protected synchronized void stopScan() { endGwConnection(); portCheckLatch.countDown(); super.stopScan(); - logger.debug("Stopped OpenWebNet ZigBee USB Gateway discovery scan"); + logger.debug("Stopped OpenWebNet Zigbee USB Gateway discovery scan"); } /** @@ -166,7 +166,7 @@ private void cancelConnectTimeout() { } /** - * Create and notify a new ZigBee USB Gateway thing has been discovered + * Create and notify a new Zigbee USB Gateway thing has been discovered */ private void bridgeDiscovered() { USBGateway gw = zbGateway; @@ -182,7 +182,7 @@ private void bridgeDiscovered() { DiscoveryResult discoveryResult = DiscoveryResultBuilder.create(gatewayUID).withProperties(gwProperties) .withLabel(OpenWebNetBindingConstants.THING_LABEL_ZB_GATEWAY + " (" + gw.getSerialPortName() + ")") .withRepresentationProperty(OpenWebNetBindingConstants.PROPERTY_ZIGBEEID).build(); - logger.debug("--- ZigBee USB Gateway thing discovered: {} fw: {}", discoveryResult.getLabel(), + logger.debug("--- Zigbee USB Gateway thing discovered: {} fw: {}", discoveryResult.getLabel(), gw.getFirmwareVersion()); thingDiscovered(discoveryResult); } @@ -190,7 +190,7 @@ private void bridgeDiscovered() { @Override public void onConnected() { - logger.debug("[{}] found ZigBee USB Gateway", currentScannedPortName); + logger.debug("[{}] found Zigbee USB Gateway", currentScannedPortName); cancelConnectTimeout(); bridgeDiscovered(); endGwConnection(); diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetBridgeHandler.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetBridgeHandler.java index 33a47253e7914..d46fb7bf74bf3 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetBridgeHandler.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/OpenWebNetBridgeHandler.java @@ -162,14 +162,14 @@ public void initialize() { } /** - * Init a ZigBee gateway based on config + * Init a Zigbee gateway based on config */ private @Nullable OpenGateway initZigBeeGateway() { - logger.debug("Initializing ZigBee USB Gateway"); + logger.debug("Initializing Zigbee USB Gateway"); OpenWebNetZigBeeBridgeConfig zbBridgeConfig = getConfigAs(OpenWebNetZigBeeBridgeConfig.class); String serialPort = zbBridgeConfig.getSerialPort(); if (serialPort == null || serialPort.isEmpty()) { - logger.warn("Cannot connect ZigBee USB Gateway. No serial port has been provided in Bridge configuration."); + logger.warn("Cannot connect Zigbee USB Gateway. No serial port has been provided in Bridge configuration."); updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, "@text/offline.conf-error-no-serial-port"); return null; @@ -539,7 +539,7 @@ public void onConnected() { return; } if (gw instanceof USBGateway) { - logger.info("---- CONNECTED to ZigBee USB gateway bridge '{}' (serialPort: {})", thing.getUID(), + logger.info("---- CONNECTED to Zigbee USB gateway bridge '{}' (serialPort: {})", thing.getUID(), ((USBGateway) gw).getSerialPortName()); } else { logger.info("---- CONNECTED to BUS gateway bridge '{}' ({}:{})", thing.getUID(), diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/config/OpenWebNetZigBeeBridgeConfig.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/config/OpenWebNetZigBeeBridgeConfig.java index dc69e987c368e..596086aa51241 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/config/OpenWebNetZigBeeBridgeConfig.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/handler/config/OpenWebNetZigBeeBridgeConfig.java @@ -16,7 +16,7 @@ import org.eclipse.jdt.annotation.Nullable; /** - * ZigBee USB Bridge configuration object + * Zigbee USB Bridge configuration object * * @author Massimo Valla - Initial contribution * diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/binding/binding.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/binding/binding.xml index bed09cb061079..b40756f0d8876 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/binding/binding.xml +++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/binding/binding.xml @@ -5,6 +5,6 @@ OpenWebNet (BTicino/Legrand) Binding The OpenWebNet Binding integrates the BTicino/Legrand 'MyHOME' connected home system using the OpenWebNet - protocol. It supports BUS (SCS) and ZigBee USB gateways and devices. + protocol. It supports BUS (SCS) and Zigbee USB gateways and devices. 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 562ca3eaa79b1..ad9d91eb2b12a 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 @@ -1,7 +1,7 @@ # binding binding.openwebnet.name = OpenWebNet (BTicino/Legrand) Binding -binding.openwebnet.description = The OpenWebNet Binding integrates the BTicino/Legrand 'MyHOME' connected home system using the OpenWebNet protocol. It supports BUS (SCS) and ZigBee USB gateways and devices. +binding.openwebnet.description = The OpenWebNet Binding integrates the BTicino/Legrand 'MyHOME' connected home system using the OpenWebNet protocol. It supports BUS (SCS) and Zigbee USB gateways and devices. # thing types @@ -37,16 +37,16 @@ thing-type.openwebnet.bus_thermo_zone.label = Thermo Zone thing-type.openwebnet.bus_thermo_zone.description = An OpenWebNet BUS/SCS configured thermo zone (managed via Central Unit or stand alone). thing-type.openwebnet.generic_device.label = Generic Device thing-type.openwebnet.generic_device.description = An OpenWebNet Generic Device. -thing-type.openwebnet.zb_automation.label = ZigBee Automation -thing-type.openwebnet.zb_automation.description = An OpenWebNet ZigBee automation device to control roller shutters, blinds, etc. BTicino models: xxx/yyyy/etc. -thing-type.openwebnet.zb_dimmer.label = ZigBee Dimmer -thing-type.openwebnet.zb_dimmer.description = An OpenWebNet ZigBee dimmer for the dimmer control of 1 light. BTicino models: 4585/4594/etc. -thing-type.openwebnet.zb_gateway.label = ZigBee USB Gateway -thing-type.openwebnet.zb_gateway.description = This USB gateway (BTicino/Legrand models: BTI-3578/088328) connects to a BTicino/Legrand ZigBee network and uses the OpenWebNet protocol. For more information see: https://catalogo.bticino.it/BTI-3578-IT and https://www.legrand.com/ecatalogue/088328-openweb-net-zigbee-gateway-radio-interface.html -thing-type.openwebnet.zb_on_off_switch.label = ZigBee Switch -thing-type.openwebnet.zb_on_off_switch.description = An OpenWebNet ZigBee switch (actuator) for the control of 1 load/light. BTicino models: 4591/3684/etc. -thing-type.openwebnet.zb_on_off_switch2u.label = ZigBee 2-units Switch -thing-type.openwebnet.zb_on_off_switch2u.description = An OpenWebNet ZigBee 2-units switch (actuator) for the control of 2 loads/lights. BTicino model: 4592 +thing-type.openwebnet.zb_automation.label = Zigbee Automation +thing-type.openwebnet.zb_automation.description = An OpenWebNet Zigbee automation device to control roller shutters, blinds, etc. BTicino models: xxx/yyyy/etc. +thing-type.openwebnet.zb_dimmer.label = Zigbee Dimmer +thing-type.openwebnet.zb_dimmer.description = An OpenWebNet Zigbee dimmer for the dimmer control of 1 light. BTicino models: 4585/4594/etc. +thing-type.openwebnet.zb_gateway.label = Zigbee USB Gateway +thing-type.openwebnet.zb_gateway.description = This USB gateway (BTicino/Legrand models: BTI-3578/088328) connects to a BTicino/Legrand Zigbee network and uses the OpenWebNet protocol. For more information see: https://catalogo.bticino.it/BTI-3578-IT and https://www.legrand.com/ecatalogue/088328-openweb-net-zigbee-gateway-radio-interface.html +thing-type.openwebnet.zb_on_off_switch.label = Zigbee Switch +thing-type.openwebnet.zb_on_off_switch.description = An OpenWebNet Zigbee switch (actuator) for the control of 1 load/light. BTicino models: 4591/3684/etc. +thing-type.openwebnet.zb_on_off_switch2u.label = Zigbee 2-units Switch +thing-type.openwebnet.zb_on_off_switch2u.description = An OpenWebNet Zigbee 2-units switch (actuator) for the control of 2 loads/lights. BTicino model: 4592 # thing types config @@ -99,15 +99,15 @@ thing-type.config.openwebnet.generic_device.where.description = It identifies on 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: 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: 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_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: 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: 765432100#9 (use unit=00 at the end) # channel types 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 d647cc394ce8c..2ce69d8765ebd 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 @@ -10,8 +10,8 @@ - - An OpenWebNet ZigBee automation device to control roller shutters, blinds, etc. BTicino models: + + An OpenWebNet Zigbee automation device to control roller shutters, blinds, etc. BTicino models: xxx/yyyy/etc. @@ -38,7 +38,7 @@ - It identifies one ZigBee device. Example: 765432101#9 + It identifies one Zigbee device. Example: 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 bbbf8f68a9c54..d1580460e900d 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 @@ -4,14 +4,14 @@ xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0" xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd"> - + - - An OpenWebNet ZigBee dimmer for the dimmer control of 1 light. BTicino models: 4585/4594/etc. + + An OpenWebNet Zigbee dimmer for the dimmer control of 1 light. BTicino models: 4585/4594/etc. @@ -28,7 +28,7 @@ - It identifies one ZigBee device. Example: 765432101#9 + It identifies one Zigbee device. Example: 765432101#9 diff --git a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBGateway.xml b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBGateway.xml index 132c7cb779e3a..5a82bbfbd182c 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBGateway.xml +++ b/bundles/org.openhab.binding.openwebnet/src/main/resources/OH-INF/thing/ZBGateway.xml @@ -4,10 +4,10 @@ xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0" xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd"> - + - - This USB gateway (BTicino/Legrand models: BTI-3578/088328) connects to a BTicino/Legrand ZigBee network + + This USB gateway (BTicino/Legrand models: BTI-3578/088328) connects to a BTicino/Legrand Zigbee network and uses the OpenWebNet protocol. For more information see: https://catalogo.bticino.it/BTI-3578-IT and https://www.legrand.com/ecatalogue/088328-openweb-net-zigbee-gateway-radio-interface.html @@ -24,7 +24,7 @@ serial-port false - Serial port where the OpenWebNet ZigBee USB Gateway is connected. Example: COM3 (Win), /dev/ttyUSB0 + Serial port where the OpenWebNet Zigbee USB Gateway is connected. Example: COM3 (Win), /dev/ttyUSB0 (Linux), etc. 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 07ed0c72f62d7..41a5cd3fcb286 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 @@ -10,8 +10,8 @@ - - An OpenWebNet ZigBee switch (actuator) for the control of 1 load/light. BTicino models: 4591/3684/etc. + + An OpenWebNet Zigbee switch (actuator) for the control of 1 load/light. BTicino models: 4591/3684/etc. @@ -28,7 +28,7 @@ - It identifies one ZigBee device. Example: 765432101#9 + It identifies one Zigbee device. Example: 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 f755795873e73..4c795c689cc1c 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 @@ -4,14 +4,14 @@ xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0" xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd"> - + - - An OpenWebNet ZigBee 2-units switch (actuator) for the control of 2 loads/lights. BTicino model: 4592 + + An OpenWebNet Zigbee 2-units switch (actuator) for the control of 2 loads/lights. BTicino model: 4592 @@ -29,7 +29,7 @@ - It identifies one ZigBee device. Example: 765432100#9 (use unit=00 at the end) + It identifies one Zigbee device. Example: 765432100#9 (use unit=00 at the end) diff --git a/bundles/org.openhab.binding.plugwise/README.md b/bundles/org.openhab.binding.plugwise/README.md index 0a4e805cf20f3..6d9bc055ddf9b 100644 --- a/bundles/org.openhab.binding.plugwise/README.md +++ b/bundles/org.openhab.binding.plugwise/README.md @@ -1,6 +1,6 @@ # Plugwise Binding -The Plugwise binding adds support to openHAB for [Plugwise](https://www.plugwise.com) ZigBee devices using the Stick. +The Plugwise binding adds support to openHAB for [Plugwise](https://www.plugwise.com) Zigbee devices using the Stick. Users should use the Plugwise Source software to define the network, reset devices or perform firmware upgrades. @@ -14,11 +14,11 @@ The binding supports the following Plugwise devices: | Device Type | Description | Thing Type | |-------------|------------------------------------------------------------------------------------------|------------| | Circle | A power outlet plug that provides energy measurement and switching control of appliances | circle | -| Circle+ | A special Circle that coordinates the ZigBee network and acts as network gateway | circleplus | +| Circle+ | A special Circle that coordinates the Zigbee network and acts as network gateway | circleplus | | Scan | A wireless motion (PIR) and light sensor | scan | | Sense | A wireless temperature and humidity sensor | sense | | Stealth | A Circle with a more compact form factor that can be built-in | stealth | -| Stick | A ZigBee USB controller that openHAB uses to communicate with the Circle+ | stick | +| Stick | A Zigbee USB controller that openHAB uses to communicate with the Circle+ | stick | | Switch | A wireless wall switch | switch | ## Discovery @@ -44,7 +44,7 @@ Similarly the MAC addresses of the Scan, Sense and Switch can also be obtained f | Configuration Parameter | Required | Default | Description | |-------------------------|----------|--------------|-----------------------------------------------------------------------------------| | serialPort | X | /dev/ttyUSB0 | The serial port of the Stick, e.g. "/dev/ttyUSB0" for Linux or "COM1" for Windows | -| messageWaitTime | | 150 | The time to wait between messages sent on the ZigBee network (in ms) | +| messageWaitTime | | 150 | The time to wait between messages sent on the Zigbee network (in ms) | To determine the serial port in Linux, insert the Stick, then execute the `dmesg` command. The last few lines of the output will contain the USB port of the Stick (e.g. `/dev/ttyUSB0`). @@ -60,7 +60,7 @@ To access the serial port of the Stick on Linux, the user running openHAB needs | powerStateChanging | | commandSwitching | Controls if the power state can be changed with commands or is always on/off (commandSwitching, alwaysOn or alwaysOff) | | suppliesPower | | false | Enables power production measurements (true or false) | | measurementInterval | | 60 | The energy measurement interval (in minutes) (5 to 60) | -| temporarilyNotInNetwork | | false | Stops searching for an unplugged device on the ZigBee network traffic (true or false) | +| temporarilyNotInNetwork | | false | Stops searching for an unplugged device on the Zigbee network traffic (true or false) | ### Scan diff --git a/bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/PlugwiseStickHandler.java b/bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/PlugwiseStickHandler.java index 5ec8ef8b55883..e36bb10a0c4a6 100644 --- a/bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/PlugwiseStickHandler.java +++ b/bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/handler/PlugwiseStickHandler.java @@ -60,8 +60,8 @@ * The {@link PlugwiseStickHandler} handles channel updates and commands for a Plugwise Stick device. *

*

- * The Stick is an USB ZigBee controller that communicates with the Circle+. It is a {@link Bridge} to the devices on a - * Plugwise ZigBee mesh network. + * The Stick is an USB Zigbee controller that communicates with the Circle+. It is a {@link Bridge} to the devices on a + * Plugwise Zigbee mesh network. *

* * @author Wouter Born, Karel Goderis - Initial contribution diff --git a/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/binding/binding.xml b/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/binding/binding.xml index ed5d0e6532d7d..e0b44b39dce9b 100644 --- a/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/binding/binding.xml +++ b/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/binding/binding.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="https://openhab.org/schemas/binding/v1.0.0 https://openhab.org/schemas/binding-1.0.0.xsd"> Plugwise Binding - Monitor and control Plugwise ZigBee devices using the Stick. Supported devices are the Circle, Circle+, + Monitor and control Plugwise Zigbee devices using the Stick. Supported devices are the Circle, Circle+, Scan, Sense, Stealth and Switch. diff --git a/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/config/config.xml b/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/config/config.xml index a39f90be73f77..a6d98f0ae6cfe 100644 --- a/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/config/config.xml +++ b/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/config/config.xml @@ -13,7 +13,7 @@ - The time to wait between messages sent on the ZigBee network (in ms) + The time to wait between messages sent on the Zigbee network (in ms) 150 ms @@ -67,7 +67,7 @@ - Stops searching for an unplugged device on the ZigBee network traffic + Stops searching for an unplugged device on the Zigbee network traffic false true diff --git a/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/i18n/plugwise.properties b/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/i18n/plugwise.properties index da4224918e0fb..62c4121eb81dc 100644 --- a/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/i18n/plugwise.properties +++ b/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/i18n/plugwise.properties @@ -1,6 +1,6 @@ # binding binding.plugwise.name = Plugwise Binding -binding.plugwise.description = Monitor and control Plugwise ZigBee devices using the Stick. Supported devices are the Circle, Circle+, Scan, Sense, Stealth and Switch. +binding.plugwise.description = Monitor and control Plugwise Zigbee devices using the Stick. Supported devices are the Circle, Circle+, Scan, Sense, Stealth and Switch. # bridge type configuration parameters @@ -8,7 +8,7 @@ bridge-type.config.plugwise.stick.serialPort.label = Serial port bridge-type.config.plugwise.stick.serialPort.description = The serial port of the Stick, e.g. "/dev/ttyUSB0" for Linux or "COM1" for Windows bridge-type.config.plugwise.stick.messageWaitTime.label = Message wait time -bridge-type.config.plugwise.stick.messageWaitTime.description = The time to wait between messages sent on the ZigBee network (in ms) +bridge-type.config.plugwise.stick.messageWaitTime.description = The time to wait between messages sent on the Zigbee network (in ms) # thing types @@ -16,7 +16,7 @@ thing-type.plugwise.circle.label = Plugwise Circle thing-type.plugwise.circle.description = A power outlet plug that provides energy measurement and switching control of appliances thing-type.plugwise.circleplus.label = Plugwise Circle+ -thing-type.plugwise.circleplus.description = A special Circle that coordinates the ZigBee network and acts as network gateway +thing-type.plugwise.circleplus.description = A special Circle that coordinates the Zigbee network and acts as network gateway thing-type.plugwise.scan.label = Plugwise Scan thing-type.plugwise.scan.description = A wireless motion (PIR) and light sensor @@ -28,7 +28,7 @@ thing-type.plugwise.stealth.label = Plugwise Stealth thing-type.plugwise.stealth.description = A Circle with a more compact form factor that can be built-in thing-type.plugwise.stick.label = Plugwise Stick -thing-type.plugwise.stick.description = A ZigBee USB controller used for communicating with the Circle+ +thing-type.plugwise.stick.description = A Zigbee USB controller used for communicating with the Circle+ thing-type.plugwise.switch.label = Plugwise Switch thing-type.plugwise.switch.description = A wireless wall switch @@ -51,7 +51,7 @@ thing-type.config.plugwise.relay.measurementInterval.label = Measurement interva thing-type.config.plugwise.relay.measurementInterval.description = The energy measurement interval (in minutes) thing-type.config.plugwise.relay.temporarilyNotInNetwork.label = Temporarily not in network -thing-type.config.plugwise.relay.temporarilyNotInNetwork.description = Stops searching for an unplugged device on the ZigBee network +thing-type.config.plugwise.relay.temporarilyNotInNetwork.description = Stops searching for an unplugged device on the Zigbee network thing-type.config.plugwise.relay.updateConfiguration.label = Update configuration thing-type.config.plugwise.relay.updateConfiguration.description = Stores if the device configuration is up to date (automatically enabled/disabled) diff --git a/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/thing/circleplus.xml b/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/thing/circleplus.xml index 65c729ca5081d..924329a789b34 100644 --- a/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/thing/circleplus.xml +++ b/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/thing/circleplus.xml @@ -9,7 +9,7 @@ - A special Circle that coordinates the ZigBee network and acts as network gateway + A special Circle that coordinates the Zigbee network and acts as network gateway diff --git a/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/thing/stick.xml b/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/thing/stick.xml index a26d54abf3c39..2ad730b6c3782 100644 --- a/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/thing/stick.xml +++ b/bundles/org.openhab.binding.plugwise/src/main/resources/OH-INF/thing/stick.xml @@ -6,7 +6,7 @@ - A ZigBee USB controller used for communicating with the Circle+ + A Zigbee USB controller used for communicating with the Circle+ macAddress diff --git a/bundles/org.openhab.binding.plugwiseha/README.md b/bundles/org.openhab.binding.plugwiseha/README.md index 434df6714c371..05db29bbfbe9f 100644 --- a/bundles/org.openhab.binding.plugwiseha/README.md +++ b/bundles/org.openhab.binding.plugwiseha/README.md @@ -1,7 +1,7 @@ # PlugwiseHA Binding The Plugwise Home Automation binding adds support to openHAB for the [Plugwise Home Automation ecosystem](https://www.plugwise.com/en_US/adam_zone_control). -This system is built around a gateway from Plugwise called the 'Adam' which incorporates a ZigBee controller to manage thermostatic radiator valves, room thermostats, floor heating pumps, et cetera. +This system is built around a gateway from Plugwise called the 'Adam' which incorporates a Zigbee controller to manage thermostatic radiator valves, room thermostats, floor heating pumps, et cetera. Users can manage and control this system either via a web app or a mobile phone app developed by Plugwise. The (web) app allows users to define heating zone's (e.g. rooms) and add radiator valves to those rooms to manage and control their heating irrespective of other rooms. diff --git a/bundles/org.openhab.binding.tacmi/README.md b/bundles/org.openhab.binding.tacmi/README.md index cfcbfd90b9ea1..c4e198c72e553 100644 --- a/bundles/org.openhab.binding.tacmi/README.md +++ b/bundles/org.openhab.binding.tacmi/README.md @@ -141,7 +141,7 @@ The behavior in detail: * `Default` (`0`): When the channel is 'read-only' the update-policy defaults to _On-Fetch_ . When the channel is linked to something that can be modified it defaults to _On-Change_ . * `On-Fetch` (`1`): This is the default for read-only values. This means the channel is updated every time the schema page is polled. Ideally for values you want to monitor and log into charts. -* `On-Change` (`2`): When channel values can be changed via OH it is better to only update the channel when the value changes. The binding will cache the previous value and only send an update when it changes to the previous known value. This is especially useful if you intend to link other things (like i.e. ZigBee or Shelly switches) to the TA via OH that can be controlled by different sources. This prevents unintended toggles or even toggle-loops. +* `On-Change` (`2`): When channel values can be changed via OH it is better to only update the channel when the value changes. The binding will cache the previous value and only send an update when it changes to the previous known value. This is especially useful if you intend to link other things (like i.e. Zigbee or Shelly switches) to the TA via OH that can be controlled by different sources. This prevents unintended toggles or even toggle-loops. ### TA C.M.I. CoE Connection diff --git a/bundles/org.openhab.binding.tradfri/README.md b/bundles/org.openhab.binding.tradfri/README.md index fda1384e6b580..0d758fa40d5b0 100644 --- a/bundles/org.openhab.binding.tradfri/README.md +++ b/bundles/org.openhab.binding.tradfri/README.md @@ -10,10 +10,10 @@ The TRÅDFRI controller and sensor devices currently cannot be observed right aw This makes it nearly impossible to trigger events for pressed buttons. We only can access some static data like the present status or battery level. -The thing type ids are defined according to the lighting devices defined for ZigBee LightLink ([see page 24, table 2](https://www.nxp.com/docs/en/user-guide/JN-UG-3091.pdf)). +The thing type ids are defined according to the lighting devices defined for Zigbee Light Link ([see page 24, table 2](https://www.nxp.com/docs/en/user-guide/JN-UG-3091.pdf)). These are: -| Device type | ZigBee Device ID | Thing type | +| Device type | Zigbee Device ID | Thing type | |---------------------------------|------------------|------------| | Dimmable Light | 0x0100 | 0100 | | Colour Temperature Light | 0x0220 | 0220 | diff --git a/bundles/org.openhab.binding.wemo/README.md b/bundles/org.openhab.binding.wemo/README.md index c0bf4b84dc490..18a376e3d14f1 100644 --- a/bundles/org.openhab.binding.wemo/README.md +++ b/bundles/org.openhab.binding.wemo/README.md @@ -1,7 +1,7 @@ # Belkin Wemo Binding This binding integrates the [Belkin WeMo Family](https://www.belkin.com/us/Products/c/home-automation/). -The integration happens either through the WeMo-Link bridge, which acts as an IP gateway to the ZigBee devices or through WiFi connection to standalone devices. +The integration happens either through the WeMo-Link bridge, which acts as an IP gateway to the Zigbee devices or through WiFi connection to standalone devices. ## Supported Things