@switchbot/homebridge-switchbot 3.7.1-beta.2 → 3.7.1-beta.21

package/dist/device/blindtilt.js

@@ -1,21 +1,23 @@
-/* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
- *
- * blindtilt.ts: @switchbot/homebridge-switchbot.
- */
-import { deviceBase } from './device.js';
-import { BlindTiltMappingMode } from '../utils.js';
+/*
+* For Testing Locally:
+* import { SwitchBotBLEModel, SwitchBotBLEModelName } from '/Users/Shared/GitHub/OpenWonderLabs/node-switchbot/dist/index.js';
+*/
 import { SwitchBotBLEModel, SwitchBotBLEModelName } from 'node-switchbot';
-import { Subject, debounceTime, interval, skipWhile, take, tap } from 'rxjs';
+import { debounceTime, interval, skipWhile, Subject, take, tap } from 'rxjs';
+import { BlindTiltMappingMode } from '../utils.js';
+import { deviceBase } from './device.js';
 export class BlindTilt extends deviceBase {
     platform;
     // Services
     WindowCovering;
     Battery;
     LightSensor;
+    OpenModeSwitch;
+    CloseModeSwitch;
     // OpenAPI
     deviceStatus;
     mappingMode = BlindTiltMappingMode.OnlyUp;
-    //Webhook
+    // Webhook
     webhookContext;
     // BLE
     serviceData;
@@ -23,6 +25,7 @@ export class BlindTilt extends deviceBase {
     setNewTarget;
     setNewTargetTimer;
     // Updates
+    blindTiltMoving;
     blindTiltUpdateInProgress;
     doBlindTiltUpdate;
     constructor(platform, accessory, device) {
@@ -35,6 +38,7 @@ export class BlindTilt extends deviceBase {
         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.blindTiltMoving = false;
         this.blindTiltUpdateInProgress = false;
         this.setNewTarget = false;
         // Initialize WindowCovering Service
@@ -50,23 +54,16 @@ export class BlindTilt extends deviceBase {
         };
         accessory.context.WindowCovering = this.WindowCovering;
         // Initialize WindowCovering Characteristics
-        this.WindowCovering.Service
-            .setCharacteristic(this.hap.Characteristic.Name, this.WindowCovering.Name)
-            .getCharacteristic(this.hap.Characteristic.TargetPosition)
-            .setProps({
+        this.WindowCovering.Service.setCharacteristic(this.hap.Characteristic.Name, this.WindowCovering.Name).getCharacteristic(this.hap.Characteristic.TargetPosition).setProps({
             minStep: device.blindTilt?.set_minStep ?? 1,
             minValue: 0,
             maxValue: 100,
             validValueRanges: [0, 100],
-        })
-            .onGet(() => {
+        }).onGet(() => {
             return this.WindowCovering.TargetPosition;
-        })
-            .onSet(this.TargetPositionSet.bind(this));
+        }).onSet(this.TargetPositionSet.bind(this));
         // Initialize WindowCovering CurrentPosition Characteristic
-        this.WindowCovering.Service
-            .getCharacteristic(this.hap.Characteristic.CurrentPosition)
-            .setProps({
+        this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.CurrentPosition).setProps({
             minStep: device.blindTilt?.set_minStep ?? 1,
             minValue: 0,
             maxValue: 100,
@@ -75,22 +72,16 @@ export class BlindTilt extends deviceBase {
             return this.WindowCovering.CurrentPosition ?? 0;
         });
         // Initialize WindowCovering TargetHorizontalTiltAngle Characteristic
-        this.WindowCovering.Service
-            .getCharacteristic(this.hap.Characteristic.TargetHorizontalTiltAngle)
-            .setProps({
+        this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.TargetHorizontalTiltAngle).setProps({
             minStep: 180,
             minValue: -90,
             maxValue: 90,
             validValues: [-90, 90],
-        })
-            .onGet(() => {
+        }).onGet(() => {
             return this.WindowCovering.TargetHorizontalTiltAngle;
-        })
-            .onSet(this.TargetHorizontalTiltAngleSet.bind(this));
+        }).onSet(this.TargetHorizontalTiltAngleSet.bind(this));
         // Initialize WindowCovering CurrentHorizontalTiltAngle Characteristic
-        this.WindowCovering.Service
-            .getCharacteristic(this.hap.Characteristic.CurrentHorizontalTiltAngle)
-            .setProps({
+        this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.CurrentHorizontalTiltAngle).setProps({
             minStep: 180,
             minValue: -90,
             maxValue: 90,
@@ -109,9 +100,7 @@ export class BlindTilt extends deviceBase {
         };
         accessory.context.Battery = this.Battery;
         // Initialize Battery Name Characteristic
-        this.Battery.Service
-            .setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name)
-            .setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
+        this.Battery.Service.setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name).setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
         // Initialize LightSensor Service
         if (device.blindTilt?.hide_lightsensor) {
             if (this.LightSensor?.Service) {
@@ -133,20 +122,80 @@ export class BlindTilt extends deviceBase {
             };
             accessory.context.LightSensor = this.LightSensor;
             // Initialize LightSensor Characteristics
-            this.LightSensor.Service
-                .setCharacteristic(this.hap.Characteristic.Name, this.LightSensor.Name)
-                .setCharacteristic(this.hap.Characteristic.StatusActive, true)
-                .getCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel)
-                .onGet(() => {
+            this.LightSensor.Service.setCharacteristic(this.hap.Characteristic.Name, this.LightSensor.Name).setCharacteristic(this.hap.Characteristic.StatusActive, true).getCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel).onGet(() => {
                 return this.LightSensor?.CurrentAmbientLightLevel ?? 0.0001;
             });
         }
+        // Initialize Open Mode Switch Service
+        if (!device.blindTilt?.silentModeSwitch) {
+            if (this.OpenModeSwitch?.Service) {
+                this.debugLog('Removing Open Mode Switch Service');
+                this.OpenModeSwitch.Service = this.accessory.getService(this.hap.Service.Switch);
+                accessory.removeService(this.OpenModeSwitch.Service);
+                accessory.context.OpenModeSwitch = {};
+            }
+        }
+        else {
+            accessory.context.OpenModeSwitch = accessory.context.OpenModeSwitch ?? {};
+            this.OpenModeSwitch = {
+                Name: `${accessory.displayName} Silent Open Mode`,
+                Service: accessory.getService(this.hap.Service.Switch) ?? accessory.addService(this.hap.Service.Switch),
+                On: accessory.context.OpenModeSwitch.On ?? false,
+            };
+            accessory.context.OpenModeSwitch = this.OpenModeSwitch;
+            // Initialize Open Mode Switch Service
+            this.OpenModeSwitch.Service.setCharacteristic(this.hap.Characteristic.Name, this.OpenModeSwitch.Name).getCharacteristic(this.hap.Characteristic.On).onGet(() => {
+                return this.OpenModeSwitch?.On ?? false;
+            });
+            this.OpenModeSwitch.Service.getCharacteristic(this.hap.Characteristic.On).onSet(this.OpenModeSwitchSet.bind(this));
+        }
+        // Initialize Close Mode Switch Service
+        if (!device.blindTilt?.silentModeSwitch) {
+            if (this.CloseModeSwitch?.Service) {
+                this.debugLog('Removing Close Mode Switch Service');
+                this.CloseModeSwitch.Service = this.accessory.getService(this.hap.Service.Switch);
+                accessory.removeService(this.CloseModeSwitch.Service);
+                accessory.context.CloseModeSwitch = {};
+            }
+        }
+        else {
+            accessory.context.CloseModeSwitch = accessory.context.CloseModeSwitch ?? {};
+            this.CloseModeSwitch = {
+                Name: `${accessory.displayName} Silent Close Mode`,
+                Service: accessory.getService(this.hap.Service.Switch) ?? accessory.addService(this.hap.Service.Switch),
+                On: accessory.context.CloseModeSwitch.On ?? false,
+            };
+            accessory.context.CloseModeSwitch = this.CloseModeSwitch;
+            // Initialize Close Mode Switch Service
+            this.CloseModeSwitch.Service.setCharacteristic(this.hap.Characteristic.Name, this.CloseModeSwitch.Name).getCharacteristic(this.hap.Characteristic.On).onGet(() => {
+                return this.CloseModeSwitch?.On ?? false;
+            });
+            this.CloseModeSwitch.Service.getCharacteristic(this.hap.Characteristic.On).onSet(this.CloseModeSwitchSet.bind(this));
+        }
         // Retrieve initial values and updateHomekit
-        this.debugLog('Retrieve initial values and update Homekit');
-        this.refreshStatus();
-        //regisiter webhook event handler
-        this.debugLog('Registering Webhook Event Handler');
-        this.registerWebhook();
+        try {
+            this.debugLog('Retrieve initial values and update Homekit');
+            this.refreshStatus();
+        }
+        catch (e) {
+            this.errorLog(`failed to retrieve initial values and update Homekit, Error: ${e}`);
+        }
+        // regisiter webhook event handler if enabled
+        try {
+            this.debugLog('Registering Webhook Event Handler');
+            this.registerWebhook();
+        }
+        catch (e) {
+            this.errorLog(`failed to registerWebhook, Error: ${e}`);
+        }
+        // regisiter platform BLE event handler if enabled
+        try {
+            this.debugLog('Registering Platform BLE Event Handler');
+            this.registerPlatformBLE();
+        }
+        catch (e) {
+            this.errorLog(`failed to registerPlatformBLE, Error: ${e}`);
+        }
         // Start an update interval
         interval(this.deviceRefreshRate * 1000)
             .pipe(skipWhile(() => this.blindTiltUpdateInProgress))
@@ -155,6 +204,7 @@ export class BlindTilt extends deviceBase {
         });
         // update slide progress
         interval(this.deviceUpdateRate * 1000)
+            .pipe(skipWhile(() => !this.blindTiltMoving))
             .subscribe(async () => {
             if (this.WindowCovering.PositionState === this.hap.Characteristic.PositionState.STOPPED) {
                 return;
@@ -184,9 +234,7 @@ export class BlindTilt extends deviceBase {
      */
     async BLEparseStatus() {
         await this.debugLog('BLEparseStatus');
-        await this.debugLog(`(direction, slidePosition, battery, version) = BLE:(${this.serviceData.tilt}, ${this.serviceData.tilt},`
-            + ` ${this.serviceData.battery}, ${this.accessory.context.version}), current:(${this.WindowCovering.CurrentHorizontalTiltAngle},`
-            + ` ${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel}, ${this.accessory.context.version})`);
+        await this.debugLog(`(direction, slidePosition, battery, version) = BLE:(${this.serviceData.tilt}, ${this.serviceData.tilt}, ${this.serviceData.battery}, ${this.accessory.context.version}), current:(${this.WindowCovering.CurrentHorizontalTiltAngle}, ${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel}, ${this.accessory.context.version})`);
         // CurrentPosition
         this.WindowCovering.CurrentPosition = 100 - Number(this.serviceData.tilt);
         await this.setMinMax();
@@ -195,6 +243,7 @@ export class BlindTilt extends deviceBase {
             await this.infoLog('Checking Status ...');
         }
         if (this.setNewTarget && this.serviceData.inMotion) {
+            this.blindTiltMoving = true;
             await this.setMinMax();
             if (Number(this.WindowCovering.TargetPosition) > this.WindowCovering.CurrentPosition) {
                 await this.debugLog(`Closing, CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
@@ -216,13 +265,13 @@ export class BlindTilt extends deviceBase {
             }
         }
         else {
+            this.blindTiltMoving = false;
             await this.debugLog(`Standby, CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
             this.WindowCovering.TargetPosition = this.WindowCovering.CurrentPosition;
             this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.STOPPED;
             await this.debugLog(`Stopped, PositionState: ${this.WindowCovering.PositionState}`);
         }
-        await this.debugLog(`CurrentPosition: ${this.WindowCovering.CurrentPosition}, TargetPosition: ${this.WindowCovering.TargetPosition},`
-            + ` PositionState: ${this.WindowCovering.PositionState}`);
+        await this.debugLog(`CurrentPosition: ${this.WindowCovering.CurrentPosition}, TargetPosition: ${this.WindowCovering.TargetPosition}, PositionState: ${this.WindowCovering.PositionState}`);
         // CurrentAmbientLightLevel
         if (!this.device.blindTilt?.hide_lightsensor && this.LightSensor?.Service) {
             const set_minLux = this.device.blindTilt?.set_minLux ?? 1;
@@ -236,7 +285,8 @@ export class BlindTilt extends deviceBase {
         await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
         // StatusLowBattery
         this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
-            ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+            ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
+            : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`);
     }
     ;
@@ -245,9 +295,7 @@ export class BlindTilt extends deviceBase {
      */
     async openAPIparseStatus() {
         await this.debugLog('openAPIparseStatus');
-        await this.debugLog(`(direction, slidePosition, battery, version) = OpenAPI:(${this.deviceStatus.direction}, ${this.deviceStatus.slidePosition},`
-            + ` ${this.deviceStatus.battery}, ${this.deviceStatus.version}), current:(${this.WindowCovering.CurrentHorizontalTiltAngle},`
-            + ` ${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel}, ${this.accessory.context.version})`);
+        await this.debugLog(`(direction, slidePosition, battery, version) = OpenAPI:(${this.deviceStatus.direction}, ${this.deviceStatus.slidePosition}, ${this.deviceStatus.battery}, ${this.deviceStatus.version}), current:(${this.WindowCovering.CurrentHorizontalTiltAngle}, ${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel}, ${this.accessory.context.version})`);
         // CurrentPosition
         await this.getCurrentPosttionDirection(this.deviceStatus.direction, this.deviceStatus.slidePosition);
         if (!this.device.blindTilt?.hide_lightsensor && this.LightSensor?.Service) {
@@ -262,7 +310,8 @@ export class BlindTilt extends deviceBase {
         await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
         // StatusLowBattery
         this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
-            ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+            ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
+            : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`);
         // Firmware Version
         const version = this.deviceStatus.version.toString();
@@ -270,7 +319,7 @@ export class BlindTilt extends deviceBase {
         let deviceVersion;
         if (version?.includes('.') === false) {
             const replace = version?.replace(/^V|-.*$/g, '');
-            const match = replace?.match(/.{1,1}/g);
+            const match = replace?.match(/./g);
             const blindTiltVersion = match?.join('.') ?? '0.0.0';
             deviceVersion = blindTiltVersion;
         }
@@ -288,9 +337,7 @@ export class BlindTilt extends deviceBase {
     }
     async parseStatusWebhook() {
         await this.debugLog('parseStatusWebhook');
-        await this.debugLog(`(slidePosition, battery, version) = Webhook:(${this.webhookContext.direction}, ${this.webhookContext.slidePosition},`
-            + ` ${this.webhookContext.battery}, ${this.webhookContext.version}, current:(${this.WindowCovering.CurrentHorizontalTiltAngle},`
-            + ` ${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel}, ${this.accessory.context.version})`);
+        await this.debugLog(`(slidePosition, battery, version) = Webhook:(${this.webhookContext.direction}, ${this.webhookContext.slidePosition}, ${this.webhookContext.battery}, ${this.webhookContext.version}, current:(${this.WindowCovering.CurrentHorizontalTiltAngle}, ${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel}, ${this.accessory.context.version})`);
         // CurrentPosition and CurrentHorizontalTiltAngle
         await this.getCurrentPosttionDirection(this.webhookContext.direction, this.webhookContext.slidePosition);
         // BatteryLevel
@@ -298,7 +345,8 @@ export class BlindTilt extends deviceBase {
         await this.debugLog(`BatteryLevel: ${this.Battery.BatteryLevel}`);
         // StatusLowBattery
         this.Battery.StatusLowBattery = this.Battery.BatteryLevel < 10
-            ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+            ? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW
+            : this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         await this.debugLog(`StatusLowBattery: ${this.Battery.StatusLowBattery}`);
         // Firmware Version
         const deviceVersion = this.webhookContext.version.replace(/^V|-.*$/g, '') ?? '0.0.0';
@@ -318,7 +366,7 @@ export class BlindTilt extends deviceBase {
         if (!this.device.enableCloudService && this.OpenAPI) {
             await this.errorLog(`refreshStatus enableCloudService: ${this.device.enableCloudService}`);
         }
-        else if (this.BLE || this.config.options?.BLE) {
+        else if (this.BLE) {
             await this.BLERefreshStatus();
         }
         else if (this.OpenAPI && this.platform.config.credentials?.token) {
@@ -330,6 +378,31 @@ export class BlindTilt extends deviceBase {
         }
     }
     async BLERefreshStatus() {
+        await this.debugLog('BLERefreshStatus');
+        const switchbot = await this.switchbotBLE();
+        if (switchbot === undefined) {
+            await this.BLERefreshConnection(switchbot);
+        }
+        else {
+            // Start to monitor advertisement packets
+            (async () => {
+                // Start to monitor advertisement packets
+                const serviceData = await this.monitorAdvertisementPackets(switchbot);
+                // Update HomeKit
+                if (serviceData.model === SwitchBotBLEModel.BlindTilt && serviceData.modelName === SwitchBotBLEModelName.BlindTilt) {
+                    this.serviceData = serviceData;
+                    await this.BLEparseStatus();
+                    await this.updateHomeKitCharacteristics();
+                }
+                else {
+                    await this.errorLog(`failed to get serviceData, serviceData: ${serviceData}`);
+                    await this.BLERefreshConnection(switchbot);
+                }
+            })();
+        }
+    }
+    async registerPlatformBLE() {
+        await this.debugLog('registerPlatformBLE');
         if (this.config.options?.BLE) {
             await this.debugLog('is listening to Platform BLE.');
             this.device.bleMac = this.device.deviceId.match(/.{1,2}/g).join(':').toLowerCase();
@@ -347,28 +420,7 @@ export class BlindTilt extends deviceBase {
             };
         }
         else {
-            await this.debugLog('is using Device BLE Scanning.');
-            const switchbot = await this.switchbotBLE();
-            if (switchbot === undefined) {
-                await this.BLERefreshConnection(switchbot);
-            }
-            else {
-                // Start to monitor advertisement packets
-                (async () => {
-                    // Start to monitor advertisement packets
-                    const serviceData = await this.monitorAdvertisementPackets(switchbot);
-                    // Update HomeKit
-                    if (serviceData.model === SwitchBotBLEModel.BlindTilt && serviceData.modelName === SwitchBotBLEModelName.BlindTilt) {
-                        this.serviceData = serviceData;
-                        await this.BLEparseStatus();
-                        await this.updateHomeKitCharacteristics();
-                    }
-                    else {
-                        await this.errorLog(`failed to get serviceData, serviceData: ${serviceData}`);
-                        await this.BLERefreshConnection(switchbot);
-                    }
-                })();
-            }
+            await this.debugLog('is not listening to Platform BLE');
         }
     }
     async openAPIRefreshStatus() {
@@ -377,7 +429,6 @@ export class BlindTilt extends deviceBase {
             const { body, statusCode } = await this.deviceRefreshStatus();
             const deviceStatus = await body.json();
             await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
-            ;
             if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
                 await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`);
                 this.deviceStatus = deviceStatus.body;
@@ -470,8 +521,7 @@ export class BlindTilt extends deviceBase {
             }
         }
         else {
-            await this.debugLog(`No changes (BLEpushChanges), TargetPosition: ${this.WindowCovering.TargetPosition},`
-                + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
+            await this.debugLog(`No changes (BLEpushChanges), TargetPosition: ${this.WindowCovering.TargetPosition}, CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
         }
     }
     async openAPIpushChanges() {
@@ -526,10 +576,8 @@ export class BlindTilt extends deviceBase {
             }
         }
         else {
-            await this.debugLog(`No changes (openAPIpushChanges), TargetPosition: ${this.WindowCovering.TargetPosition},`
-                + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
-            await this.debugLog(`No changes (openAPIpushChanges), TargetHorizontalTiltAngle: ${this.WindowCovering.TargetHorizontalTiltAngle},`
-                + ` CurrentHorizontalTiltAngle: ${this.WindowCovering.CurrentHorizontalTiltAngle}`);
+            await this.debugLog(`No changes (openAPIpushChanges), TargetPosition: ${this.WindowCovering.TargetPosition}, CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
+            await this.debugLog(`No changes (openAPIpushChanges), TargetHorizontalTiltAngle: ${this.WindowCovering.TargetHorizontalTiltAngle}, CurrentHorizontalTiltAngle: ${this.WindowCovering.CurrentHorizontalTiltAngle}`);
         }
     }
     /**
@@ -542,7 +590,7 @@ export class BlindTilt extends deviceBase {
         else {
             await this.debugLog(`No changes, TargetHorizontalTiltAngle: ${value}`);
         }
-        //value = value < 0 ? -90 : 90;
+        // value = value < 0 ? -90 : 90;
         this.WindowCovering.TargetHorizontalTiltAngle = value;
         await this.mqtt('TargetHorizontalTiltAngle', this.WindowCovering.TargetHorizontalTiltAngle);
         await this.startUpdatingBlindTiltIfNeeded();
@@ -596,6 +644,28 @@ export class BlindTilt extends deviceBase {
         }
         this.doBlindTiltUpdate.next();
     }
+    /**
+     * Handle requests to set the value of the "Target Position" characteristic
+     */
+    async OpenModeSwitchSet(value) {
+        if (this.OpenModeSwitch && this.device.blindTilt?.silentModeSwitch) {
+            this.debugLog(`Silent Open Mode: ${value}`);
+            this.OpenModeSwitch.On = value;
+            this.accessory.context.OpenModeSwitch.On = value;
+            this.doBlindTiltUpdate.next();
+        }
+    }
+    /**
+     * Handle requests to set the value of the "Target Position" characteristic
+     */
+    async CloseModeSwitchSet(value) {
+        if (this.CloseModeSwitch && this.device.blindTilt?.silentModeSwitch) {
+            this.debugLog(`Silent Close Mode: ${value}`);
+            this.CloseModeSwitch.On = value;
+            this.accessory.context.CloseModeSwitch.On = value;
+            this.doBlindTiltUpdate.next();
+        }
+    }
     async updateHomeKitCharacteristics() {
         await this.setMinMax();
         // CurrentHorizontalTiltAngle
@@ -637,11 +707,11 @@ export class BlindTilt extends deviceBase {
         let setPositionMode;
         let Mode;
         if (Number(this.WindowCovering.TargetPosition) > 50) {
-            if (this.device.blindTilt?.setOpenMode === '1') {
+            if (this.device.blindTilt?.setOpenMode === '1' || this.OpenModeSwitch?.On) {
                 setPositionMode = 1;
                 Mode = 'Silent Mode';
             }
-            else if (this.device.blindTilt?.setOpenMode === '0') {
+            else if (this.device.blindTilt?.setOpenMode === '0' || !this.OpenModeSwitch?.On) {
                 setPositionMode = 0;
                 Mode = 'Performance Mode';
             }
@@ -651,11 +721,11 @@ export class BlindTilt extends deviceBase {
             }
         }
         else {
-            if (this.device.blindTilt?.setCloseMode === '1') {
+            if (this.device.blindTilt?.setCloseMode === '1' || this.CloseModeSwitch?.On) {
                 setPositionMode = 1;
                 Mode = 'Silent Mode';
             }
-            else if (this.device.blindTilt?.setOpenMode === '0') {
+            else if (this.device.blindTilt?.setOpenMode === '0' || !this.CloseModeSwitch?.On) {
                 setPositionMode = 0;
                 Mode = 'Performance Mode';
             }
@@ -721,6 +791,7 @@ export class BlindTilt extends deviceBase {
             await this.debugLog(`CurrentHorizontalTiltAngle: ${this.WindowCovering.CurrentHorizontalTiltAngle}`);
         }
         if (this.setNewTarget) {
+            this.blindTiltMoving = true;
             await this.infoLog('Checking Status ...');
             await this.setMinMax();
             if (this.WindowCovering.TargetPosition > this.WindowCovering.CurrentPosition
@@ -744,6 +815,7 @@ export class BlindTilt extends deviceBase {
             }
         }
         else {
+            this.blindTiltMoving = false;
             await this.debugLog(`Standby because device not moving, CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
             this.WindowCovering.TargetPosition = this.WindowCovering.CurrentPosition;
             if (homekitTiltAngle) {
@@ -752,14 +824,13 @@ export class BlindTilt extends deviceBase {
             this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.STOPPED;
             await this.debugLog(`Stopped, PositionState: ${this.WindowCovering.PositionState}`);
         }
-        await this.debugLog(`CurrentPosition: ${this.WindowCovering.CurrentPosition}, TargetPosition: ${this.WindowCovering.TargetPosition},`
-            + ` PositionState: ${this.WindowCovering.PositionState}`);
+        await this.debugLog(`CurrentPosition: ${this.WindowCovering.CurrentPosition}, TargetPosition: ${this.WindowCovering.TargetPosition}, PositionState: ${this.WindowCovering.PositionState}`);
     }
     /**
      * Maps device values to homekit values
      *
      * @param devicePosition the position as reported by the devide
-     * @param direction the direction as reported by the device
+     * @param deviceDirection the direction as reported by the device
      * @returns [homekit position, homekit tiltAngle]
      */
     mapDeviceValuesToHomekitValues(devicePosition, deviceDirection) {
@@ -812,7 +883,7 @@ export class BlindTilt extends deviceBase {
      * Maps homekit values to device values
      *
      * @param homekitPosition the position as reported by homekit
-     * @param homekitTiltAngle? the tilt angle as reported by homekit
+     * @param homekitTiltAngle the tilt angle as reported by homekit
      * @returns [device position, device direction]
      */
     mapHomekitValuesToDeviceValues(homekitPosition, homekitTiltAngle) {