@switchbot/homebridge-switchbot 2.5.0-beta.2 → 2.5.0-beta.4

package/src/device/blindtilt.ts

@@ -12,26 +12,42 @@ import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
 import { device, devicesConfig, serviceData, switchbot, deviceStatus, ad, HostDomain, DevicePath } from '../settings';
 import { sleep } from '../utils';
 
+enum BlindTiltMappingMode {
+  OnlyUp = 'only_up',
+  OnlyDown = 'only_down',
+  DownAndUp = 'down_and_up',
+  UpAndDown = 'up_and_down',
+  UseTiltForDirection = 'use_tilt_for_direction',
+}
+
 export class BlindTilt {
   // Services
   windowCoveringService: Service;
+  lightSensorService?: Service;
   batteryService?: Service;
 
   // Characteristic Values
   CurrentPosition!: CharacteristicValue;
   PositionState!: CharacteristicValue;
   TargetPosition!: CharacteristicValue;
-  BatteryLevel!: CharacteristicValue;
+  CurrentAmbientLightLevel?: CharacteristicValue;
+  BatteryLevel?: CharacteristicValue;
   StatusLowBattery?: CharacteristicValue;
+
   CurrentHorizontalTiltAngle!: CharacteristicValue;
   TargetHorizontalTiltAngle!: CharacteristicValue;
 
   // OpenAPI Others
   deviceStatus!: any; //deviceStatusResponse;
   slidePosition: deviceStatus['slidePosition'];
-  moving: deviceStatus['moving'];
-  Battery: deviceStatus['battery'];
   direction: deviceStatus['direction'];
+  moving: deviceStatus['moving'];
+  runStatus: deviceStatus['runStatus'];
+  brightness: deviceStatus['brightness'];
+  setPositionMode?: string | number;
+  Mode!: string;
+
+  mappingMode: BlindTiltMappingMode = BlindTiltMappingMode.OnlyUp;
 
   // BLE Others
   connected?: boolean;
@@ -43,6 +59,7 @@ export class BlindTilt {
   battery: serviceData['battery'];
   position: serviceData['position'];
   inMotion: serviceData['inMotion'];
+  lightLevel: serviceData['lightLevel'];
 
   // Target
   setNewTarget!: boolean;
@@ -79,6 +96,9 @@ export class BlindTilt {
     this.setupMqtt(device);
     this.context();
 
+    this.mappingMode = (device.blindTilt?.mappingMode as BlindTiltMappingMode) ?? BlindTiltMappingMode.OnlyUp;
+    this.debugLog(`Mapping mode: ${this.mappingMode}`);
+
     // this is subject we use to track when we need to POST changes to the SwitchBot API
     this.doBlindTiltUpdate = new Subject();
     this.blindTiltUpdateInProgress = false;
@@ -142,6 +162,7 @@ export class BlindTilt {
       })
       .onSet(this.TargetPositionSet.bind(this));
 
+    this.CurrentHorizontalTiltAngle = 90;
     this.windowCoveringService
       .getCharacteristic(this.platform.Characteristic.CurrentHorizontalTiltAngle)
       .setProps({
@@ -149,12 +170,13 @@ export class BlindTilt {
         minValue: -90,
         maxValue: 90,
         validValues: [-90, 90],
-        validValueRanges: [-90, 90],
       })
       .onGet(() => {
+        // this.debugLog(`requested CurrentHorizontalTiltAngle: ${this.CurrentHorizontalTiltAngle}`);
         return this.CurrentHorizontalTiltAngle;
       });
 
+    this.TargetHorizontalTiltAngle = 90;
     this.windowCoveringService
       .getCharacteristic(this.platform.Characteristic.TargetHorizontalTiltAngle)
       .setProps({
@@ -162,7 +184,6 @@ export class BlindTilt {
         minValue: -90,
         maxValue: 90,
         validValues: [-90, 90],
-        validValueRanges: [-90, 90],
       })
       .onSet(this.TargetHorizontalTiltAngleSet.bind(this));
 
@@ -266,7 +287,7 @@ export class BlindTilt {
         this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
         this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} DECREASING PositionState: ${this.PositionState}`);
       } else {
-        this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} Standby, CurrentPosition: ${this.CurrentPosition}`);
+        this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} Standby2, CurrentPosition: ${this.CurrentPosition}`);
         this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
         this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
         this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} STOPPED PositionState: ${this.PositionState}`);
@@ -282,6 +303,62 @@ export class BlindTilt {
         ` TargetPosition: ${this.TargetPosition}, PositionState: ${this.PositionState},`,
     );
 
+    if (!this.device.curtain?.hide_lightsensor) {
+      this.set_minLux = this.minLux();
+      this.set_maxLux = this.maxLux();
+      this.spaceBetweenLevels = 9;
+
+      // Brightness
+      switch (this.lightLevel) {
+        case 1:
+          this.CurrentAmbientLightLevel = this.set_minLux;
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+          break;
+        case 2:
+          this.CurrentAmbientLightLevel = (this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels;
+          this.debugLog(
+            `${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel},` +
+              ` Calculation: ${(this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels}`,
+          );
+          break;
+        case 3:
+          this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 2;
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+          break;
+        case 4:
+          this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 3;
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+          break;
+        case 5:
+          this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 4;
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+          break;
+        case 6:
+          this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 5;
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+          break;
+        case 7:
+          this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 6;
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+          break;
+        case 8:
+          this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 7;
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+          break;
+        case 9:
+          this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 8;
+          this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel}`);
+          break;
+        case 10:
+        default:
+          this.CurrentAmbientLightLevel = this.set_maxLux;
+          this.debugLog();
+      }
+      this.debugLog(
+        `${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.lightLevel},`
+        + ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`,
+      );
+    }
     // Battery
     this.BatteryLevel = Number(this.battery);
     if (this.BatteryLevel < 10) {
@@ -295,17 +372,28 @@ export class BlindTilt {
 
   async openAPIparseStatus(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
+
+    const [homekitPosition, homekitTiltAngle] = this.mapDeviceValuesToHomekitValues(Number(this.slidePosition), String(this.direction));
+    this.debugLog(` device: ${this.slidePosition} => HK: ${homekitPosition}`);
+
+    this.CurrentPosition = homekitPosition;
     // CurrentPosition
-    this.CurrentPosition = 100 - Number(this.slidePosition);
     await this.setMinMax();
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}`);
+
+    if(homekitTiltAngle) {
+      this.CurrentHorizontalTiltAngle = homekitTiltAngle!;
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentHorizontalTiltAngle: ${this.CurrentHorizontalTiltAngle}`);
+    }
+
     if (this.setNewTarget) {
       this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Checking Status ...`);
     }
 
-    if (this.setNewTarget && this.moving) {
+    this.debugLog(`runStatus: ${this.runStatus}`);
+    if (this.setNewTarget || (this.runStatus === undefined || this.runStatus !== 'static')) {
       await this.setMinMax();
-      if (this.TargetPosition > this.CurrentPosition) {
+      if (this.TargetPosition > this.CurrentPosition || (homekitTiltAngle && (this.TargetHorizontalTiltAngle !== this.CurrentHorizontalTiltAngle))) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Closing, CurrentPosition: ${this.CurrentPosition} `);
         this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
         this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
@@ -316,29 +404,41 @@ export class BlindTilt {
         this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
         this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} DECREASING PositionState: ${this.PositionState}`);
       } else {
-        this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} Standby, CurrentPosition: ${this.CurrentPosition}`);
+        this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} Standby because reached position,`+
+        ` CurrentPosition: ${this.CurrentPosition}`);
         this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
         this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
         this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} STOPPED PositionState: ${this.PositionState}`);
       }
     } else {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Standby, CurrentPosition: ${this.CurrentPosition}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Standby because device not moving,`+
+      ` CurrentPosition: ${this.CurrentPosition}`);
       this.TargetPosition = this.CurrentPosition;
+      if(homekitTiltAngle) {
+        this.TargetHorizontalTiltAngle = this.CurrentHorizontalTiltAngle;
+      }
       this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Stopped`);
     }
