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

package/lib/switchbot-advertising.js

@@ -198,8 +198,8 @@ class SwitchbotAdvertising {
     let byte5 = buf.readUInt8(5);
 
     let temp_sign = byte4 & 0b10000000 ? 1 : -1;
-    let temp_c = temp_sign * ((byte4 & 0b01111111) + byte3 / 10);
-    let temp_f = (temp_c * 9) / 5 + 32;
+    let temp_c = temp_sign * ((byte4 & 0b01111111) + (byte3 & 0b00001111) / 10);
+    let temp_f = (temp_c * 9 / 5) + 32;
     temp_f = Math.round(temp_f * 10) / 10;
 
     let data = {
@@ -256,23 +256,35 @@ 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 byte3 = buf.readUInt8(3);
+    //let byte4 = buf.readUInt8(4);
     let byte5 = buf.readUInt8(5);
 
-    let pirState = byte1 & 0b01000000 ? true : false; // 1 - Movement detected
-    let battery = byte2 & 0b01111111; // %
-    let lightLevel = byte5 & 0b00000011;
+
+    let tested = byte1 & 0b10000000 ? true : false;
+    let movement = byte1 & 0b01000000 ? true : false;
+    let battery = byte2 & 0b01111111;
+    let led = (byte5 & 0b00100000) >> 5;
+    let iot = (byte5 & 0b00010000) >> 4;
+    let sense_distance = (byte5 & 0b00001100) >> 2;
+    let light_intensity = byte5 & 0b00000011;
+    let is_light = byte5 & 0b00000010 ? true : false;
 
     let data = {
       model: "s",
       modelName: "WoMotion",
-      movement: pirState,
+      tested: tested,
+      movement: movement,
       battery: battery,
-      lightLevel:
-        lightLevel == 1 ? "dark" : lightLevel == 2 ? "bright" : "unknown",
+      led: led,
+      iot: iot,
+      sense_distance: sense_distance,
+      light_intensity: light_intensity,
+      is_light: is_light,
     };
 
     return data;
@@ -295,25 +307,28 @@ class SwitchbotAdvertising {
     // let byte5 = buf.readUInt8(5);
     // let byte6 = buf.readUInt8(6);
     // let byte7 = buf.readUInt8(7);
-    // let byte8 = buf.readUInt8(8);
+    let byte8 = buf.readUInt8(8);
 
-    let pirState = byte1 & 0b01000000 ? true : false; // 1 - Movement detected
-    let battery = byte2 & 0b01111111; // %
     let hallState = (byte3 >> 1) & 0b00000011;
-    let lightLevel = byte3 & 0b00000001;
+    let tested = byte1 & 0b10000000;
+    let movement = byte1 & 0b01000000 ? true : false; // 1 - Movement detected
+    let battery = byte2 & 0b01111111; // %
+    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 data = {
       model: "d",
       modelName: "WoContact",
-      movement: pirState,
+      movement: movement,
+      tested: tested,
       battery: battery,
-      doorState:
-        hallState == 0
-          ? "close"
-          : hallState == 1
-          ? "open"
-          : "timeout no closed",
-      lightLevel: lightLevel == 0 ? "dark" : "bright",
+      contact_open: contact_open,
+      contact_timeout: contact_timeout,
+      is_light: is_light,
+      button_count: button_count,
+      hallState: hallState,
     };
 
     return data;
@@ -332,20 +347,23 @@ class SwitchbotAdvertising {
     let byte2 = buf.readUInt8(2);
     let byte3 = buf.readUInt8(3);
     let byte4 = buf.readUInt8(4);
-    // let byte5 = buf.readUInt8(5);
 
     let calibration = byte1 & 0b01000000 ? true : false; // Whether the calibration is completed
     let battery = byte2 & 0b01111111; // %
-    let currPosition = byte3 & 0b01111111; // current positon %
+    let inMotion = byte3 & 0b10000000 ? true : false;
+    let currPosition = max(min(data[3] & 0b01111111, 100), 0) //byte3 & 0b01111111; // current positon %
     let lightLevel = (byte4 >> 4) & 0b00001111; // light sensor level (1-10)
+    let deviceChain = byte4 & 0b00000111;
 
     let data = {
       model: "c",
       modelName: "WoCurtain",
       calibration: calibration,
       battery: battery,
+      inMotion: inMotion,
       position: currPosition,
       lightLevel: lightLevel,
+      deviceChain: deviceChain,
     };
 
     return data;
@@ -360,40 +378,35 @@ class SwitchbotAdvertising {
       }
       return null;
     }
-    const byte9 = buf.readUInt8(9); // byte9:  color bulb state; 0x00=off, 0x80=on & lightLevel: 1~100%
-    //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 === 0x01 ? "off" : byte9 === 0x80 ? "on" : null;
-    const lightLevel = byte9 & 0b00000011;
-    //const delay = !!(byte10 & 0b00000001);
-    //const networkStatus = !!(byte10 & 0b00000001);
-    //const statePreset = !!(byte10 & 0b00000010);
-    //const lightState = !!(byte10 & 0b00000100);
-    //const wifiRssi = byte11;
-    //const dynamicRate = !!(byte12 & 0b10000000);
-    //const loopIndex = (((byte12 & 0b01111111) << 8) + byte13) / 10; // in watt
+
+    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);
+
+
+    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;
 
     const data = {
       model: "u",
       modelName: "WoBulb",
+      sequence_number: sequence_number,
       state: state,
-    };
-    /* const data = {
-      model: "u",
-      modelName: "WoBulb",
-      state: state,
-      lightLevel: lightLevel,
+      brightness: brightness,
       delay: delay,
-      networkStatus: networkStatus,
-      statePreset: statePreset,
-      lightState: lightState,
-      wifiRssi: wifiRssi,
-      dynamicRate: dynamicRate,
-      loopIndex: loopIndex,
-    };*/
+      preset: preset,
+      color_mode: color_mode,
+      speed: speed,
+      loop_index: loop_index,
+    };
 
     return data;
   }
