node-switchbot 1.6.0-beta.2 → 1.6.0-beta.3

package/lib/switchbot-advertising.js

@@ -227,10 +227,8 @@ class SwitchbotAdvertising {
       return null;
     }
     let byte1 = buf.readUInt8(1);
-    // let byte2 = buf.readUInt8(2);
-    let byte3 = buf.readUInt8(3);
     let byte4 = buf.readUInt8(4);
-    let byte5 = buf.readUInt8(5);
+    
 
     let onState = byte1 & 0b10000000 ? true : false; // 1 - on
     let autoMode = byte4 & 0b10000000 ? true : false; // 1 - auto
@@ -260,8 +258,6 @@ class SwitchbotAdvertising {
 
     let byte1 = buf.readUInt8(1);
     let byte2 = buf.readUInt8(2);
-    //let byte3 = buf.readUInt8(3);
-    //let byte4 = buf.readUInt8(4);
     let byte5 = buf.readUInt8(5);
 
 
@@ -303,10 +299,6 @@ class SwitchbotAdvertising {
     let byte1 = buf.readUInt8(1);
     let byte2 = buf.readUInt8(2);
     let byte3 = buf.readUInt8(3);
-    // let byte4 = buf.readUInt8(4);
-    // let byte5 = buf.readUInt8(5);
-    // let byte6 = buf.readUInt8(6);
-    // let byte7 = buf.readUInt8(7);
     let byte8 = buf.readUInt8(8);
 
     let hallState = (byte3 >> 1) & 0b00000011;
@@ -316,7 +308,7 @@ class SwitchbotAdvertising {
     let contact_open = byte3 & 0b00000010 == 0b00000010;
     let contact_timeout = byte3 & 0b00000100 == 0b00000100;
     let is_light = byte3 & 0b00000001 ? true : false;
-    let button_count = (data[8] & 0b00001111);
+    let button_count = byte8 & 0b00001111;
 
     let data = {
       model: "d",
@@ -351,7 +343,7 @@ class SwitchbotAdvertising {
     let calibration = byte1 & 0b01000000 ? true : false; // Whether the calibration is completed
     let battery = byte2 & 0b01111111; // %
     let inMotion = byte3 & 0b10000000 ? true : false;
-    let currPosition = max(min(data[3] & 0b01111111, 100), 0) //byte3 & 0b01111111; // current positon %
+    let currPosition = max(min(byte3 & 0b01111111, 100), 0) //byte3 & 0b01111111; // current positon %
     let lightLevel = (byte4 >> 4) & 0b00001111; // light sensor level (1-10)
     let deviceChain = byte4 & 0b00000111;
 
@@ -500,20 +492,15 @@ class SwitchbotAdvertising {
     }
     let byte1 = buf.readUInt8(1);
     let byte2 = buf.readUInt8(2);
-    // let byte3 = buf.readUInt8(3);
-    // let byte4 = buf.readUInt8(4);
-    let byte5 = buf.readUInt8(5);
 
-    //let movement = (byte1 & 0b01000000) ? true : false; // 1 - Movement detected
+    let movement = (byte1 & 0b01000000) ? true : false; // 1 - Movement detected
     let battery = byte2 & 0b01111111; // %
-    //let lightLevel = byte5 & 0b00000011;
 
     let data = {
       model: "o",
       modelName: "WoSmartLock",
-      //movement: movement,
       battery: battery,
-      //lightLevel: (lightLevel == 1) ? 'dark' : ((lightLevel == 2) ? 'bright' : 'unknown'),
+      movement: movement,
     };
 
     return data;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-switchbot",
-  "version": "1.6.0-beta.2",
+  "version": "1.6.0-beta.3",
   "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": [