dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-07-02 10:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Marius Ciotlos
2018-06-06 22:19:50 +03:00
parent 0f2f7462a5
commit 9bc87b765a
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/controller.js
+16 -16
View File
@@ -162,7 +162,7 @@ class Controller {
getDeviceStartupLogMessage(device) {
let friendlyName = 'unknown';
let type = 'unknown';
let friendlyDevice = {model: 'unkown', description: 'unknown'};
let friendlyDevice = { model: 'unkown', description: 'unknown' };
const mappedModel = zigbeeShepherdConverters.findByZigbeeModel(device.modelId);
if (mappedModel) {
friendlyDevice = mappedModel;
@@ -309,20 +309,20 @@ class Controller {
});
this.mqtt.log('devices', devices);
} else if (option === 'remove'){
if(message.toString() !== null && message.toString() !== '' && message.toString().length > 0) {
const deviceID = Object.keys(settings.get().devices).find((id) =>
settings.getDevice(id).friendly_name === message.toString()
);
if (!deviceID) {
logger.error(`Cannot handle '${topic}' because deviceID of '${message.toString()}' cannot be found`);
return;
}
this.zigbee.removedevice(deviceID);
} else {
logger.error(`Cannot handle MQTT config option '${option}' with Payload is null - we need the friendly_name to proceed`);
return;
} else if (option === 'remove') {
if (message.toString() !== null && message.toString() !== '' && message.toString().length > 0) {
const deviceID = Object.keys(settings.get().devices).find((id) =>
settings.getDevice(id).friendly_name === message.toString()
);
if (!deviceID) {
logger.error(`Cannot handle '${topic}' because deviceID of '${message.toString()}' cannot be found`);
return;
}
this.zigbee.removedevice(deviceID);
} else {
logger.error(`Cannot handle MQTT config option '${option}' with Payload is null - we need the friendly_name to proceed`);
return;
}
} else {
logger.warn(`Cannot handle MQTT config option '${option}' with message '${message}'`);
}
@@ -348,7 +348,7 @@ class Controller {
json = JSON.parse(message);
} catch (e) {
// Cannot be parsed to JSON, assume state message.
json = {state: message.toString()};
json = { state: message.toString() };
}
// Find ep for this device
@@ -382,7 +382,7 @@ class Controller {
this.zigbee.publish(deviceID, message.cid, message.cmd, message.zclData, ep, callback);
published.push({message: message, converter: converter});
published.push({ message: message, converter: converter });
});
/**
lib/zigbee.js
+6 -6
View File
@@ -111,10 +111,10 @@ class Zigbee {
removedevice(deviceID) {
this.shepherd.remove('deviceID', (err) => {
if (err) {
logger.warn(`Failed to remove ${deviceID}`);
this.forceRemove(deviceID);
logger.warn(`Failed to remove ${deviceID}`);
this.forceRemove(deviceID);
} else {
logger.info(`Successfully removed ${deviceID}`);
logger.info(`Successfully removed ${deviceID}`);
}
});
}
@@ -124,13 +124,13 @@ class Zigbee {
// force
return this.shepherd._unregisterDev(device, (err) => {
if (err) {
logger.warn(`Failed to force remove ${deviceID}`);
logger.warn(`Failed to force remove ${deviceID}`);
} else {
logger.info(`Successfully removed by force ${deviceID}`);
logger.info(`Successfully removed by force ${deviceID}`);
}
});
}
ping(deviceID) {
const device = this.shepherd._findDevByAddr(deviceID);