dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-08-28 05:24:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix errors introduced by previous merge

Browse Source
This commit is contained in:
Andrew Linden
2017-11-26 14:33:32 +02:00
parent 91799d6d96
commit 2aa7366a82
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.js
+22 -23
View File
@@ -5,9 +5,9 @@ var mqtt = require('mqtt')
var client = mqtt.connect('mqtt://192.168.1.10')
var shepherd = new ZShepherd('/dev/ttyACM3', {
var shepherd = new ZShepherd('/dev/ttyACM0', {
net: {
panId: 0x1a61
panId: 0x1a62
}
});
@@ -35,29 +35,28 @@ shepherd.on('ind', function(msg) {
break;
case 'attReport':
console.log('attreport: ' + msg.endpoints[0].device.ieeeAddr + ' ' + msg.endpoints[0].devId + ' ' + msg.endpoints[0].epId + ' ' + util.inspect(msg.data, false, null));
var topic = 'xiaomiZb/' + msg.endpoints[0].device.ieeeAddr.substr(2) + '/' + msg.endpoints[0].epId;
// defaults. Some devices like switches do not need anything else.
topic = 'xiaomiZb/' + msg.endpoints[0].device.ieeeAddr.substr(2) + '/' + msg.endpoints[0].epId;
pl=1;
// Aqara Temperature/Humidity
switch (msg.data.cid) {
case 'msTemperatureMeasurement':
topic += "/temperature";
pl = parseFloat(msg.data.data['measuredValue']) / 100.0;
break;
case 'msRelativeHumidity':
topic += "/relative_humidity";
pl = parseFloat(msg.data.data['measuredValue']) / 100.0;
break;
case 'msPressureMeasurement':
topic += "/pressure";
pl = parseFloat(msg.data.data['16']) / 10.0;
break;
}
switch (msg.endpoints[0].devId) {
case 24321: // Aqara Temperature/Humidity
switch (msg.data.cid) {
case 'msTemperatureMeasurement':
topic += "/temperature";
pl = parseFloat(msg.data.data['measuredValue']) / 100.0;
break;
case 'msRelativeHumidity':
topic += "/relative_humidity";
pl = parseFloat(msg.data.data['measuredValue']) / 100.0;
break;
case 'msPressureMeasurement':
topic += "/pressure";
pl = parseFloat(msg.data.data['16']) / 10.0;
break;
}
break;
case 260: // WXKG01LM
if (msg.data.data['onOff'] == 0) { // click down
perfy.start(msg.endpoints[0].device.ieeeAddr); // start timer