node-switchbot 1.5.0 → 1.6.0-beta.1

package/lib/switchbot-advertising.js

@@ -360,40 +360,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 isOn = 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",
-      state: state,
-    };
-    /* const data = {
-      model: "u",
-      modelName: "WoBulb",
-      state: state,
-      lightLevel: lightLevel,
+      sequence_number: sequence_number,
+      isOn: isOn,
+      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;
   }
@@ -549,40 +544,31 @@ 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 byte7 = buf.readUInt8(7);
+    const byte8 = buf.readUInt8(8);
+    const byte9 = buf.readUInt8(9);
+    const byte10 = buf.readUInt8(10);
+
+    const isOn = byte7 & 0b10000000 ? 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: "r",
       modelName: "WoStrip",
-      state: state,
-    };
-    /* const data = {
-      model: "u",
-      modelName: "WoBulb",
-      state: state,
-      lightLevel: lightLevel,
+      isOn: isOn,
+      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;
   }

package/package.json

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