node-switchbot 1.4.2-beta.7 → 1.4.2-beta.9

package/lib/switchbot-advertising.js

@@ -352,10 +352,10 @@ class SwitchbotAdvertising {
   }
 
   _parseServiceDataForWoBulb(buf, onlog) {
-    if (buf.length !== 6) {
+    if (buf.length !== 13) {
       if (onlog && typeof onlog === "function") {
         onlog(
-          `[_parseServiceDataForWoBulb] Buffer length ${buf.length} !== 6!`
+          `[_parseServiceDataForWoBulb] Buffer length ${buf.length} !== 13!`
         );
       }
       return null;
@@ -366,8 +366,8 @@ class SwitchbotAdvertising {
     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 lightLevel = byte9 & 0b01111111;
+    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);
@@ -375,12 +375,16 @@ class SwitchbotAdvertising {
     const wifiRssi = byte11;
     const dynamicRate = !!(byte12 & 0b10000000);
     const loopIndex = (((byte12 & 0b01111111) << 8) + byte13) / 10; // in watt
-    // TODO: voltage ???
 
     const data = {
       model: "u",
       modelName: "WoBulb",
       state: state,
+    };
+    /* const data = {
+      model: "u",
+      modelName: "WoBulb",
+      state: state,
       lightLevel: lightLevel,
       delay: delay,
       networkStatus: networkStatus,
@@ -389,7 +393,7 @@ class SwitchbotAdvertising {
       wifiRssi: wifiRssi,
       dynamicRate: dynamicRate,
       loopIndex: loopIndex,
-    };
+    };*/
 
     return data;
   }

package/package.json

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