-    if (this.direction === 'Up') {
-      this.CurrentHorizontalTiltAngle = 90;
-    } else if (this.direction === 'Down') {
-      this.CurrentHorizontalTiltAngle = -90;
-    } else {
-      this.CurrentHorizontalTiltAngle = 0;
-    }
     this.debugLog(
       `${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition},` +
-          ` TargetPosition: ${this.TargetPosition}, PositionState: ${this.PositionState},` +
-          ` CurrentHorizontalTiltAngle: ${this.CurrentHorizontalTiltAngle}`,
+          ` TargetPosition: ${this.TargetPosition}, PositionState: ${this.PositionState},`,
     );
+
+    if (!this.device.curtain?.hide_lightsensor) {
+      this.set_minLux = this.minLux();
+      this.set_maxLux = this.maxLux();
+      // Brightness
+      switch (this.brightness) {
+        case 'dim':
+          this.CurrentAmbientLightLevel = this.set_minLux;
+          break;
+        case 'bright':
+        default:
+          this.CurrentAmbientLightLevel = this.set_maxLux;
+      }
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+    }
   }
 
   async refreshStatus(): Promise<void> {
@@ -369,6 +469,7 @@ export class BlindTilt {
     if (switchbot !== false) {
       switchbot
         .startScan({
+          model: 'c',
           id: this.device.bleMac,
         })
         .then(async () => {
@@ -382,10 +483,12 @@ export class BlindTilt {
             this.battery = ad.serviceData.battery;
             this.inMotion = ad.serviceData.inMotion;
             this.position = ad.serviceData.position;
+            this.lightLevel = ad.serviceData.lightLevel;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${superStringify(ad.serviceData)}`);
             this.debugLog(
               `${this.device.deviceType}: ${this.accessory.displayName} calibration: ${ad.serviceData.calibration}, ` +
-                `position: ${ad.serviceData.position}, inMotion: ${ad.serviceData.inMotion}, battery: ${ad.serviceData.battery}`);
+                `position: ${ad.serviceData.position}, lightLevel: ${ad.serviceData.lightLevel}, battery: ${ad.serviceData.battery}, ` +
+                `inMotion: ${ad.serviceData.inMotion}`);
 
             if (this.serviceData) {
               this.connected = true;
@@ -447,10 +550,11 @@ export class BlindTilt {
           try {
             this.deviceStatus = JSON.parse(rawData);
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus: ${superStringify(this.deviceStatus)}`);
-            this.slidePosition = this.deviceStatus.body.slidePosition;// "slidePosition": 0 = Closed Down | 100 = Closed Up | 50 = Fully Open
+            this.slidePosition = this.deviceStatus.body.slidePosition;
+            this.direction = this.deviceStatus.body.direction;
             this.moving = this.deviceStatus.body.moving;
-            this.Battery = this.deviceStatus.body.battery;
-            this.direction = this.deviceStatus.body.direction; // "Up"/"Down"
+            this.runStatus = this.deviceStatus.body.runStatus;
+            this.brightness = this.deviceStatus.body.brightness;
             this.openAPIparseStatus();
             this.updateHomeKitCharacteristics();
           } catch (e: any) {
@@ -500,6 +604,12 @@ export class BlindTilt {
         .join(':')
         .toLowerCase();
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
+      this.SilentPerformance();
+      const adjustedMode = this.setPositionMode || null;
+      if (adjustedMode === null) {
+        this.Mode = 'Default Mode';
+      }
+      this.debugLog(`${this.accessory.displayName} Mode: ${this.Mode}`);
       if (switchbot !== false) {
         switchbot
           .discover({ model: 'c', quick: true, id: this.device.bleMac })
@@ -508,7 +618,7 @@ export class BlindTilt {
             return await this.retry({
               max: await this.maxRetry(),
               fn: () => {
-                return device_list[0].runToPos(100 - Number(this.TargetPosition));
+                return device_list[0].runToPos(100 - Number(this.TargetPosition), adjustedMode);
               },
             });
           })
@@ -567,35 +677,15 @@ export class BlindTilt {
           .digest();
         const sign = signTerm.toString('base64');
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} sign: ${sign}`);
-        this.debugLog(`Pushing ${this.TargetPosition}`);
-        let command = '';
-        let parameter = '';
-        if (this.TargetHorizontalTiltAngle === 90 && this.TargetPosition === 100) {
-          command = 'fullyOpen';
-          parameter = 'default';
-        } else if (this.TargetHorizontalTiltAngle === -90 && this.TargetPosition === 100) {
-          command = 'fullyOpen';
-          parameter = 'default';
-        } else if (this.TargetHorizontalTiltAngle === 90 && this.TargetPosition === 0) {
-          command = 'closeUp';
-          parameter = 'default';
-        } else if (this.TargetHorizontalTiltAngle === -90 && this.TargetPosition === 0) {
-          command = 'closeDown';
-          parameter = 'default';
-        } else {
-          let direction = '';
-          const position = this.TargetPosition;
-          if (this.TargetHorizontalTiltAngle === 90) {
-            direction = 'up';
-          } else {
-            direction = 'down';
-          }
-          command = 'setPosition';
-          parameter = `${direction};${position}`;
-        }
+
+
+        const [direction, position] = this.mapHomekitValuesToDeviceValues(Number(this.TargetPosition), Number(this.TargetHorizontalTiltAngle));
+        this.debugLog(`Pushing ${this.TargetPosition} (device = ${direction};${position})`);
+
+        this.debugLog(`${this.accessory.displayName} Mode: ${this.Mode}`);
         const body = superStringify({
-          'command': `${command}`,
-          'parameter': `${parameter}`,
+          'command': 'setPosition',
+          'parameter': `${direction};${position}`,
           'commandType': 'command',
         });
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${body},`);
@@ -639,6 +729,25 @@ export class BlindTilt {
     }
   }
 
+  /**
+   * Handle requests to set the value of the "Target Horizontal Tilt" characteristic
+   */
+  async TargetHorizontalTiltAngleSet(value: CharacteristicValue): Promise<void> {
+    if (this.TargetHorizontalTiltAngle === this.accessory.context.TargetHorizontalTiltAngle) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set TargetHorizontalTiltAngle: ${value}`);
+    } else {
+      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetHorizontalTiltAngle: ${value}`);
+    }
+
+    //value = value < 0 ? -90 : 90;
+    this.TargetHorizontalTiltAngle = value;
+    if(this.device.mqttURL) {
+      this.mqttPublish('TargetHorizontalTiltAngle', this.TargetHorizontalTiltAngle);
+    }
+
+    this.startUpdatingBlindTiltIfNeeded();
+  }
+
   /**
    * Handle requests to set the value of the "Target Position" characteristic
    */
@@ -653,20 +762,27 @@ export class BlindTilt {
     if (this.device.mqttURL) {
       this.mqttPublish('TargetPosition', this.TargetPosition);
     }
+    this.startUpdatingBlindTiltIfNeeded();
+  }
 
+  async startUpdatingBlindTiltIfNeeded(): Promise<void> {
     await this.setMinMax();
-    if (value > this.CurrentPosition) {
+    this.debugLog('setMinMax');
+    if (this.TargetPosition > this.CurrentPosition || (this.TargetHorizontalTiltAngle !== this.CurrentHorizontalTiltAngle)) {
       this.PositionState = this.platform.Characteristic.PositionState.INCREASING;
       this.setNewTarget = true;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
-    } else if (value < this.CurrentPosition) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} value: ${this.CurrentPosition},`+
+      ` CurrentPosition: ${this.CurrentPosition}`);
+    } else if (this.TargetPosition < this.CurrentPosition) {
       this.PositionState = this.platform.Characteristic.PositionState.DECREASING;
       this.setNewTarget = true;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} value: ${this.CurrentPosition},`+
+      ` CurrentPosition: ${this.CurrentPosition}`);
     } else {
       this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
       this.setNewTarget = false;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} value: ${value}, CurrentPosition: ${this.CurrentPosition}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} value: ${this.CurrentPosition},`+
+      ` CurrentPosition: ${this.CurrentPosition}`);
     }
     this.windowCoveringService.setCharacteristic(this.platform.Characteristic.PositionState, this.PositionState);
     this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
@@ -686,42 +802,24 @@ export class BlindTilt {
     this.doBlindTiltUpdate.next();
   }
 
-  /**
-   * Handle requests to set the value of the "Target Position" characteristic
-   */
-  async TargetHorizontalTiltAngleSet(value: CharacteristicValue): Promise<void> {
-    if (this.TargetHorizontalTiltAngle === this.accessory.context.TargetHorizontalTiltAngle) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set TargetHorizontalTiltAngle: ${value}`);
-    } else {
-      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetHorizontalTiltAngle: ${value}`);
-    }
-
-    this.TargetHorizontalTiltAngle = value;
-    this.accessory.context.TargetHorizontalTiltAngle = this.TargetHorizontalTiltAngle;
-    if (this.device.mqttURL) {
-      this.mqttPublish('TargetHorizontalTiltAngle', this.TargetHorizontalTiltAngle);
-    }
-
-    this.windowCoveringService.setCharacteristic(this.platform.Characteristic.PositionState, this.PositionState);
-    this.windowCoveringService.getCharacteristic(this.platform.Characteristic.PositionState).updateValue(this.PositionState);
+  async updateHomeKitCharacteristics(): Promise<void> {
+    await this.setMinMax();
 
-    /**
-     * If Blind Tilt movement time is short, the moving flag from backend is always false.
-     * The minimum time depends on the network control latency.
-     */
-    clearTimeout(this.setNewTargetTimer);
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateRate: ${this.updateRate}`);
-    if (this.setNewTarget) {
-      this.setNewTargetTimer = setTimeout(() => {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} setNewTarget ${this.setNewTarget} timeout`);
-        this.setNewTarget = false;
-      }, this.updateRate * 1000);
+    if(this.mappingMode === BlindTiltMappingMode.UseTiltForDirection) {
+      if (this.CurrentHorizontalTiltAngle === undefined || Number.isNaN(this.CurrentHorizontalTiltAngle)) {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentHorizontalTiltAngle: ${this.CurrentHorizontalTiltAngle}`);
+      } else {
+        if (this.device.mqttURL) {
+          this.mqttPublish('CurrentHorizontalTiltAngle', this.CurrentHorizontalTiltAngle);
+        }
+        this.accessory.context.CurrentHorizontalTiltAngle = this.CurrentHorizontalTiltAngle;
+        this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.CurrentHorizontalTiltAngle,
+          Number(this.CurrentHorizontalTiltAngle));
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} 
+        updateCharacteristic CurrentHorizontalTiltAngle: ${this.CurrentHorizontalTiltAngle}`);
+      }
     }
-    this.doBlindTiltUpdate.next();
-  }
 
-  async updateHomeKitCharacteristics(): Promise<void> {
-    await this.setMinMax();
     if (this.CurrentPosition === undefined || Number.isNaN(this.CurrentPosition)) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}`);
     } else {
@@ -752,16 +850,18 @@ export class BlindTilt {
       this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.TargetPosition, Number(this.TargetPosition));
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: ${this.TargetPosition}`);
     }
-    if (this.TargetHorizontalTiltAngle === undefined || Number.isNaN(this.TargetHorizontalTiltAngle)) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} TargetHorizontalTiltAngle: ${this.TargetHorizontalTiltAngle}`);
-    } else {
-      if (this.device.mqttURL) {
-        this.mqttPublish('TargetHorizontalTiltAngle', this.TargetHorizontalTiltAngle);
+    if (!this.device.curtain?.hide_lightsensor) {
+      if (this.CurrentAmbientLightLevel === undefined || Number.isNaN(this.CurrentAmbientLightLevel)) {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+      } else {
+        if (this.device.mqttURL) {
+          this.mqttPublish('CurrentAmbientLightLevel', this.CurrentAmbientLightLevel);
+        }
+        this.accessory.context.CurrentAmbientLightLevel = this.CurrentAmbientLightLevel;
+        this.lightSensorService?.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, this.CurrentAmbientLightLevel);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+        + ` updateCharacteristic CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
       }
-      this.accessory.context.TargetHorizontalTiltAngle = this.TargetHorizontalTiltAngle;
-      this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.TargetHorizontalTiltAngle, Number(this.TargetHorizontalTiltAngle));
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
-      + ` TargetHorizontalTiltAngle: ${this.TargetHorizontalTiltAngle}`);
     }
     if (this.BLE) {
       if (this.BatteryLevel === undefined) {
@@ -862,6 +962,26 @@ export class BlindTilt {
     }
   }
 
+  async SilentPerformance() {
+    if (this.TargetPosition > 50) {
+      if (this.device.curtain?.setOpenMode === '1') {
+        this.setPositionMode = 1;
+        this.Mode = 'Silent Mode';
+      } else {
+        this.setPositionMode = 0;
+        this.Mode = 'Performance Mode';
+      }
+    } else {
+      if (this.device.curtain?.setCloseMode === '1') {
+        this.setPositionMode = 1;
+        this.Mode = 'Silent Mode';
+      } else {
+        this.setPositionMode = 0;
+        this.Mode = 'Performance Mode';
+      }
+    }
+  }
+
   async setMinMax(): Promise<void> {
     if (this.device.curtain?.set_min) {
       if (this.CurrentPosition <= this.device.curtain?.set_min) {
@@ -873,13 +993,17 @@ export class BlindTilt {
         this.CurrentPosition = 100;
       }
     }
+
+    if(this.mappingMode === BlindTiltMappingMode.UseTiltForDirection) {
+      this.CurrentHorizontalTiltAngle = this.CurrentHorizontalTiltAngle < 0 ? -90 : 90;
+    }
   }
 
   minStep(device: device & devicesConfig): number {
     if (device.curtain?.set_minStep) {
       this.set_minStep = device.curtain?.set_minStep;
     } else {
-      this.set_minStep = 90;
+      this.set_minStep = 1;
     }
     return this.set_minStep;
   }
@@ -976,6 +1100,9 @@ export class BlindTilt {
     this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.CurrentPosition, e);
     this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.PositionState, e);
     this.windowCoveringService.updateCharacteristic(this.platform.Characteristic.TargetPosition, e);
+    if (!this.device.curtain?.hide_lightsensor) {
+      this.lightSensorService?.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, e);
+    }
     if (this.BLE) {
       this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
       this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
@@ -1012,12 +1139,6 @@ export class BlindTilt {
       this.TargetPosition = this.accessory.context.TargetPosition;
     }
 
-    if (this.TargetHorizontalTiltAngle === undefined) {
-      this.TargetHorizontalTiltAngle = 0;
-    } else {
-      this.TargetHorizontalTiltAngle = this.accessory.context.TargetHorizontalTiltAngle;
-    }
-
     if (this.PositionState === undefined) {
       this.PositionState = this.platform.Characteristic.PositionState.STOPPED;
     } else {
@@ -1025,6 +1146,126 @@ export class BlindTilt {
     }
   }
 
+  /**
+   * Maps device values to homekit values
+   *
+   * @param devicePosition the position as reported by the devide
+   * @param direction the direction as reported by the device
+   * @returns [homekit position, homekit tiltAngle]
+   */
+  mapDeviceValuesToHomekitValues(devicePosition: number, deviceDirection: string): [CharacteristicValue, CharacteristicValue?] {
+    // device position 0 => closed down
+    // device position 50 => open
+    // device position 100 => closed up
+
+    // homekit position 0 =>  closed
+    // homekit position 100 => open
+    deviceDirection;
+    switch(this.mappingMode) {
+      case BlindTiltMappingMode.OnlyUp:
+        // we only close upwards, so we see anything that is tilted downwards(<50) as open
+        if(devicePosition < 50) {
+          return [100, undefined]; // fully open in homekit
+        } else {
+          // we range from 50->100, with 100 being closed, so map to homekit by scaling to 0..100 and then reversing
+          return [100 - (devicePosition - 50) * 2, undefined];
+        }
+
+      case BlindTiltMappingMode.OnlyDown:
+        // we only close downwards, so we see anything that is tilted upwards(>50) as upwards
+        if(devicePosition > 50) {
+          return [100, undefined]; // fully open in homekit
+        } else {
+          // we range from 0..50 so scale to homekit and then reverse
+          return [devicePosition * 2, undefined];
+        }
+
+      case BlindTiltMappingMode.DownAndUp:
+        // we close both ways with closed downwards being 0 in homekit and closed upwards in homekit being 100. Open is 50 in homekit
+        return [devicePosition, undefined];
+
+      case BlindTiltMappingMode.UpAndDown:
+        // we close both ways with closed downwards being 1000 in homekit and closed upwards in homekit being 0. Open is 50 in homekit.,
+        // so we reverse the value
+        return [100 - devicePosition, undefined];
+
+      case BlindTiltMappingMode.UseTiltForDirection:
+        // we use tilt for direction, so being closed downwards is 0 in homekit with -90 tilt, while being closed upwards is 0 with 90 tilt.
+        if(devicePosition <= 50) {
+          // downwards tilted, so we range from 0..50, with 0 being closed and 50 being open, so scale.
+          return [devicePosition * 2, -90];
+        } else {
+          // upwards tilted, so we range from 50..100, with 50 being open and 100 being closed, so scale and rever
+          return [100 - (devicePosition - 50) * 2, 90];
+        }
+    }
+  }
+
+  /**
+   * Maps homekit values to device values
+   *
+   * @param homekitPosition the position as reported by homekit
+   * @param homekitTiltAngle? the tilt angle as reported by homekit
+   * @returns [device position, device direction]
+   */
+  mapHomekitValuesToDeviceValues(homekitPosition: number, homekitTiltAngle: number): [string, number] {
+    // homekit position 0 =>  closed
+    // homekit position 100 => open
+
+    // device position [up, 0] = closed upwards
+    // device position [down, 0] = closed downwards
+    // device position [up, 100] = open
+    // device position [down, 100] = open
+
+    switch(this.mappingMode) {
+      case BlindTiltMappingMode.OnlyUp:
+        // invert
+        return ['up', homekitPosition];
+      case BlindTiltMappingMode.OnlyDown:
+        // invert
+        return ['down', homekitPosition];
+
+      case BlindTiltMappingMode.DownAndUp:
+        // homekit 0 = downwards closed,
+        // homekit 50 = open,
+        // homekit 100 = upwards closed
+        if(homekitPosition <= 50) {
+          // homekit 0..50 -> device 100..0 so scale and invert
+          return ['down', 100 - homekitPosition * 2];
+        } else {
+          // homekit 50..100 -> device 0..100, so rebase, scale and invert
+          return ['up', (homekitPosition - 50) * 2];
+        }
+
+      case BlindTiltMappingMode.UpAndDown:
+        // homekit 0 = upwards closed,
+        // homekit 50 = open,
+        // homekit 100 = upwards closed
+        if(homekitPosition <= 50) {
+          // homekit 0..50 -> device 0..100 so scale and invert
+          return ['up', homekitPosition * 2];
+        } else {
+          // homekit 50..100 -> device 100...0 so scale
+          return ['down', 100 - homekitPosition * 2];
+        }
+
+      case BlindTiltMappingMode.UseTiltForDirection:
+        // tilt -90, homekit 0 = closed downwards
+        // tilt -90, homekit 100 = open
+        // tilt 90, homekit 0 = closed upwards
+        // tilt 90, homekit 100 = open
+        if(homekitTiltAngle! <= 0) {
+          // downwards
+          // homekit 0..100 -> device 0..100, so invert
+          return ['down', homekitPosition];
+        } else {
+          // upwards
+          // homekit 0..100 -> device 0..100, so invert
+          return ['up,', homekitPosition];
+        }
+    }
+  }
+
   async refreshRate(device: device & devicesConfig): Promise<void> {
     // refreshRate
     if (device.refreshRate) {
@@ -1035,19 +1276,19 @@ export class BlindTilt {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
     }
     // updateRate
-    if (device?.curtain?.updateRate) {
-      this.updateRate = device?.curtain?.updateRate;
+    if (device?.blindTilt?.updateRate) {
+      this.updateRate = device?.blindTilt?.updateRate;
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Blind Tilt updateRate: ${this.updateRate}`);
     } else {
-      this.updateRate = 7;
+      this.updateRate = 2;
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default Blind Tilt updateRate: ${this.updateRate}`);
     }
   }
 
   async config(device: device & devicesConfig): Promise<void> {
     let config = {};
-    if (device.curtain) {
-      config = device.curtain;
+    if (device.blindTilt) {
+      config = device.blindTilt;
     }
     if (device.connectionType !== undefined) {
       config['connectionType'] = device.connectionType;
@@ -1070,6 +1311,13 @@ export class BlindTilt {
     if (device.maxRetry !== undefined) {
       config['maxRetry'] = device.maxRetry;
     }
+
+    if(device.blindTilt?.mappingMode === undefined) {
+      config['mappingMode'] = BlindTiltMappingMode.OnlyUp;
+    } else {
+      config['mappingMode'] = device.blindTilt?.mappingMode;
+    }
+
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${superStringify(config)}`);
     }
@@ -1141,4 +1389,4 @@ export class BlindTilt {
   enablingDeviceLogging(): boolean {
     return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
   }
-}
+}