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

package/lib/switchbot-advertising.js

@@ -267,7 +267,7 @@ class SwitchbotAdvertising {
     let led = (byte5 & 0b00100000) >> 5;
     let iot = (byte5 & 0b00010000) >> 4;
     let sense_distance = (byte5 & 0b00001100) >> 2;
-    let light_intensity = byte5 & 0b00000011;
+    let lightLevel = byte5 & 0b00000011;
     let is_light = byte5 & 0b00000010 ? true : false;
 
     let data = {
@@ -279,7 +279,8 @@ class SwitchbotAdvertising {
       led: led,
       iot: iot,
       sense_distance: sense_distance,
-      light_intensity: light_intensity,
+      lightLevel:
+        lightLevel == 1 ? "dark" : lightLevel == 2 ? "bright" : "unknown",
       is_light: is_light,
     };
 
@@ -307,7 +308,7 @@ class SwitchbotAdvertising {
     let battery = byte2 & 0b01111111; // %
     let contact_open = byte3 & 0b00000010 == 0b00000010;
     let contact_timeout = byte3 & 0b00000100 == 0b00000100;
-    let is_light = byte3 & 0b00000001 ? true : false;
+    let lightLevel = byte3 & 0b00000001;
     let button_count = byte8 & 0b00001111;
 
     let data = {
@@ -318,9 +319,14 @@ class SwitchbotAdvertising {
       battery: battery,
       contact_open: contact_open,
       contact_timeout: contact_timeout,
-      is_light: is_light,
+      lightLevel: lightLevel == 0 ? "dark" : "bright",
       button_count: button_count,
-      hallState: hallState,
+      doorState:
+        hallState == 0
+          ? "close"
+          : hallState == 1
+          ? "open"
+          : "timeout no closed",
     };
 
     return data;
@@ -343,7 +349,8 @@ 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(byte3 & 0b01111111, 100), 0) //byte3 & 0b01111111; // current positon %
+    let currPosition = 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;
 
@@ -370,14 +377,20 @@ class SwitchbotAdvertising {
       }
       return null;
     }
-
-    let byte6 = buf.readUInt8(6);
+    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);
-
+    let byte10 = buf.readUInt8(10);//bulb mode
 
+    let r = byte3;
+    let g = byte4;
+    let b = byte5;
     let sequence_number = byte6;
     let state = byte7 & 0b01111111 ? true : false;
     let brightness = byte7 & 0b01111111;
@@ -392,6 +405,9 @@ class SwitchbotAdvertising {
       modelName: "WoBulb",
       sequence_number: sequence_number,
       state: state,
+      r: r,
+      g: g,
+      b: b,
       brightness: brightness,
       delay: delay,
       preset: preset,
@@ -556,7 +572,7 @@ class SwitchbotAdvertising {
     let byte10 = buf.readUInt8(10);
 
     let state = byte7 & 0b10000000 ? true : false;
-    let lightLevel = byte7 & 0b01111111;
+    let brightness = byte7 & 0b01111111;
     let delay = byte8 & 0b10000000;
     let preset = byte8 & 0b00001000;
     let color_mode = byte8 & 0b00000111;
@@ -567,7 +583,7 @@ class SwitchbotAdvertising {
       model: "r",
       modelName: "WoStrip",
       state: state,
-      lightLevel: lightLevel,
+      brightness: brightness,
       delay: delay,
       preset: preset,
       color_mode: color_mode,

package/package.json

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