Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ This adapter allows to control the data points of the devices of a Zigbee2MQTT i
-->
### **WORK IN PROGRESS**

- (o0shojo0o) consideration of the description when creating the friendly name ([#105](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/105))
- (o0shojo0o) added state `effect` for groups ([#101](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/101))
- (o0shojo0o) fix state contact
- (o0shojo0o) added handling for disabled devices
Expand Down
4 changes: 4 additions & 0 deletions lib/deviceController.js
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,10 @@ class DeviceController {
for (const device of this.groupCache.concat(this.deviceCache)) {
let deviceName = device.id == device.ieee_address ? '' : device.id;

if (deviceName == '' && device.description) {
deviceName = device.description;
}

// Manipulate deviceName if the device is disabled, so the update of the device is triggered as well
if (device.disabled && device.disabled == true) {
deviceName = `[Disabled] ${deviceName}`;
Expand Down
2 changes: 2 additions & 0 deletions lib/exposes.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ function createDeviceFromExposes(devicesMessag, config) {
const definition = devicesMessag.definition;
const power_source = devicesMessag.power_source;
const disabled = devicesMessag.disabled && devicesMessag.disabled == true;
const description = devicesMessag.description ? devicesMessag.description : undefined;

function pushToStates(state, access) {
if (state === undefined) {
Expand Down Expand Up @@ -1006,6 +1007,7 @@ function createDeviceFromExposes(devicesMessag, config) {
ieee_address: ieee_address,
power_source: power_source,
disabled: disabled,
description: description,
states: states,
};

Expand Down
2 changes: 2 additions & 0 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ class Zigbee2mqtt extends core.Adapter {
case 'bridge/response/device/remove':
deviceController.processRemoveEvent(messageObj);
break;
case 'bridge/response/device/options':
break;
case 'bridge/extensions':
break;
case 'bridge/logging':
Expand Down