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

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;
 
@@ -379,23 +371,23 @@ class SwitchbotAdvertising {
       return null;
     }
 
-    const byte6 = buf.readUInt8(6);
-    const byte7 = buf.readUInt8(7);
-    const byte8 = buf.readUInt8(8);
-    const byte9 = buf.readUInt8(9);
-    const byte10 = buf.readUInt8(10);
+    let byte6 = buf.readUInt8(6);
+    let byte7 = buf.readUInt8(7);
+    let byte8 = buf.readUInt8(8);
+    let byte9 = buf.readUInt8(9);
+    let byte10 = buf.readUInt8(10);
 
 
-    const sequence_number = byte6;
-    const state = byte7 & 0b01111111 ? true : false;
-    const brightness = byte7 & 0b01111111;
-    const delay = byte8 & 0b10000000;
-    const preset = byte8 & 0b00001000;
-    const color_mode = byte8 & 0b00000111;
-    const speed = byte9 & 0b01111111;
-    const loop_index = byte10 & 0b11111110;
+    let sequence_number = byte6;
+    let state = byte7 & 0b01111111 ? true : false;
+    let brightness = byte7 & 0b01111111;
+    let delay = byte8 & 0b10000000;
+    let preset = byte8 & 0b00001000;
+    let color_mode = byte8 & 0b00000111;
+    let speed = byte9 & 0b01111111;
+    let loop_index = byte10 & 0b11111110;
 
-    const data = {
+    let data = {
       model: "u",
       modelName: "WoBulb",
       sequence_number: sequence_number,
@@ -420,22 +412,22 @@ class SwitchbotAdvertising {
       }
       return null;
     }
-    const byte9 = buf.readUInt8(9); // byte9:  plug mini state; 0x00=off, 0x80=on
-    const 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
-    const byte11 = buf.readUInt8(11); // byte11: wifi rssi
-    const byte12 = buf.readUInt8(12); // byte12: bit7: overload?
-    const byte13 = buf.readUInt8(13); // byte12[bit0~6] + byte13: current power value
-
-    const state = byte9 === 0x00 ? "off" : byte9 === 0x80 ? "on" : null;
-    const delay = !!(byte10 & 0b00000001);
-    const timer = !!(byte10 & 0b00000010);
-    const syncUtcTime = !!(byte10 & 0b00000100);
-    const wifiRssi = byte11;
-    const overload = !!(byte12 & 0b10000000);
-    const currentPower = (((byte12 & 0b01111111) << 8) + byte13) / 10; // in watt
+    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 state = byte9 === 0x00 ? "off" : byte9 === 0x80 ? "on" : null;
+    let delay = !!(byte10 & 0b00000001);
+    let timer = !!(byte10 & 0b00000010);
+    let syncUtcTime = !!(byte10 & 0b00000100);
+    let wifiRssi = byte11;
+    let overload = !!(byte12 & 0b10000000);
+    let currentPower = (((byte12 & 0b01111111) << 8) + byte13) / 10; // in watt
     // TODO: voltage ???
 
-    const data = {
+    let data = {
       model: "g",
       modelName: "WoPlugMini",
       state: state,
@@ -459,22 +451,22 @@ class SwitchbotAdvertising {
       }
       return null;
     }
-    const byte9 = buf.readUInt8(9); // byte9:  plug mini state; 0x00=off, 0x80=on
-    const 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
-    const byte11 = buf.readUInt8(11); // byte11: wifi rssi
-    const byte12 = buf.readUInt8(12); // byte12: bit7: overload?
-    const byte13 = buf.readUInt8(13); // byte12[bit0~6] + byte13: current power value
-
-    const state = byte9 === 0x00 ? "off" : byte9 === 0x80 ? "on" : null;
-    const delay = !!(byte10 & 0b00000001);
-    const timer = !!(byte10 & 0b00000010);
-    const syncUtcTime = !!(byte10 & 0b00000100);
-    const wifiRssi = byte11;
-    const overload = !!(byte12 & 0b10000000);
-    const currentPower = (((byte12 & 0b01111111) << 8) + byte13) / 10; // in watt
+    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 state = byte9 === 0x00 ? "off" : byte9 === 0x80 ? "on" : null;
+    let delay = !!(byte10 & 0b00000001);
+    let timer = !!(byte10 & 0b00000010);
+    let syncUtcTime = !!(byte10 & 0b00000100);
+    let wifiRssi = byte11;
+    let overload = !!(byte12 & 0b10000000);
+    let currentPower = (((byte12 & 0b01111111) << 8) + byte13) / 10; // in watt
     // TODO: voltage ???
 
-    const data = {
+    let data = {
       model: "j",
       modelName: "WoPlugMini",
       state: state,
@@ -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;
@@ -563,20 +550,20 @@ class SwitchbotAdvertising {
       return null;
     }
 
-    const byte7 = buf.readUInt8(7);
-    const byte8 = buf.readUInt8(8);
-    const byte9 = buf.readUInt8(9);
-    const byte10 = buf.readUInt8(10);
+    let byte7 = buf.readUInt8(7);
+    let byte8 = buf.readUInt8(8);
+    let byte9 = buf.readUInt8(9);
+    let byte10 = buf.readUInt8(10);
 
-    const state = byte7 & 0b10000000 ? true : false;
-    const lightLevel = byte7 & 0b01111111;
-    const delay = byte8 & 0b10000000;
-    const preset = byte8 & 0b00001000;
-    const color_mode = byte8 & 0b00000111;
-    const speed = byte9 & 0b01111111;
-    const loop_index = byte10 & 0b11111110;
+    let state = byte7 & 0b10000000 ? true : false;
+    let lightLevel = byte7 & 0b01111111;
+    let delay = byte8 & 0b10000000;
+    let preset = byte8 & 0b00001000;
+    let color_mode = byte8 & 0b00000111;
+    let speed = byte9 & 0b01111111;
+    let loop_index = byte10 & 0b11111110;
 
-    const data = {
+    let data = {
       model: "r",
       modelName: "WoStrip",
       state: state,

package/package.json

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