cotugno/zigbee2mqtt
2
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2024-11-17 02:48:31 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #355 from dzungpv/dev

Browse Source 
Support Foundation Command for use in zigbee-shepherd converter
This commit is contained in:
Koen Kanters 2018-09-11 21:34:25 +02:00 committed by GitHub
commit f0f2dc847b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/controller.js
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}); published.push({message: message, converter: converter});
}); });

5
lib/zigbee.js
View File

@ -183,7 +183,7 @@ class Zigbee {
return this.shepherd.find(device.ieeeAddr, 1); 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); const device = this._findDevice(deviceID, ep);
if (!device) { if (!device) {
logger.error(`Zigbee cannot publish message to device because '${deviceID}' not known by zigbee-shepherd`); logger.error(`Zigbee cannot publish message to device because '${deviceID}' not known by zigbee-shepherd`);
@ -191,7 +191,8 @@ class Zigbee {
} }
logger.info(`Zigbee publish to '${deviceID}', ${cid} - ${cmd} - ${JSON.stringify(zclData)} - ${ep}`); logger.info(`Zigbee publish to '${deviceID}', ${cid} - ${cmd} - ${JSON.stringify(zclData)} - ${ep}`);
device.functional(cid, cmd, zclData, (error) => {
device[type](cid, cmd, zclData, (error) => {
if (error) { if (error) {
logger.error( logger.error(
`Zigbee publish to '${deviceID}', ${cid} - ${cmd} - ${JSON.stringify(zclData)} - ${ep} ` + `Zigbee publish to '${deviceID}', ${cid} - ${cmd} - ${JSON.stringify(zclData)} - ${ep} ` +