dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-08-27 21:20:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor multiple foundation.

Browse Source
This commit is contained in:
Koenkk
2018-09-11 21:28:30 +02:00
parent fccb4de565
commit 8433571b1e
2 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/controller.js
+1 -1
View File
@@ -541,7 +541,7 @@ class Controller {
}
};
this.zigbee.publish(deviceID, message.cid, message.cmd, message.zclData, ep, callback);
this.zigbee.publish(deviceID, message.cid, message.cmd, message.zclData, ep, message.type, callback);
published.push({message: message, converter: converter});
});
lib/zigbee.js
+10 -21
View File
@@ -183,7 +183,7 @@ class Zigbee {
return this.shepherd.find(device.ieeeAddr, 1);
}
publish(deviceID, cid, cmd, zclData, ep, callback) {
publish(deviceID, cid, cmd, zclData, ep, type, callback) {
const device = this._findDevice(deviceID, ep);
if (!device) {
logger.error(`Zigbee cannot publish message to device because '${deviceID}' not known by zigbee-shepherd`);
@@ -191,27 +191,16 @@ class Zigbee {
}
logger.info(`Zigbee publish to '${deviceID}', ${cid} - ${cmd} - ${JSON.stringify(zclData)} - ${ep}`);
if (zclData['foudation']!==true) {
device.functional(cid, cmd, zclData, (error) => {
if (error) {
logger.error(
`Zigbee publish to '${deviceID}', ${cid} - ${cmd} - ${JSON.stringify(zclData)} - ${ep} ` +
`failed with error ${error}`);
}
callback(error);
});
} else { // use foundation command
device.foundation(cid, cmd, [{attrId: zclData['attrId'], dataType: zclData['dataType'],
attrData: zclData['attrData']}], function(error, rsp) {
if (error) {
logger.error(
`Zigbee publish to '${deviceID}', ${cid} - ${cmd} - ${JSON.stringify(zclData)} - ${ep} ` +
`failed with error ${error}, respond ${rsp}`);
}
callback(error);
});
}
device[type](cid, cmd, zclData, (error) => {
if (error) {
logger.error(
`Zigbee publish to '${deviceID}', ${cid} - ${cmd} - ${JSON.stringify(zclData)} - ${ep} ` +
`failed with error ${error}`);
}
callback(error);
});
}
read(deviceID, cid, attr, ep, callback) {