@@ -491,14 +504,14 @@ class SwitchbotAdvertising {
     // let byte4 = buf.readUInt8(4);
     let byte5 = buf.readUInt8(5);
 
-    //let pirState = (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: pirState,
+      //movement: movement,
       battery: battery,
       //lightLevel: (lightLevel == 1) ? 'dark' : ((lightLevel == 2) ? 'bright' : 'unknown'),
     };
@@ -521,8 +534,8 @@ class SwitchbotAdvertising {
     let byte5 = buf.readUInt8(5);
 
     let temp_sign = byte4 & 0b10000000 ? 1 : -1;
-    let temp_c = temp_sign * ((byte4 & 0b01111111) + byte3 / 10);
-    let temp_f = (temp_c * 9) / 5 + 32;
+    let temp_c = temp_sign * ((byte4 & 0b01111111) + (byte3 & 0b00001111) / 10);
+    let temp_f = (temp_c * 9 / 5) + 32;
     temp_f = Math.round(temp_f * 10) / 10;
 
     let data = {
@@ -555,8 +568,8 @@ class SwitchbotAdvertising {
     const byte9 = buf.readUInt8(9);
     const byte10 = buf.readUInt8(10);
 
-    const isOn = byte7 & 0b10000000;
-    const brightness = byte7 & 0b01111111;
+    const state = byte7 & 0b10000000 ? true : false;
+    const lightLevel = byte7 & 0b01111111;
     const delay = byte8 & 0b10000000;
     const preset = byte8 & 0b00001000;
     const color_mode = byte8 & 0b00000111;
@@ -566,8 +579,8 @@ class SwitchbotAdvertising {
     const data = {
       model: "r",
       modelName: "WoStrip",
-      isOn: isOn,
-      brightness: brightness,
+      state: state,
+      lightLevel: lightLevel,
       delay: delay,
       preset: preset,
       color_mode: color_mode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-switchbot",
-  "version": "1.6.0-beta.0",
+  "version": "1.6.0-beta.2",
   "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": [
@@ -37,6 +37,6 @@
     "@abandonware/noble": "^1.9.2-15"
   },
   "devDependencies": {
-    "npm-check-updates": "^16.3.8"
+    "npm-check-updates": "^16.3.13"
   }
 }