node-switchbot 1.4.2-beta.10 → 1.4.2-beta.11

package/lib/switchbot-advertising.js

@@ -361,20 +361,20 @@ 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 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 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 data = {
       model: "u",
@@ -540,25 +540,49 @@ class SwitchbotAdvertising {
     return data;
   }
 
-  _parseServiceDataForWoLEDStripLight(buf, onlog) {
-    if (buf.length !== 6) {
+  _parseServiceDataForWoStrip(buf, onlog) {
+    if (buf.length !== 18) {
       if (onlog && typeof onlog === "function") {
         onlog(
-          `[_parseServiceDataForWoLEDStripLight] Buffer length ${buf.length} !== 6!`
+          `[_parseServiceDataForWoStrip] Buffer length ${buf.length} !== 18!`
         );
       }
       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);
+    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
 
-    let data = {
+    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 data = {
       model: "r",
-      modelName: "WoLEDStripLight",
+      modelName: "WoStrip",
+      state: state,
     };
+    /* const data = {
+      model: "u",
+      modelName: "WoBulb",
+      state: state,
+      lightLevel: lightLevel,
+      delay: delay,
+      networkStatus: networkStatus,
+      statePreset: statePreset,
+      lightState: lightState,
+      wifiRssi: wifiRssi,
+      dynamicRate: dynamicRate,
+      loopIndex: loopIndex,
+    };*/
 
     return data;
   }

package/package.json

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