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

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 = {
@@ -227,10 +227,8 @@ 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 byte5 = buf.readUInt8(5);
+    
 
     let onState = byte1 & 0b10000000 ? true : false; // 1 - on
     let autoMode = byte4 & 0b10000000 ? true : false; // 1 - auto
@@ -256,23 +254,34 @@ 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 byte5 = buf.readUInt8(5);
 
-    let pirState = byte1 & 0b01000000 ? true : false; // 1 - Movement detected
-    let battery = byte2 & 0b01111111; // %
+
+    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 lightLevel = byte5 & 0b00000011;
+    let is_light = byte5 & 0b00000010 ? true : false;
 
     let data = {
       model: "s",
       modelName: "WoMotion",
-      movement: pirState,
+      tested: tested,
+      movement: movement,
       battery: battery,
+      led: led,
+      iot: iot,
+      sense_distance: sense_distance,
       lightLevel:
         lightLevel == 1 ? "dark" : lightLevel == 2 ? "bright" : "unknown",
+      is_light: is_light,
     };
 
     return data;
@@ -291,29 +300,33 @@ class SwitchbotAdvertising {
     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);
-    // 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 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 lightLevel = byte3 & 0b00000001;
+    let button_count = byte8 & 0b00001111;
 
     let data = {
       model: "d",
       modelName: "WoContact",
-      movement: pirState,
+      movement: movement,
+      tested: tested,
       battery: battery,
+      contact_open: contact_open,
+      contact_timeout: contact_timeout,
+      lightLevel: lightLevel == 0 ? "dark" : "bright",
+      button_count: button_count,
       doorState:
         hallState == 0
           ? "close"
           : hallState == 1
           ? "open"
           : "timeout no closed",
-      lightLevel: lightLevel == 0 ? "dark" : "bright",
     };
 
     return data;
@@ -332,20 +345,24 @@ 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 inMotion = byte3 & 0b10000000 ? true : false;
     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;
 
     let data = {
       model: "c",
       modelName: "WoCurtain",
       calibration: calibration,
       battery: battery,
+      inMotion: inMotion,
       position: currPosition,
       lightLevel: lightLevel,
+      deviceChain: deviceChain,
     };
 
     return data;
@@ -360,40 +377,44 @@ 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 data = {
-      model: "u",
-      modelName: "WoBulb",
-      state: state,
-    };
-    /* const data = {
+    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);//bulb mode
+
+    let red = byte3;
+    let green = byte4;
+    let blue = byte5;
+    let color_temperature = byte6;
+    let state = byte7 & 0b01111111 ? true : false;
+    let brightness = byte7 & 0b01111111;
+    let delay = byte8 & 0b10000000;
+    let preset = byte8 & 0b00001000;
+    let color_mode = byte8 & 0b00000111;
+    let speed = byte9 & 0b01111111;
+    let loop_index = byte10 & 0b11111110;
+
+    let data = {
       model: "u",
       modelName: "WoBulb",
+      color_temperature: color_temperature,
       state: state,
-      lightLevel: lightLevel,
+      red: red,
+      green: green,
+      blue: blue,
+      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;
   }
@@ -407,22 +428,22 @@ class SwitchbotAdvertising {
       }
       return null;
     }
-    const byte9 = buf.readUInt8(9); // byte9:  plug mini state; 0x00=off, 0x80=on
-    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 === 0x00 ? "off" : byte9 === 0x80 ? "on" : null;
-    const delay = !!(byte10 & 0b00000001);
-    const timer = !!(byte10 & 0b00000010);
-    const syncUtcTime = !!(byte10 & 0b00000100);
-    const wifiRssi = byte11;
-    const overload = !!(byte12 & 0b10000000);
-    const currentPower = (((byte12 & 0b01111111) << 8) + byte13) / 10; // in watt
+    let byte9 = buf.readUInt8(9); // byte9:  plug mini state; 0x00=off, 0x80=on
+    let 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
+    let byte11 = buf.readUInt8(11); // byte11: wifi rssi
+    let byte12 = buf.readUInt8(12); // byte12: bit7: overload?
+    let byte13 = buf.readUInt8(13); // byte12[bit0~6] + byte13: current power value
+
+    let state = byte9 === 0x00 ? "off" : byte9 === 0x80 ? "on" : null;
+    let delay = !!(byte10 & 0b00000001);
+    let timer = !!(byte10 & 0b00000010);
+    let syncUtcTime = !!(byte10 & 0b00000100);
+    let wifiRssi = byte11;
+    let overload = !!(byte12 & 0b10000000);
+    let currentPower = (((byte12 & 0b01111111) << 8) + byte13) / 10; // in watt
     // TODO: voltage ???
 
-    const data = {
+    let data = {
       model: "g",
       modelName: "WoPlugMini",
       state: state,
@@ -446,22 +467,22 @@ class SwitchbotAdvertising {
       }
       return null;
     }
-    const byte9 = buf.readUInt8(9); // byte9:  plug mini state; 0x00=off, 0x80=on
-    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 === 0x00 ? "off" : byte9 === 0x80 ? "on" : null;
-    const delay = !!(byte10 & 0b00000001);
-    const timer = !!(byte10 & 0b00000010);
-    const syncUtcTime = !!(byte10 & 0b00000100);
-    const wifiRssi = byte11;
-    const overload = !!(byte12 & 0b10000000);
-    const currentPower = (((byte12 & 0b01111111) << 8) + byte13) / 10; // in watt
+    let byte9 = buf.readUInt8(9); // byte9:  plug mini state; 0x00=off, 0x80=on
+    let 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
+    let byte11 = buf.readUInt8(11); // byte11: wifi rssi
+    let byte12 = buf.readUInt8(12); // byte12: bit7: overload?
+    let byte13 = buf.readUInt8(13); // byte12[bit0~6] + byte13: current power value
+
+    let state = byte9 === 0x00 ? "off" : byte9 === 0x80 ? "on" : null;
+    let delay = !!(byte10 & 0b00000001);
+    let timer = !!(byte10 & 0b00000010);
+    let syncUtcTime = !!(byte10 & 0b00000100);
+    let wifiRssi = byte11;
+    let overload = !!(byte12 & 0b10000000);
+    let currentPower = (((byte12 & 0b01111111) << 8) + byte13) / 10; // in watt
     // TODO: voltage ???
 
-    const data = {
+    let data = {
       model: "j",
       modelName: "WoPlugMini",
       state: state,
@@ -487,20 +508,15 @@ class SwitchbotAdvertising {
     }
     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);
 
-    //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,
       battery: battery,
-      //lightLevel: (lightLevel == 1) ? 'dark' : ((lightLevel == 2) ? 'bright' : 'unknown'),
+      movement: movement,
     };
 
     return data;
@@ -521,8 +537,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 = {
@@ -550,24 +566,35 @@ class SwitchbotAdvertising {
       return null;
     }
 
-    const byte7 = buf.readUInt8(7);
-    const byte8 = buf.readUInt8(8);
-    const byte9 = buf.readUInt8(9);
-    const byte10 = buf.readUInt8(10);
+    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 byte7 = buf.readUInt8(7);
+    let byte8 = buf.readUInt8(8);
+    let byte9 = buf.readUInt8(9);
+    let byte10 = buf.readUInt8(10);
+
+    let state = byte7 & 0b10000000 ? true : false;
+    let brightness = byte7 & 0b01111111;
+    let red = byte3;
+    let green = byte4;
+    let blue = byte5;
+    let delay = byte8 & 0b10000000;
+    let preset = byte8 & 0b00001000;
+    let color_mode = byte8 & 0b00000111;
+    let speed = byte9 & 0b01111111;
+    let loop_index = byte10 & 0b11111110;
 
-    const isOn = byte7 & 0b10000000;
-    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 = {
+    let data = {
       model: "r",
       modelName: "WoStrip",
-      isOn: isOn,
+      state: state,
       brightness: brightness,
+      red: red,
+      green: green,
+      blue: blue,
       delay: delay,
       preset: preset,
       color_mode: color_mode,

package/lib/switchbot-device-wobulb.js

@@ -35,10 +35,114 @@ class SwitchbotDeviceWoBulb extends SwitchbotDevice {
   }
 
   /**
-   * @returns {Promise<boolean>} resolves with a boolean that tells whether the plug in ON(true) or OFF(false)
+   * @returns {Promise<number>} resolves with brightness percent 
+   */
+  setBrightness(brightness) {
+    if (typeof brightness != "number") {
+      return new Promise((resolve, reject) => {
+        reject(
+          new Error(
+            "The type of target brightness percentage is incorrent: " +
+              typeof brightness
+          )
+        );
+      });
+    }
+    if (brightness > 100) {
+      brightness = 100;
+    } else if (brightness < 0) {
+      brightness = 0;
+    }
+    return this._setState([0x02, 0x14]);
+  }
+
+  /**
+   * @returns {Promise<number>} resolves with brightness percent 
+   */
+  setColorTemperature(color_temperature) {
+    if (typeof color_temperature != "number") {
+      return new Promise((resolve, reject) => {
+        reject(
+          new Error(
+            "The type of target brightness percentage is incorrent: " +
+              typeof brightness
+          )
+        );
+      });
+    }
+    if (color_temperature > 100) {
+      color_temperature = 100;
+    } else if (color_temperature < 0) {
+      color_temperature = 0;
+    }
+    return this._setState([0x02, 0x17, color_temperature]);
+  }
+
+  /**
+   * @returns {Promise<number>} resolves with brightness percent 
    */
-  toggle() {
-    return this._setState([0x02, 0x03]);
+   setRGB(brightness, red, green, blue) {
+    if (typeof brightness != "number") {
+      return new Promise((resolve, reject) => {
+        reject(
+          new Error(
+            "The type of target brightness percentage is incorrent: " +
+              typeof brightness
+          )
+        );
+      });
+    }
+    if (typeof red != "number") {
+      return new Promise((resolve, reject) => {
+        reject(
+          new Error(
+            "The type of target red is incorrent: " +
+              typeof red
+          )
+        );
+      });
+    }
+    if (typeof green != "number") {
+      return new Promise((resolve, reject) => {
+        reject(
+          new Error(
+            "The type of target green is incorrent: " +
+              typeof green
+          )
+        );
+      });
+    }
+    if (typeof blue != "number") {
+      return new Promise((resolve, reject) => {
+        reject(
+          new Error(
+            "The type of target blue is incorrent: " +
+              typeof blue
+          )
+        );
+      });
+    }
+    if (brightness > 100) {
+      brightness = 100;
+    } else if (brightness < 0) {
+      brightness = 0;
+    }
+    if (red > 255) {
+      red = 255;
+    } else if (red < 0) {
+      red = 0;
+    }
+    if (green > 255) {
+      green = 255;
+    } else if (green < 0) {
+      green = 0;
+    }
+    if (blue > 255) {
+      blue = 255;
+    } else if (blue < 0) {
+      blue = 0;
+    }
+    return this._setState([0x02, 0x12, brightness, red, green, blue]);
   }
 
   /**

package/lib/switchbot-device-wostrip.js

@@ -35,10 +35,108 @@ class SwitchbotDeviceWoStrip extends SwitchbotDevice {
   }
 
   /**
-   * @returns {Promise<boolean>} resolves with a boolean that tells whether the plug in ON(true) or OFF(false)
+   * @returns {Promise<number>} resolves with brightness percent 
+   */
+  setBrightness(brightness) {
+    if (typeof brightness != "number") {
+      return new Promise((resolve, reject) => {
+        reject(
+          new Error(
+            "The type of target brightness percentage is incorrent: " +
+              typeof brightness
+          )
+        );
+      });
+    }
+    if (brightness > 100) {
+      brightness = 100;
+    } else if (brightness < 0) {
+      brightness = 0;
+    }
+    return this._setState([0x02, 0x14]);
+  }
+
+  /**
+   * @returns {Promise<number>} resolves with color temperature 
+   */
+  setColorTemperature(color_temperature) {
+    if (color_temperature) {
+      return new Promise((resolve, reject) => {
+        reject(
+          new Error(
+            "Strip Light Doesn't Support Color temperature: " +
+              typeof color_temperature
+          )
+        );
+      });
+    }
+  }
+
+  /**
+   * @returns {Promise<number>} resolves with brightness + rgb 
    */
-  toggle() {
-    return this._setState([0x02, 0x03]);
+   setRGB(brightness, red, green, blue) {
+    if (typeof brightness != "number") {
+      return new Promise((resolve, reject) => {
+        reject(
+          new Error(
+            "The type of target brightness percentage is incorrent: " +
+              typeof brightness
+          )
+        );
+      });
+    }
+    if (typeof red != "number") {
+      return new Promise((resolve, reject) => {
+        reject(
+          new Error(
+            "The type of target red is incorrent: " +
+              typeof red
+          )
+        );
+      });
+    }
+    if (typeof green != "number") {
+      return new Promise((resolve, reject) => {
+        reject(
+          new Error(
+            "The type of target green is incorrent: " +
+              typeof green
+          )
+        );
+      });
+    }
+    if (typeof blue != "number") {
+      return new Promise((resolve, reject) => {
+        reject(
+          new Error(
+            "The type of target blue is incorrent: " +
+              typeof blue
+          )
+        );
+      });
+    }
+    if (brightness > 100) {
+      brightness = 100;
+    } else if (brightness < 0) {
+      brightness = 0;
+    }
+    if (red > 255) {
+      red = 255;
+    } else if (red < 0) {
+      red = 0;
+    }
+    if (green > 255) {
+      green = 255;
+    } else if (green < 0) {
+      green = 0;
+    }
+    if (blue > 255) {
+      blue = 255;
+    } else if (blue < 0) {
+      blue = 0;
+    }
+    return this._setState([0x02, 0x12, brightness, red, green, blue]);
   }
 
   /**

package/package.json

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