blindtilt

Author: donavanbecker

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,25 +378,21 @@ 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",
       modelName: "WoBlindTilt",
       calibration: calibration,
       battery: battery,
       inMotion: inMotion,
-      position: currPosition,
+      tilt: tilt,
       lightLevel: lightLevel,
-      deviceChain: deviceChain,
     };
 
     return data;

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 },
         },