From 9bc87b765a0a2bc746cf8848c1aaa26465cf2db6 Mon Sep 17 00:00:00 2001 From: Marius Ciotlos Date: Wed, 6 Jun 2018 22:19:50 +0300 Subject: [PATCH] Formatting --- lib/controller.js | 32 ++++++++++++++++---------------- lib/zigbee.js | 12 ++++++------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/controller.js b/lib/controller.js index fc35e2aa..a2a0b0f0 100644 --- a/lib/controller.js +++ b/lib/controller.js @@ -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 }); }); /** diff --git a/lib/zigbee.js b/lib/zigbee.js index 925fcf43..232d8496 100644 --- a/lib/zigbee.js +++ b/lib/zigbee.js @@ -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);