node-switchbot 1.7.3-beta.1 → 1.8.0-beta.0

package/lib/switchbot-advertising.js

@@ -94,6 +94,8 @@ class SwitchbotAdvertising {
       sd = this._parseServiceDataForWoContact(buf, onlog);//WoContact
     } else if (model === "c") {
       sd = this._parseServiceDataForWoCurtain(buf, onlog);// WoCurtain
+    } else if (model === "x") {
+      sd = this._parseServiceDataForWoBlindTilt(buf, onlog);// WoBlindTilt
     } else if (model === "u") {
       sd = this._parseServiceDataForWoBulb(manufacturerData, onlog);// WoBulb
     } else if (model === "g") {
@@ -365,6 +367,41 @@ class SwitchbotAdvertising {
     return data;
   }
 
+  _parseServiceDataForWoBlindTilt(buf, onlog) {
+    if (buf.length !== 5 && buf.length !== 6) {
+      if (onlog && typeof onlog === "function") {
+        onlog(
+          `[_parseServiceDataForWoBlindTilt] Buffer length ${buf.length} !== 5 or 6!`
+        );
+      }
+      return null;
+    }
+    let byte1 = buf.readUInt8(1);
+    let byte2 = buf.readUInt8(2);
+    let byte3 = buf.readUInt8(3);
+    let byte4 = buf.readUInt8(4);
+
+    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 lightLevel = (byte4 >> 4) & 0b00001111; // light sensor level (1-10)
+    let deviceChain = byte4 & 0b00000111;
+
+    let data = {
+      model: "x",
+      modelName: "WoBlindTilt",
+      calibration: calibration,
+      battery: battery,
+      inMotion: inMotion,
+      position: currPosition,
+      lightLevel: lightLevel,
+      deviceChain: deviceChain,
+    };
+
+    return data;
+  }
+
   _parseServiceDataForWoBulb(manufacturerData, onlog) {
     if (manufacturerData.length !== 13) {
       if (onlog && typeof onlog === "function") {

package/lib/switchbot-device-woblindtilt.js

@@ -0,0 +1,117 @@
+"use strict";
+let SwitchbotDevice = require("./switchbot-device.js");
+
+class SwitchbotDeviceWoBlindTilt extends SwitchbotDevice {
+  /* ------------------------------------------------------------------
+   * open()
+   * - Open the blindtilt
+   *
+   * [Arguments]
+   * - none
+   *
+   * [Return value]
+   * - Promise object
+   *   Nothing will be passed to the `resolve()`.
+   * ---------------------------------------------------------------- */
+  open() {
+    return this._operateBlindTilt([0x57, 0x0f, 0x45, 0x01, 0x05, 0xff, 0x00]);
+  }
+
+  /* ------------------------------------------------------------------
+   * close()
+   * - close the blindtilt
+   *
+   * [Arguments]
+   * - none
+   *
+   * [Return value]
+   * - Promise object
+   *   Nothing will be passed to the `resolve()`.
+   * ---------------------------------------------------------------- */
+  close() {
+    return this._operateBlindTilt([0x57, 0x0f, 0x45, 0x01, 0x05, 0xff, 0x64]);
+  }
+
+  /* ------------------------------------------------------------------
+   * pause()
+   * - pause the blindtilt
+   *
+   * [Arguments]
+   * - none
+   *
+   * [Return value]
+   * - Promise object
+   *   Nothing will be passed to the `resolve()`.
+   * ---------------------------------------------------------------- */
+  pause() {
+    return this._operateBlindTilt([0x57, 0x0f, 0x45, 0x01, 0x00, 0xff]);
+  }
+
+  /* ------------------------------------------------------------------
+   * runToPos()
+   * - run to the targe position
+   *
+   * [Arguments]
+   * - percent | number | Required | the percentage of target position
+   *
+   * [Return value]
+   * - Promise object
+   *   Nothing will be passed to the `resolve()`.
+   * ---------------------------------------------------------------- */
+  runToPos(percent, mode) {
+    if (typeof percent != "number") {
+      return new Promise((resolve, reject) => {
+        reject(
+          new Error(
+            "The type of target position percentage is incorrent: " +
+              typeof percent
+          )
+        );
+      });
+    }
+    if (mode == null) {
+      mode = 0xff;
+    } else {
+      if (typeof mode != "number") {
+        return new Promise((resolve, reject) => {
+          reject(
+            new Error("The type of running mode is incorrent: " + typeof mode)
+          );
+        });
+      }
+      if (mode > 1) {
+        mode = 0xff;
+      }
+    }
+    if (percent > 100) {
+      percent = 100;
+    } else if (percent < 0) {
+      percent = 0;
+    }
+    return this._operateBlindTilt([0x57, 0x0f, 0x45, 0x01, 0x05, mode, percent]);
+  }
+
+  _operateBlindTilt(bytes) {
+    return new Promise((resolve, reject) => {
+      let req_buf = Buffer.from(bytes);
+      this._command(req_buf)
+        .then((res_buf) => {
+          let code = res_buf.readUInt8(0);
+          if (res_buf.length === 3 && code === 0x01) {
+            resolve();
+          } else {
+            reject(
+              new Error(
+                "The device returned an error: 0x" + res_buf.toString("hex")
+              )
+            );
+          }
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  }
+}
+
+module.exports = SwitchbotDeviceWoBlindTilt;

package/lib/switchbot.js

@@ -5,6 +5,7 @@ let switchbotAdvertising = require("./switchbot-advertising.js");
 let SwitchbotDevice = require("./switchbot-device.js");
 let SwitchbotDeviceWoHand = require("./switchbot-device-wohand.js");
 let SwitchbotDeviceWoCurtain = require("./switchbot-device-wocurtain.js");
+let SwitchbotDeviceWoBlindTilt = require("./switchbot-device-woblindtilt.js");
 let SwitchbotDeviceWoPresence = require("./switchbot-device-wopresence.js");
 let SwitchbotDeviceWoContact = require("./switchbot-device-wocontact.js");
 let SwitchbotDeviceWoSensorTH = require("./switchbot-device-wosensorth.js");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-switchbot",
-  "version": "1.7.3-beta.1",
+  "version": "1.8.0-beta.0",
   "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": [
@@ -20,6 +20,7 @@
     "temperature",
     "humidity",
     "curtain",
+    "blind",
     "BLE",
     "Bluetooth Low Energy",
     "Bluetooth smart",
@@ -37,6 +38,6 @@
     "@abandonware/noble": "^1.9.2-19"
   },
   "devDependencies": {
-    "npm-check-updates": "^16.6.2"
+    "npm-check-updates": "^16.6.3"
   }
 }