node-switchbot 1.8.0-beta.2 → 1.8.0-beta.4

package/lib/switchbot-advertising.js

@@ -94,7 +94,7 @@ class SwitchbotAdvertising {
       sd = this._parseServiceDataForWoContact(buf, onlog);//WoContact
     } else if (model === "c") {
       sd = this._parseServiceDataForWoCurtain(buf, onlog);// WoCurtain
-    } else if (model === "x") {
+    } else if (model === "x" || 'X') {
       sd = this._parseServiceDataForWoBlindTilt(buf, onlog);// WoBlindTilt
     } else if (model === "u") {
       sd = this._parseServiceDataForWoBulb(manufacturerData, onlog);// WoBulb
@@ -378,15 +378,12 @@ class SwitchbotAdvertising {
     }
     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 calibration = byte1 & 0b00000001 ? 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 inMotion = byte2 & 0b10000000 ? true : false;
+    let tilt = byte2 & 0b01111111; // current tilt % (100 - _tilt) if reverse else _tilt,
+    let lightLevel = (byte1 >> 4) & 0b00001111; // light sensor level (1-10)
 
     let data = {
       model: "x",
@@ -394,9 +391,8 @@ class SwitchbotAdvertising {
       calibration: calibration,
       battery: battery,
       inMotion: inMotion,
-      position: currPosition,
+      tilt: tilt,
       lightLevel: lightLevel,
-      deviceChain: deviceChain,
     };
 
     return data;

package/lib/switchbot-device-wocurtain.js

@@ -49,7 +49,7 @@ class SwitchbotDeviceWoCurtain extends SwitchbotDevice {
 
   /* ------------------------------------------------------------------
    * runToPos()
-   * - run to the targe position
+   * - run to the target position
    *
    * [Arguments]
    * - percent | number | Required | the percentage of target position
@@ -63,7 +63,7 @@ class SwitchbotDeviceWoCurtain extends SwitchbotDevice {
       return new Promise((resolve, reject) => {
         reject(
           new Error(
-            "The type of target position percentage is incorrent: " +
+            "The type of target position percentage is incorrect: " +
               typeof percent
           )
         );
@@ -75,7 +75,7 @@ class SwitchbotDeviceWoCurtain extends SwitchbotDevice {
       if (typeof mode != "number") {
         return new Promise((resolve, reject) => {
           reject(
-            new Error("The type of running mode is incorrent: " + typeof mode)
+            new Error("The type of running mode is incorrect: " + typeof mode)
           );
         });
       }

package/lib/switchbot-device.js

@@ -444,7 +444,7 @@ class SwitchbotDevice {
       this._connect()
         .then(() => {
           if (!this._chars) {
-            return reject("No characteristics available.");
+            return reject(new Error("No characteristics available."));
           }
           return this._write(this._chars.write, req_buf);
         })

package/lib/switchbot.js

@@ -107,6 +107,7 @@ class Switchbot {
               "i",
               "r",
               "x",
+              "X",
             ],
           },
           id: { required: false, type: "string", min: 12, max: 17 },
@@ -245,6 +246,7 @@ class Switchbot {
           device = new SwitchbotDeviceWoCurtain(peripheral, this.noble);
           break;
         case "x":
+        case "X":
           device = new SwitchbotDeviceWoBlindTilt(peripheral, this.noble);
           break;
         case "u":
@@ -355,7 +357,22 @@ class Switchbot {
           model: {
             required: false,
             type: "string",
-            enum: ["H", "T", "e", "s", "d", "c", "u", "g", "j", "o", "i", "r", "x"],
+            enum: [
+              "H",
+              "T",
+              "e",
+              "s",
+              "d",
+              "c",
+              "u",
+              "g",
+              "j",
+              "o",
+              "i",
+              "r",
+              "x",
+              "X",
+            ],
           },
           id: { required: false, type: "string", min: 12, max: 17 },
         },

package/package.json

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