node-switchbot 1.7.0-beta.0 → 1.7.0-beta.1

package/lib/switchbot-advertising.js

@@ -101,7 +101,7 @@ class SwitchbotAdvertising {
     } else if (model === "j") {
       sd = this._parseServiceDataForWoPlugMiniJP(manufacturerData, onlog);// WoPlugMini (JP)
     } else if (model === "o") {
-      sd = this._parseServiceDataForWoSmartLock(buf, onlog);// WoSmartLock
+      sd = this._parseServiceDataForWoSmartLock(manufacturerData, onlog);// WoSmartLock
     } else if (model === "i") {
       sd = this._parseServiceDataForWoSensorTHPlus(buf, onlog);// WoMeterPlus
     } else if (model === "r") {
@@ -365,25 +365,25 @@ class SwitchbotAdvertising {
     return data;
   }
 
-  _parseServiceDataForWoBulb(buf, onlog) {
-    if (buf.length !== 13) {
+  _parseServiceDataForWoBulb(manufacturerData, onlog) {
+    if (manufacturerData.length !== 13) {
       if (onlog && typeof onlog === "function") {
         onlog(
-          `[_parseServiceDataForWoBulb] Buffer length ${buf.length} !== 13!`
+          `[_parseServiceDataForWoBulb] Buffer length ${manufacturerData.length} !== 13!`
         );
       }
       return null;
     }
-    let byte1 = buf.readUInt8(1);//power and light status
-    let byte2 = buf.readUInt8(2);//bulb brightness
-    let byte3 = buf.readUInt8(3);//bulb R
-    let byte4 = buf.readUInt8(4);//bulb G
-    let byte5 = buf.readUInt8(5);//bulb B
-    let byte6 = buf.readUInt8(6);//bulb temperature
-    let byte7 = buf.readUInt8(7);
-    let byte8 = buf.readUInt8(8);
-    let byte9 = buf.readUInt8(9);
-    let byte10 = buf.readUInt8(10);//bulb mode
+    let byte1 = manufacturerData.readUInt8(1);//power and light status
+    let byte2 = manufacturerData.readUInt8(2);//bulb brightness
+    let byte3 = manufacturerData.readUInt8(3);//bulb R
+    let byte4 = manufacturerData.readUInt8(4);//bulb G
+    let byte5 = manufacturerData.readUInt8(5);//bulb B
+    let byte6 = manufacturerData.readUInt8(6);//bulb temperature
+    let byte7 = manufacturerData.readUInt8(7);
+    let byte8 = manufacturerData.readUInt8(8);
+    let byte9 = manufacturerData.readUInt8(9);
+    let byte10 = manufacturerData.readUInt8(10);//bulb mode
 
     let power = byte1;
     let red = byte3;
@@ -418,20 +418,20 @@ class SwitchbotAdvertising {
     return data;
   }
 
-  _parseServiceDataForWoPlugMiniUS(buf, onlog) {
-    if (buf.length !== 14) {
+  _parseServiceDataForWoPlugMiniUS(manufacturerData, onlog) {
+    if (manufacturerData.length !== 14) {
       if (onlog && typeof onlog === "function") {
         onlog(
-          `[_parseServiceDataForWoPlugMiniUS] Buffer length ${buf.length} should be 14`
+          `[_parseServiceDataForWoPlugMiniUS] Buffer length ${manufacturerData.length} should be 14`
         );
       }
       return null;
     }
-    let byte9 = buf.readUInt8(9); // byte9:  plug mini state; 0x00=off, 0x80=on
-    let byte10 = buf.readUInt8(10); // byte10: bit0: 0=no delay,1=delay, bit1:0=no timer, 1=timer; bit2:0=no sync time, 1=sync'ed time
-    let byte11 = buf.readUInt8(11); // byte11: wifi rssi
-    let byte12 = buf.readUInt8(12); // byte12: bit7: overload?
-    let byte13 = buf.readUInt8(13); // byte12[bit0~6] + byte13: current power value
+    let byte9 = manufacturerData.readUInt8(9); // byte9:  plug mini state; 0x00=off, 0x80=on
+    let byte10 = manufacturerData.readUInt8(10); // byte10: bit0: 0=no delay,1=delay, bit1:0=no timer, 1=timer; bit2:0=no sync time, 1=sync'ed time
+    let byte11 = manufacturerData.readUInt8(11); // byte11: wifi rssi
+    let byte12 = manufacturerData.readUInt8(12); // byte12: bit7: overload?
+    let byte13 = manufacturerData.readUInt8(13); // byte12[bit0~6] + byte13: current power value
 
     let state = byte9 === 0x00 ? "off" : byte9 === 0x80 ? "on" : null;
     let delay = !!(byte10 & 0b00000001);
@@ -457,20 +457,20 @@ class SwitchbotAdvertising {
     return data;
   }
 
-  _parseServiceDataForWoPlugMiniJP(buf, onlog) {
-    if (buf.length !== 14) {
+  _parseServiceDataForWoPlugMiniJP(manufacturerData, onlog) {
+    if (manufacturerData.length !== 14) {
       if (onlog && typeof onlog === "function") {
         onlog(
-          `[_parseServiceDataForWoPlugMiniJP] Buffer length ${buf.length} should be 14`
+          `[_parseServiceDataForWoPlugMiniJP] Buffer length ${manufacturerData.length} should be 14`
         );
       }
       return null;
     }
-    let byte9 = buf.readUInt8(9); // byte9:  plug mini state; 0x00=off, 0x80=on
-    let byte10 = buf.readUInt8(10); // byte10: bit0: 0=no delay,1=delay, bit1:0=no timer, 1=timer; bit2:0=no sync time, 1=sync'ed time
-    let byte11 = buf.readUInt8(11); // byte11: wifi rssi
-    let byte12 = buf.readUInt8(12); // byte12: bit7: overload?
-    let byte13 = buf.readUInt8(13); // byte12[bit0~6] + byte13: current power value
+    let byte9 = manufacturerData.readUInt8(9); // byte9:  plug mini state; 0x00=off, 0x80=on
+    let byte10 = manufacturerData.readUInt8(10); // byte10: bit0: 0=no delay,1=delay, bit1:0=no timer, 1=timer; bit2:0=no sync time, 1=sync'ed time
+    let byte11 = manufacturerData.readUInt8(11); // byte11: wifi rssi
+    let byte12 = manufacturerData.readUInt8(12); // byte12: bit7: overload?
+    let byte13 = manufacturerData.readUInt8(13); // byte12[bit0~6] + byte13: current power value
 
     let state = byte9 === 0x00 ? "off" : byte9 === 0x80 ? "on" : null;
     let delay = !!(byte10 & 0b00000001);
@@ -496,18 +496,18 @@ class SwitchbotAdvertising {
     return data;
   }
 
-  _parseServiceDataForWoSmartLock(buf, onlog) {
-    if (buf.length !== 6) {
+  _parseServiceDataForWoSmartLock(manufacturerData, onlog) {
+    if (manufacturerData.length !== 6) {
       if (onlog && typeof onlog === "function") {
         onlog(
-          `[_parseServiceDataForWoSmartLock] Buffer length ${buf.length} !== 6!`
+          `[_parseServiceDataForWoSmartLock] Buffer length ${manufacturerData.length} !== 6!`
         );
       }
       return null;
     }
-    let byte2 = buf.readUInt8(2);
-    let byte7 = buf.readUInt8(7);
-    let byte8 = buf.readUInt8(8);
+    let byte2 = manufacturerData.readUInt8(2);
+    let byte7 = manufacturerData.readUInt8(7);
+    let byte8 = manufacturerData.readUInt8(8);
 
     
     let LockStatus = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-switchbot",
-  "version": "1.7.0-beta.0",
+  "version": "1.7.0-beta.1",
   "description": "The node-switchbot is a Node.js module which allows you to control your Switchbot Devices through Bluetooth (BLE).",
   "main": "./lib/switchbot.js",
   "files": [