@switchbot/homebridge-switchbot 3.5.0-beta.6 → 3.5.0-beta.60

package/dist/device/curtain.js

@@ -1,166 +1,134 @@
+/* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
+ *
+ * curtain.ts: @switchbot/homebridge-switchbot.
+ */
+import { hostname } from 'os';
 import { request } from 'undici';
-import { sleep } from '../utils.js';
 import { interval, Subject } from 'rxjs';
-import asyncmqtt from 'async-mqtt';
-import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
+import { deviceBase } from './device.js';
 import { Devices } from '../settings.js';
-import { hostname } from 'os';
-export class Curtain {
+import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
+export class Curtain extends deviceBase {
     platform;
-    accessory;
-    device;
-    api;
-    log;
-    config;
-    hap;
     // Services
-    batteryService;
-    lightSensorService;
-    windowCoveringService;
-    // Characteristic Values
-    BatteryLevel;
-    HoldPosition;
-    PositionState;
-    TargetPosition;
-    CurrentPosition;
-    FirmwareRevision;
-    StatusLowBattery;
-    CurrentAmbientLightLevel;
-    // OpenAPI Status
-    OpenAPI_InMotion;
-    OpenAPI_BatteryLevel;
-    OpenAPI_FirmwareRevision;
-    OpenAPI_CurrentPosition;
-    OpenAPI_CurrentAmbientLightLevel;
-    // Others
-    Mode;
-    setPositionMode;
-    // BLE Status
-    BLE_InMotion;
-    BLE_BatteryLevel;
-    BLE_Calibration;
-    BLE_CurrentPosition;
-    BLE_CurrentAmbientLightLevel;
-    // BLE Others
-    BLE_IsConnected;
-    spaceBetweenLevels;
+    WindowCovering;
+    Battery;
+    LightSensor;
     // Target
     setNewTarget;
     setNewTargetTimer;
-    //MQTT stuff
-    mqttClient = null;
-    // Config
-    updateRate;
-    set_minLux;
-    set_maxLux;
-    set_minStep;
-    setOpenMode;
-    setCloseMode;
-    scanDuration;
-    deviceLogging;
-    deviceRefreshRate;
     // Updates
     curtainUpdateInProgress;
     doCurtainUpdate;
-    // Connection
-    OpenAPI;
-    BLE;
-    // EVE history service handler
-    historyService = null;
     constructor(platform, accessory, device) {
+        super(platform, accessory, device);
         this.platform = platform;
-        this.accessory = accessory;
-        this.device = device;
-        this.api = this.platform.api;
-        this.log = this.platform.log;
-        this.config = this.platform.config;
-        this.hap = this.api.hap;
-        // Connection
-        this.BLE = this.device.connectionType === 'BLE' || this.device.connectionType === 'BLE/OpenAPI';
-        this.OpenAPI = this.device.connectionType === 'OpenAPI' || this.device.connectionType === 'BLE/OpenAPI';
-        // default placeholders
-        this.deviceLogs(device);
-        this.refreshRate(device);
-        this.scan(device);
-        this.setupMqtt(device);
-        this.deviceContext();
-        this.deviceConfig(device);
+        // default placeholder
+        this.history(device);
         // this is subject we use to track when we need to POST changes to the SwitchBot API
         this.doCurtainUpdate = new Subject();
         this.curtainUpdateInProgress = false;
         this.setNewTarget = false;
-        // Retrieve initial values and updateHomekit
-        this.refreshStatus();
-        // set accessory information
-        accessory
-            .getService(this.hap.Service.AccessoryInformation)
-            .setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
-            .setCharacteristic(this.hap.Characteristic.Model, 'W0701600')
-            .setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
-            .setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
-        // get the WindowCovering service if it exists, otherwise create a new WindowCovering service
-        // you can create multiple services for each accessory
-        const windowCoveringService = `${accessory.displayName} ${device.deviceType}`;
-        (this.windowCoveringService = accessory.getService(this.hap.Service.WindowCovering)
-            || accessory.addService(this.hap.Service.WindowCovering)), windowCoveringService;
-        this.windowCoveringService.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
-        if (!this.windowCoveringService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-            this.windowCoveringService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
-        }
-        // each service must implement at-minimum the "required characteristics" for the given service type
-        // see https://developers.homebridge.io/#/service/WindowCovering
-        // create handlers for required characteristics
-        this.windowCoveringService.setCharacteristic(this.hap.Characteristic.PositionState, this.PositionState);
-        this.windowCoveringService
+        // Initialize LightBulb property
+        this.WindowCovering = {
+            Name: accessory.context.WindowCoveringName ?? accessory.displayName,
+            Service: accessory.getService(this.hap.Service.WindowCovering) ?? accessory.addService(this.hap.Service.WindowCovering),
+            PositionState: accessory.context.PositionState ?? this.hap.Characteristic.PositionState.STOPPED,
+            TargetPosition: accessory.context.TargetPosition ?? 100,
+            CurrentPosition: accessory.context.CurrentPosition ?? 100,
+            HoldPosition: accessory.context.HoldPosition ?? false,
+        };
+        // Initialize WindowCovering Service
+        this.WindowCovering.Service.
+            setCharacteristic(this.hap.Characteristic.Name, this.WindowCovering.Name)
+            .setCharacteristic(this.hap.Characteristic.ObstructionDetected, false)
+            .getCharacteristic(this.hap.Characteristic.PositionState)
+            .onGet(() => {
+            return this.WindowCovering.PositionState;
+        });
+        accessory.context.WindowCoveringName = this.WindowCovering.Name;
+        // Initialize WindowCovering CurrentPosition
+        this.WindowCovering.Service
             .getCharacteristic(this.hap.Characteristic.CurrentPosition)
             .setProps({
-            minStep: this.minStep(device),
+            minStep: Number(this.minStep(device)),
             minValue: 0,
             maxValue: 100,
             validValueRanges: [0, 100],
         })
             .onGet(() => {
-            return this.CurrentPosition;
+            return this.WindowCovering.CurrentPosition;
         });
-        this.windowCoveringService
+        // Initialize WindowCovering TargetPosition
+        this.WindowCovering.Service
             .getCharacteristic(this.hap.Characteristic.TargetPosition)
             .setProps({
-            minStep: this.minStep(device),
+            minStep: Number(this.minStep(device)),
             minValue: 0,
             maxValue: 100,
             validValueRanges: [0, 100],
+        })
+            .onGet(() => {
+            return this.WindowCovering.TargetPosition;
         })
             .onSet(this.TargetPositionSet.bind(this));
-        this.windowCoveringService
+        // Initialize WindowCovering TargetPosition
+        this.WindowCovering.Service
             .getCharacteristic(this.hap.Characteristic.HoldPosition)
+            .onGet(() => {
+            return this.WindowCovering.HoldPosition;
+        })
             .onSet(this.HoldPositionSet.bind(this));
-        // Light Sensor Service
+        // Initialize Battery property
+        this.Battery = {
+            Name: accessory.context.BatteryName ?? `${accessory.displayName} Battery`,
+            Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery),
+            BatteryLevel: accessory.context.BatteryLevel ?? 100,
+            StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
+            ChargingState: accessory.context.ChargingState ?? this.hap.Characteristic.ChargingState.NOT_CHARGING,
+        };
+        // Initialize Battery Service
+        this.Battery.Service
+            .setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name)
+            .getCharacteristic(this.hap.Characteristic.BatteryLevel)
+            .onGet(() => {
+            return this.Battery.BatteryLevel;
+        });
+        accessory.context.BatteryName = this.Battery.Name;
+        this.Battery.Service
+            .getCharacteristic(this.hap.Characteristic.StatusLowBattery)
+            .onGet(() => {
+            return this.Battery.StatusLowBattery;
+        });
+        this.Battery.Service
+            .getCharacteristic(this.hap.Characteristic.ChargingState)
+            .onGet(() => {
+            return this.Battery.ChargingState;
+        });
+        // Initialize LightSensor Service
         if (device.curtain?.hide_lightsensor) {
             this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Light Sensor Service`);
-            this.lightSensorService = this.accessory.getService(this.hap.Service.LightSensor);
-            accessory.removeService(this.lightSensorService);
-        }
-        else if (!this.lightSensorService) {
-            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Light Sensor Service`);
-            const lightSensorService = `${accessory.displayName} Light Sensor`;
-            (this.lightSensorService = this.accessory.getService(this.hap.Service.LightSensor)
-                || this.accessory.addService(this.hap.Service.LightSensor)), lightSensorService;
-            this.lightSensorService.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Light Sensor`);
-            if (!this.lightSensorService?.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-                this.lightSensorService.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Light Sensor`);
-            }
+            this.LightSensor.Service = this.accessory.getService(this.hap.Service.LightSensor);
+            accessory.removeService(this.LightSensor.Service);
         }
         else {
-            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Light Sensor Service Not Added`);
-        }
-        // Battery Service
-        const batteryService = `${accessory.displayName} Battery`;
-        (this.batteryService = this.accessory.getService(this.hap.Service.Battery)
-            || accessory.addService(this.hap.Service.Battery)), batteryService;
-        this.batteryService.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Battery`);
-        if (!this.batteryService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
-            this.batteryService.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Battery`);
+            this.LightSensor = {
+                Name: accessory.context.LightSensorName ?? `${accessory.displayName} Light Sensor`,
+                Service: accessory.getService(this.hap.Service.LightSensor) ?? this.accessory.addService(this.hap.Service.LightSensor),
+                CurrentAmbientLightLevel: accessory.context.CurrentAmbientLightLevel ?? 0.0001,
+            };
+            // Initialize LightSensor Characteristic
+            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;
+            });
+            accessory.context.LightSensorName = this.LightSensor.Name;
         }
+        // Retrieve initial values and updateHomekit
+        this.refreshStatus();
         // Update Homekit
         this.updateHomeKitCharacteristics();
         // Start an update interval
@@ -170,19 +138,18 @@ export class Curtain {
             await this.refreshStatus();
         });
         //regisiter webhook event handler
-        if (this.device.webhook) {
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
+        if (device.webhook) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
             this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
                 try {
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
                     const { slidePosition, battery } = context;
-                    const { CurrentPosition, BatteryLevel } = this;
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
                         '(slidePosition, battery) = ' +
                         `Webhook:(${slidePosition}, ${battery}), ` +
-                        `current:(${CurrentPosition}, ${BatteryLevel})`);
-                    this.CurrentPosition = slidePosition;
-                    this.BatteryLevel = battery;
+                        `current:(${this.WindowCovering.CurrentPosition}, ${this.Battery.BatteryLevel})`);
+                    this.WindowCovering.CurrentPosition = slidePosition;
+                    this.Battery.BatteryLevel = battery;
                     this.updateHomeKitCharacteristics();
                 }
                 catch (e) {
@@ -192,13 +159,14 @@ export class Curtain {
             };
         }
         // update slide progress
-        interval(this.updateRate * 1000)
+        interval(this.deviceUpdateRate * 1000)
             //.pipe(skipWhile(() => this.curtainUpdateInProgress))
             .subscribe(async () => {
-            if (this.PositionState === this.hap.Characteristic.PositionState.STOPPED) {
+            if (this.WindowCovering.PositionState === this.hap.Characteristic.PositionState.STOPPED) {
                 return;
             }
-            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Refresh Status When Moving, PositionState: ${this.PositionState}`);
+            this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Refresh Status When Moving,`
+                + ` PositionState: ${this.WindowCovering.PositionState}`);
             await this.refreshStatus();
         });
         // Watch for Curtain change events
@@ -221,6 +189,16 @@ export class Curtain {
         // Setup EVE history features
         this.setupHistoryService(device);
     }
+    history(device) {
+        if (device.history === true) {
+            // initialize when this accessory is newly created.
+            this.accessory.context.lastActivation = this.accessory.context.lastActivation ?? 0;
+        }
+        else {
+            // removes cached values if history is turned off
+            delete this.accessory.context.lastActivation;
+        }
+    }
     /*
      * Setup EVE history features for curtain devices.
      */
@@ -262,7 +240,7 @@ export class Curtain {
         this.updateHistory();
     }
     async updateHistory() {
-        const motion = Number(this.CurrentPosition) > 0 ? 1 : 0;
+        const motion = Number(this.WindowCovering.CurrentPosition) > 0 ? 1 : 0;
         this.historyService.addEntry({
             time: Math.round(new Date().valueOf() / 1000),
             motion: motion,
@@ -271,189 +249,197 @@ export class Curtain {
             this.updateHistory();
         }, 10 * 60 * 1000);
     }
-    /**
-     * Parse the device status from the SwitchBot api
-     */
-    async parseStatus() {
-        if (!this.device.enableCloudService && this.OpenAPI) {
-            this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
-        }
-        else if (this.BLE) {
-            await this.BLEparseStatus();
-        }
-        else if (this.OpenAPI && this.platform.config.credentials?.token) {
-            await this.openAPIparseStatus();
-        }
-        else {
-            await this.offlineOff();
-            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:` + ` ${this.device.connectionType}, parseStatus will not happen.`);
-        }
-    }
-    async BLEparseStatus() {
+    async BLEparseStatus(serviceData) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
         // CurrentPosition
-        this.CurrentPosition = 100 - Number(this.BLE_CurrentPosition);
+        this.WindowCovering.CurrentPosition = 100 - Number(serviceData.position);
         await this.setMinMax();
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition ${this.CurrentPosition}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition ${this.WindowCovering.CurrentPosition}`);
         if (this.setNewTarget) {
             this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Checking Status ...`);
             await this.setMinMax();
-            if (Number(this.TargetPosition) > this.CurrentPosition) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Closing, CurrentPosition: ${this.CurrentPosition}`);
-                this.PositionState = this.hap.Characteristic.PositionState.INCREASING;
-                this.windowCoveringService.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.PositionState);
-                this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} INCREASING PositionState: ${this.PositionState}`);
-            }
-            else if (Number(this.TargetPosition) < this.CurrentPosition) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Opening, CurrentPosition: ${this.CurrentPosition}`);
-                this.PositionState = this.hap.Characteristic.PositionState.DECREASING;
-                this.windowCoveringService.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.PositionState);
-                this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} DECREASING PositionState: ${this.PositionState}`);
+            if (Number(this.WindowCovering.TargetPosition) > this.WindowCovering.CurrentPosition) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Closing, CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
+                this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.INCREASING;
+                this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.WindowCovering.PositionState);
+                this.debugLog(`${this.device.deviceType}: ${this.WindowCovering.CurrentPosition} INCREASING`
+                    + ` PositionState: ${this.WindowCovering.PositionState}`);
+            }
+            else if (Number(this.WindowCovering.TargetPosition) < this.WindowCovering.CurrentPosition) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Opening, CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
+                this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.DECREASING;
+                this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.WindowCovering.PositionState);
+                this.debugLog(`${this.device.deviceType}: ${this.WindowCovering.CurrentPosition} DECREASING`
+                    + ` PositionState: ${this.WindowCovering.PositionState}`);
             }
             else {
-                this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} Standby, CurrentPosition: ${this.CurrentPosition}`);
-                this.PositionState = this.hap.Characteristic.PositionState.STOPPED;
-                this.windowCoveringService.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.PositionState);
-                this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} STOPPED PositionState: ${this.PositionState}`);
+                this.debugLog(`${this.device.deviceType}: ${this.WindowCovering.CurrentPosition} Standby,`
+                    + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
+                this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.STOPPED;
+                this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.WindowCovering.PositionState);
+                this.debugLog(`${this.device.deviceType}: ${this.WindowCovering.CurrentPosition} STOPPED`
+                    + ` PositionState: ${this.WindowCovering.PositionState}`);
             }
         }
         else {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Standby, CurrentPosition: ${this.CurrentPosition}`);
-            this.TargetPosition = this.CurrentPosition;
-            this.PositionState = this.hap.Characteristic.PositionState.STOPPED;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Standby, CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
+            this.WindowCovering.TargetPosition = this.WindowCovering.CurrentPosition;
+            this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.STOPPED;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Stopped`);
         }
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition},` +
-            ` TargetPosition: ${this.TargetPosition}, PositionState: ${this.PositionState},`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.WindowCovering.CurrentPosition},` +
+            ` TargetPosition: ${this.WindowCovering.TargetPosition}, PositionState: ${this.WindowCovering.PositionState},`);
         if (!this.device.curtain?.hide_lightsensor) {
-            this.set_minLux = this.minLux();
-            this.set_maxLux = this.maxLux();
-            this.spaceBetweenLevels = 9;
+            const set_minLux = await this.minLux();
+            const set_maxLux = await this.maxLux();
+            const spaceBetweenLevels = 9;
             // Brightness
-            switch (this.BLE_CurrentAmbientLightLevel) {
+            switch (serviceData.lightLevel) {
                 case 1:
-                    this.CurrentAmbientLightLevel = this.set_minLux;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel}`);
+                    this.LightSensor.CurrentAmbientLightLevel = set_minLux;
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${serviceData.lightLevel}`);
                     break;
                 case 2:
-                    this.CurrentAmbientLightLevel = (this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel},` +
-                        ` Calculation: ${(this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels}`);
+                    this.LightSensor.CurrentAmbientLightLevel = (set_maxLux - set_minLux) / spaceBetweenLevels;
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${serviceData.lightLevel},` +
+                        ` Calculation: ${(set_maxLux - set_minLux) / 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.BLE_CurrentAmbientLightLevel}`);
+                    this.LightSensor.CurrentAmbientLightLevel = ((set_maxLux - set_minLux) / spaceBetweenLevels) * 2;
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${serviceData.lightLevel}`);
+                    this.Battery.ChargingState = this.hap.Characteristic.ChargingState.CHARGING;
                     break;
                 case 4:
-                    this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 3;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel}`);
+                    this.LightSensor.CurrentAmbientLightLevel = ((set_maxLux - set_minLux) / spaceBetweenLevels) * 3;
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${serviceData.lightLevel}`);
+                    this.Battery.ChargingState = this.hap.Characteristic.ChargingState.CHARGING;
                     break;
                 case 5:
-                    this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 4;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel}`);
+                    this.LightSensor.CurrentAmbientLightLevel = ((set_maxLux - set_minLux) / spaceBetweenLevels) * 4;
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${serviceData.lightLevel}`);
+                    this.Battery.ChargingState = this.hap.Characteristic.ChargingState.CHARGING;
                     break;
                 case 6:
-                    this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 5;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel}`);
+                    this.LightSensor.CurrentAmbientLightLevel = ((set_maxLux - set_minLux) / spaceBetweenLevels) * 5;
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${serviceData.lightLevel}`);
+                    this.Battery.ChargingState = this.hap.Characteristic.ChargingState.CHARGING;
                     break;
                 case 7:
-                    this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 6;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel}`);
+                    this.LightSensor.CurrentAmbientLightLevel = ((set_maxLux - set_minLux) / spaceBetweenLevels) * 6;
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${serviceData.lightLevel}`);
+                    this.Battery.ChargingState = this.hap.Characteristic.ChargingState.CHARGING;
                     break;
                 case 8:
-                    this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 7;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel}`);
+                    this.LightSensor.CurrentAmbientLightLevel = ((set_maxLux - set_minLux) / spaceBetweenLevels) * 7;
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${serviceData.lightLevel}`);
+                    this.Battery.ChargingState = this.hap.Characteristic.ChargingState.CHARGING;
                     break;
                 case 9:
-                    this.CurrentAmbientLightLevel = ((this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels) * 8;
-                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel}`);
+                    this.LightSensor.CurrentAmbientLightLevel = ((set_maxLux - set_minLux) / spaceBetweenLevels) * 8;
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${serviceData.lightLevel}`);
+                    this.Battery.ChargingState = this.hap.Characteristic.ChargingState.CHARGING;
                     break;
                 case 10:
                 default:
-                    this.CurrentAmbientLightLevel = this.set_maxLux;
+                    this.LightSensor.CurrentAmbientLightLevel = set_maxLux;
                     this.debugLog();
             }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel},` +
-                ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${serviceData.lightLevel},` +
+                ` CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
         }
         // Battery
-        this.BatteryLevel = Number(this.BLE_BatteryLevel);
-        if (this.BatteryLevel < 10) {
-            this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
+        this.Battery.BatteryLevel = Number(serviceData.battery);
+        if (this.Battery.BatteryLevel < 10) {
+            this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
         }
         else {
-            this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+            this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
         }
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel},` + ` StatusLowBattery: ${this.StatusLowBattery}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel},`
+            + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
     }
-    async openAPIparseStatus() {
+    async openAPIparseStatus(deviceStatus) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
         // CurrentPosition
-        this.CurrentPosition = 100 - Number(this.OpenAPI_CurrentPosition);
+        this.WindowCovering.CurrentPosition = 100 - Number(deviceStatus.body.slidePosition);
         await this.setMinMax();
-        this.debugLog(`Curtain ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}`);
+        this.debugLog(`Curtain ${this.accessory.displayName} CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
         if (this.setNewTarget) {
             this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Checking Status ...`);
         }
-        if (this.setNewTarget && this.OpenAPI_InMotion) {
+        if (this.setNewTarget && deviceStatus.body.moving) {
             await this.setMinMax();
-            if (Number(this.TargetPosition) > this.CurrentPosition) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Closing, CurrentPosition: ${this.CurrentPosition} `);
-                this.PositionState = this.hap.Characteristic.PositionState.INCREASING;
-                this.windowCoveringService.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.PositionState);
-                this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} INCREASING PositionState: ${this.PositionState}`);
-            }
-            else if (Number(this.TargetPosition) < this.CurrentPosition) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Opening, CurrentPosition: ${this.CurrentPosition} `);
-                this.PositionState = this.hap.Characteristic.PositionState.DECREASING;
-                this.windowCoveringService.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.PositionState);
-                this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} DECREASING PositionState: ${this.PositionState}`);
+            if (Number(this.WindowCovering.TargetPosition) > this.WindowCovering.CurrentPosition) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Closing, CurrentPosition: ${this.WindowCovering.CurrentPosition} `);
+                this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.INCREASING;
+                this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.WindowCovering.PositionState);
+                this.debugLog(`${this.device.deviceType}: ${this.WindowCovering.CurrentPosition} INCREASING`
+                    + ` PositionState: ${this.WindowCovering.PositionState}`);
+            }
+            else if (Number(this.WindowCovering.TargetPosition) < this.WindowCovering.CurrentPosition) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Opening, CurrentPosition: ${this.WindowCovering.CurrentPosition} `);
+                this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.DECREASING;
+                this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.WindowCovering.PositionState);
+                this.debugLog(`${this.device.deviceType}: ${this.WindowCovering.CurrentPosition} DECREASING`
+                    + ` PositionState: ${this.WindowCovering.PositionState}`);
             }
             else {
-                this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} Standby, CurrentPosition: ${this.CurrentPosition}`);
-                this.PositionState = this.hap.Characteristic.PositionState.STOPPED;
-                this.windowCoveringService.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.PositionState);
-                this.debugLog(`${this.device.deviceType}: ${this.CurrentPosition} STOPPED PositionState: ${this.PositionState}`);
+                this.debugLog(`${this.device.deviceType}: ${this.WindowCovering.CurrentPosition} Standby,`
+                    + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
+                this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.STOPPED;
+                this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.WindowCovering.PositionState);
+                this.debugLog(`${this.device.deviceType}: ${this.WindowCovering.CurrentPosition} STOPPED`
+                    + ` PositionState: ${this.WindowCovering.PositionState}`);
             }
         }
         else {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Standby, CurrentPosition: ${this.CurrentPosition}`);
-            this.TargetPosition = this.CurrentPosition;
-            this.PositionState = this.hap.Characteristic.PositionState.STOPPED;
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Standby, CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
+            this.WindowCovering.TargetPosition = this.WindowCovering.CurrentPosition;
+            this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.STOPPED;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Stopped`);
         }
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition},` +
-            ` TargetPosition: ${this.TargetPosition}, PositionState: ${this.PositionState},`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.WindowCovering.CurrentPosition},` +
+            ` TargetPosition: ${this.WindowCovering.TargetPosition}, PositionState: ${this.WindowCovering.PositionState},`);
         // Brightness
         if (!this.device.curtain?.hide_lightsensor) {
-            this.set_minLux = this.minLux();
-            this.set_maxLux = this.maxLux();
-            switch (this.OpenAPI_CurrentAmbientLightLevel) {
-                case 'dim':
-                    this.CurrentAmbientLightLevel = this.set_minLux;
-                    break;
+            const set_minLux = await this.minLux();
+            const set_maxLux = await this.maxLux();
+            switch (deviceStatus.body.brightness) {
                 case 'bright':
+                    this.LightSensor.CurrentAmbientLightLevel = set_maxLux;
+                    this.Battery.ChargingState = this.hap.Characteristic.ChargingState.CHARGING;
+                    break;
+                case 'dim':
                 default:
-                    this.CurrentAmbientLightLevel = this.set_maxLux;
+                    this.LightSensor.CurrentAmbientLightLevel = set_minLux;
             }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+                + ` CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
         }
         // BatteryLevel
-        this.BatteryLevel = Number(this.OpenAPI_BatteryLevel);
-        if (this.BatteryLevel < 10) {
-            this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
+        this.Battery.BatteryLevel = Number(deviceStatus.body.battery);
+        if (this.Battery.BatteryLevel < 10) {
+            this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
         }
         else {
-            this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+            this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+        }
+        if (Number.isNaN(this.Battery.BatteryLevel)) {
+            this.Battery.BatteryLevel = 100;
         }
-        if (Number.isNaN(this.BatteryLevel)) {
-            this.BatteryLevel = 100;
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel},`
+            + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
+        // Firmware Version
+        const version = deviceStatus.body.version?.toString();
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
+        if (deviceStatus.body.version) {
+            this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
+            this.accessory
+                .getService(this.hap.Service.AccessoryInformation)
+                .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
+                .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+                .updateValue(this.accessory.context.version);
         }
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel},`
-            + ` StatusLowBattery: ${this.StatusLowBattery}`);
-        // FirmwareRevision
-        this.FirmwareRevision = this.OpenAPI_FirmwareRevision;
-        this.accessory.context.FirmwareRevision = this.FirmwareRevision;
     }
     async refreshStatus() {
         if (!this.device.enableCloudService && this.OpenAPI) {
@@ -482,116 +468,44 @@ export class Curtain {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
         this.getCustomBLEAddress(switchbot);
         // Start to monitor advertisement packets
-        let model;
-        switch (this.device.configDeviceType) {
-            case 'Curtain3':
-                model = '{';
-                break;
-            default:
-                model = 'c';
-        }
         (async () => {
             // Start to monitor advertisement packets
-            await switchbot.startScan({
-                model: model,
-                id: this.device.bleMac,
-            });
+            await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
             // Set an event handler
             switchbot.onadvertisement = (ad) => {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, '  ')}`);
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.serviceData.model}`);
-                if (this.device.bleMac === ad.address && ad.serviceData.model === 'c') {
+                if (this.device.bleMac === ad.address && ad.model === this.device.bleModel) {
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, '  ')}`);
+                    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.model}`);
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-                    this.BLE_Calibration = ad.serviceData.calibration;
-                    this.BLE_BatteryLevel = ad.serviceData.battery;
-                    this.BLE_InMotion = ad.serviceData.inMotion;
-                    this.BLE_CurrentPosition = ad.serviceData.position;
-                    this.BLE_CurrentAmbientLightLevel = ad.serviceData.lightLevel;
                 }
                 else {
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
                 }
             };
-            // Wait 1 seconds
+            // Wait 10 seconds
             await switchbot.wait(this.scanDuration * 1000);
             // Stop to monitor
             await switchbot.stopScan();
             // Update HomeKit
-            await this.BLEparseStatus();
+            await this.BLEparseStatus(switchbot.onadvertisement.serviceData);
             await this.updateHomeKitCharacteristics();
         })();
-        /*if (switchbot !== false) {
-          switchbot
-            .startScan({
-              model: model,
-              id: this.device.bleMac,
-            })
-            .then(async () => {
-              // Set an event handler
-              switchbot.onadvertisement = async (ad: ad) => {
-                this.debugLog(
-                  `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
-                  ` BLE Address Found: ${ad.address}`,
-                );
-                this.BLE_Calibration = ad.serviceData.calibration;
-                this.BLE_BatteryLevel = ad.serviceData.battery;
-                this.BLE_InMotion = ad.serviceData.inMotion;
-                this.BLE_CurrentPosition = ad.serviceData.position;
-                this.BLE_CurrentAmbientLightLevel = ad.serviceData.lightLevel;
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-                this.debugLog(
-                  `${this.device.deviceType}: ${this.accessory.displayName} calibration: ${ad.serviceData.calibration}, ` +
-                  `position: ${ad.serviceData.position}, lightLevel: ${ad.serviceData.lightLevel}, battery: ${ad.serviceData.battery}, ` +
-                  `inMotion: ${ad.serviceData.inMotion}`,
-                );
-    
-                if (ad.serviceData) {
-                  this.BLE_IsConnected = true;
-                  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
-                  await this.stopScanning(switchbot);
-                } else {
-                  this.BLE_IsConnected = false;
-                  this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
-                }
-              };
-              // Wait
-              return await sleep(this.scanDuration * 1000);
-            })
-            .then(async () => {
-              // Stop to monitor
-              await this.stopScanning(switchbot);
-            })
-            .catch(async (e: any) => {
-              this.apiError(e);
-              this.errorLog(
-                `${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}` +
-                ` Connection, Error Message: ${JSON.stringify(e.message)}`,
-              );
-              await this.BLERefreshConnection(switchbot);
-            });
-        } else {
-          await this.BLERefreshConnection(switchbot);
-        }*/
+        if (switchbot === undefined) {
+            await this.BLERefreshConnection(switchbot);
+        }
     }
     async openAPIRefreshStatus() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
         try {
-            const { body, statusCode } = await request(`${Devices}/${this.device.deviceId}/status`, {
-                headers: this.platform.generateHeaders(),
-            });
+            const { body, statusCode } = await this.platform.retryRequest(this.deviceMaxRetries, this.deviceDelayBetweenRetries, `${Devices}/${this.device.deviceId}/status`, { headers: this.platform.generateHeaders() });
             this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
             const deviceStatus = await body.json();
             this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
             this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
             if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
-                this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+                this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
                     + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
-                this.OpenAPI_CurrentPosition = deviceStatus.body.slidePosition;
-                this.OpenAPI_InMotion = deviceStatus.body.moving;
-                this.OpenAPI_CurrentAmbientLightLevel = deviceStatus.body.brightness;
-                this.OpenAPI_BatteryLevel = deviceStatus.body.battery;
-                this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
-                this.openAPIparseStatus();
+                this.openAPIparseStatus(deviceStatus);
                 this.updateHomeKitCharacteristics();
             }
             else {
@@ -629,7 +543,7 @@ export class Curtain {
     }
     async BLEpushChanges() {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`);
-        if (this.TargetPosition !== this.CurrentPosition) {
+        if (this.WindowCovering.TargetPosition !== this.WindowCovering.CurrentPosition) {
             const switchbot = await this.platform.connectBLE();
             // Convert to BLE Address
             this.device.bleMac = this.device
@@ -637,20 +551,22 @@ export class Curtain {
                 .join(':')
                 .toLowerCase();
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
-            this.SilentPerformance();
-            const adjustedMode = this.setPositionMode === '1' ? 0x01 : 0xff;
-            this.debugLog(`${this.accessory.displayName} Mode: ${this.Mode}`);
+            const { setPositionMode, Mode } = await this.setPerformance();
+            const adjustedMode = setPositionMode === 1 ? 0x01 : 0xff;
+            this.debugLog(`${this.accessory.displayName} Mode: ${Mode}`);
             if (switchbot !== false) {
                 try {
                     const device_list = await switchbot.discover({ model: 'c', quick: true, id: this.device.bleMac });
-                    this.infoLog(`${this.accessory.displayName} Target Position: ${this.TargetPosition}`);
-                    await this.retry({
-                        max: this.maxRetry(),
+                    this.infoLog(`${this.accessory.displayName} Target Position: ${this.WindowCovering.TargetPosition}`);
+                    await this.retryBLE({
+                        max: await this.maxRetryBLE(),
                         fn: async () => {
-                            await device_list[0].runToPos(100 - Number(this.TargetPosition), adjustedMode);
+                            await device_list[0].runToPos(100 - Number(this.WindowCovering.TargetPosition), adjustedMode);
                         },
                     });
                     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
+                    this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+                        + `TargetPosition: ${this.WindowCovering.TargetPosition} sent over BLE,  sent successfully`);
                 }
                 catch (e) {
                     this.apiError(e);
@@ -667,26 +583,7 @@ export class Curtain {
         }
         else {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges, CurrentPosition & TargetPosition Are the Same.` +
-                `  CurrentPosition: ${this.CurrentPosition}, TargetPosition  ${this.TargetPosition}`);
-        }
-    }
-    async retry({ max, fn }) {
-        return fn().catch(async (e) => {
-            if (max === 0) {
-                throw e;
-            }
-            this.infoLog(e);
-            this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Retrying`);
-            await sleep(1000);
-            return this.retry({ max: max - 1, fn });
-        });
-    }
-    maxRetry() {
-        if (this.device.maxRetry) {
-            return this.device.maxRetry;
-        }
-        else {
-            return 5;
+                `  CurrentPosition: ${this.WindowCovering.CurrentPosition}, TargetPosition  ${this.WindowCovering.TargetPosition}`);
         }
     }
     async openAPIpushChanges() {
@@ -694,27 +591,13 @@ export class Curtain {
         let parameter;
         let commandType;
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
-        if (this.TargetPosition !== this.CurrentPosition || this.device.disableCaching) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Pushing ${this.TargetPosition}`);
-            const adjustedTargetPosition = 100 - Number(this.TargetPosition);
-            if (Number(this.TargetPosition) > 50) {
-                this.setPositionMode = this.device.curtain?.setOpenMode;
-            }
-            else {
-                this.setPositionMode = this.device.curtain?.setCloseMode;
-            }
-            if (this.setPositionMode === '1') {
-                this.Mode = 'Silent Mode';
-            }
-            else if (this.setPositionMode === '0') {
-                this.Mode = 'Performance Mode';
-            }
-            else {
-                this.Mode = 'Default Mode';
-            }
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Mode: ${this.Mode}`);
-            const adjustedMode = this.setPositionMode || 'ff';
-            if (this.HoldPosition) {
+        if (this.WindowCovering.TargetPosition !== this.WindowCovering.CurrentPosition || this.device.disableCaching) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Pushing ${this.WindowCovering.TargetPosition}`);
+            const adjustedTargetPosition = 100 - Number(this.WindowCovering.TargetPosition);
+            const { setPositionMode, Mode } = await this.setPerformance();
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Mode: ${Mode}`);
+            const adjustedMode = setPositionMode || 'ff';
+            if (this.WindowCovering.HoldPosition) {
                 command = 'pause';
                 parameter = 'default';
                 commandType = 'command';
@@ -744,6 +627,8 @@ export class Curtain {
                 if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
                     this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
                         + `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
+                    this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+                        + `request to SwitchBot API, body: ${JSON.stringify(deviceStatus)} sent successfully`);
                 }
                 else {
                     this.statusCode(statusCode);
@@ -758,56 +643,59 @@ export class Curtain {
         }
         else {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No OpenAPI Changes, CurrentPosition & TargetPosition Are the Same.` +
-                ` CurrentPosition: ${this.CurrentPosition}, TargetPosition  ${this.TargetPosition}`);
+                ` CurrentPosition: ${this.WindowCovering.CurrentPosition}, TargetPosition  ${this.WindowCovering.TargetPosition}`);
         }
     }
     /**
      * Handle requests to set the value of the "Target Position" characteristic
      */
     async TargetPositionSet(value) {
-        if (this.TargetPosition === this.accessory.context.TargetPosition) {
+        if (this.WindowCovering.TargetPosition === this.accessory.context.TargetPosition) {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set TargetPosition: ${value}`);
         }
         else {
             this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetPosition: ${value}`);
         }
         // Set HoldPosition to false when TargetPosition is changed
-        this.HoldPosition = false;
-        this.windowCoveringService.updateCharacteristic(this.hap.Characteristic.HoldPosition, this.HoldPosition);
-        this.TargetPosition = value;
+        this.WindowCovering.HoldPosition = false;
+        this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.HoldPosition, this.WindowCovering.HoldPosition);
+        this.WindowCovering.TargetPosition = value;
         if (this.device.mqttURL) {
-            this.mqttPublish('TargetPosition', this.TargetPosition);
-            this.mqttPublish('HoldPosition', this.HoldPosition);
+            this.mqttPublish('TargetPosition', this.WindowCovering.TargetPosition.toString());
+            this.mqttPublish('HoldPosition', this.WindowCovering.HoldPosition.toString()); // Convert boolean to string
         }
         await this.setMinMax();
-        if (value > this.CurrentPosition) {
-            this.PositionState = this.hap.Characteristic.PositionState.INCREASING;
+        if (value > this.WindowCovering.CurrentPosition) {
+            this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.INCREASING;
             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: ${value},`
+                + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
         }
-        else if (value < this.CurrentPosition) {
-            this.PositionState = this.hap.Characteristic.PositionState.DECREASING;
+        else if (value < this.WindowCovering.CurrentPosition) {
+            this.WindowCovering.PositionState = this.hap.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: ${value},`
+                + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
         }
         else {
-            this.PositionState = this.hap.Characteristic.PositionState.STOPPED;
+            this.WindowCovering.PositionState = this.hap.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: ${value},`
+                + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
         }
-        this.windowCoveringService.setCharacteristic(this.hap.Characteristic.PositionState, this.PositionState);
-        this.windowCoveringService.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.PositionState);
+        this.WindowCovering.Service.setCharacteristic(this.hap.Characteristic.PositionState, this.WindowCovering.PositionState);
+        this.WindowCovering.Service.getCharacteristic(this.hap.Characteristic.PositionState).updateValue(this.WindowCovering.PositionState);
         /**
          * If Curtain 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}`);
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateRate: ${this.deviceUpdateRate}`);
         if (this.setNewTarget) {
             this.setNewTargetTimer = setTimeout(() => {
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} setNewTarget ${this.setNewTarget} timeout`);
                 this.setNewTarget = false;
-            }, this.updateRate * 1000);
+            }, this.deviceUpdateRate * 1000);
         }
         this.doCurtainUpdate.next();
     }
@@ -816,155 +704,114 @@ export class Curtain {
      */
     async HoldPositionSet(value) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} HoldPosition: ${value}`);
-        this.HoldPosition = value;
+        this.WindowCovering.HoldPosition = value;
         this.doCurtainUpdate.next();
     }
     async updateHomeKitCharacteristics() {
         await this.setMinMax();
-        if (this.CurrentPosition === undefined || Number.isNaN(this.CurrentPosition)) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.CurrentPosition}`);
+        if (this.WindowCovering.CurrentPosition === undefined || Number.isNaN(this.WindowCovering.CurrentPosition)) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
         }
         else {
+            this.accessory.context.CurrentPosition = this.WindowCovering.CurrentPosition;
+            this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, Number(this.WindowCovering.CurrentPosition));
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+                + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`);
             if (this.device.mqttURL) {
-                this.mqttPublish('CurrentPosition', this.CurrentPosition);
+                this.mqttPublish('CurrentPosition', this.WindowCovering.CurrentPosition.toString()); // Convert to string
             }
-            this.accessory.context.CurrentPosition = this.CurrentPosition;
-            this.windowCoveringService.updateCharacteristic(this.hap.Characteristic.CurrentPosition, Number(this.CurrentPosition));
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic CurrentPosition: ${this.CurrentPosition}`);
         }
-        if (this.PositionState === undefined) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} PositionState: ${this.PositionState}`);
+        if (this.WindowCovering.PositionState === undefined) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} PositionState: ${this.WindowCovering.PositionState}`);
         }
         else {
             if (this.device.mqttURL) {
-                this.mqttPublish('PositionState', this.PositionState);
+                this.mqttPublish('PositionState', this.WindowCovering.PositionState.toString());
             }
-            this.accessory.context.PositionState = this.PositionState;
-            this.windowCoveringService.updateCharacteristic(this.hap.Characteristic.PositionState, Number(this.PositionState));
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic PositionState: ${this.PositionState}`);
+            this.accessory.context.PositionState = this.WindowCovering.PositionState;
+            this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.PositionState, Number(this.WindowCovering.PositionState));
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+                + ` PositionState: ${this.WindowCovering.PositionState}`);
         }
-        if (this.TargetPosition === undefined || Number.isNaN(this.TargetPosition)) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} TargetPosition: ${this.TargetPosition}`);
+        if (this.WindowCovering.TargetPosition === undefined || Number.isNaN(this.WindowCovering.TargetPosition)) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} TargetPosition: ${this.WindowCovering.TargetPosition}`);
         }
         else {
             if (this.device.mqttURL) {
-                this.mqttPublish('TargetPosition', this.TargetPosition);
+                this.mqttPublish('TargetPosition', this.WindowCovering.TargetPosition.toString());
             }
-            this.accessory.context.TargetPosition = this.TargetPosition;
-            this.windowCoveringService.updateCharacteristic(this.hap.Characteristic.TargetPosition, Number(this.TargetPosition));
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic TargetPosition: ${this.TargetPosition}`);
+            this.accessory.context.TargetPosition = this.WindowCovering.TargetPosition;
+            this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, Number(this.WindowCovering.TargetPosition));
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+                + ` TargetPosition: ${this.WindowCovering.TargetPosition}`);
         }
-        if (this.HoldPosition === undefined) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} HoldPosition: ${this.HoldPosition}`);
+        if (this.WindowCovering.HoldPosition === undefined) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} HoldPosition: ${this.WindowCovering.HoldPosition}`);
         }
         else {
             if (this.device.mqttURL) {
-                this.mqttPublish('HoldPosition', this.HoldPosition);
+                this.mqttPublish('HoldPosition', this.WindowCovering.HoldPosition.toString());
             }
-            this.accessory.context.HoldPosition = this.HoldPosition;
-            this.windowCoveringService.updateCharacteristic(this.hap.Characteristic.HoldPosition, this.HoldPosition);
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic HoldPosition: ${this.HoldPosition}`);
+            this.accessory.context.HoldPosition = this.WindowCovering.HoldPosition;
+            this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.HoldPosition, this.WindowCovering.HoldPosition);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+                + ` HoldPosition: ${this.WindowCovering.HoldPosition}`);
         }
         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}`);
+            if (this.LightSensor.CurrentAmbientLightLevel === undefined || Number.isNaN(this.LightSensor.CurrentAmbientLightLevel)) {
+                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+                    + ` CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
             }
             else {
                 if (this.device.mqttURL) {
-                    this.mqttPublish('CurrentAmbientLightLevel', this.CurrentAmbientLightLevel);
+                    this.mqttPublish('CurrentAmbientLightLevel', this.LightSensor.CurrentAmbientLightLevel.toString());
                 }
-                this.accessory.context.CurrentAmbientLightLevel = this.CurrentAmbientLightLevel;
-                this.lightSensorService?.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, this.CurrentAmbientLightLevel);
+                this.accessory.context.CurrentAmbientLightLevel = this.LightSensor.CurrentAmbientLightLevel;
+                this.LightSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, this.LightSensor.CurrentAmbientLightLevel);
                 this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}` +
-                    ` updateCharacteristic CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
+                    ` updateCharacteristic CurrentAmbientLightLevel: ${this.LightSensor.CurrentAmbientLightLevel}`);
                 if (this.device.history) {
                     this.historyService?.addEntry({
                         time: Math.round(new Date().valueOf() / 1000),
-                        lux: this.CurrentAmbientLightLevel,
+                        lux: this.LightSensor.CurrentAmbientLightLevel,
                     });
                 }
             }
         }
-        if (this.BatteryLevel === undefined) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
+        if (this.Battery.BatteryLevel === undefined) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}`);
         }
         else {
             if (this.device.mqttURL) {
-                this.mqttPublish('BatteryLevel', this.BatteryLevel);
+                this.mqttPublish('BatteryLevel', this.Battery.BatteryLevel.toString());
             }
-            this.accessory.context.BatteryLevel = this.BatteryLevel;
-            this.batteryService?.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.BatteryLevel);
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
+            this.accessory.context.BatteryLevel = this.Battery.BatteryLevel;
+            this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.Battery.BatteryLevel);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.Battery.BatteryLevel}`);
         }
-        if (this.StatusLowBattery === undefined) {
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
+        if (this.Battery.StatusLowBattery === undefined) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.Battery.StatusLowBattery}`);
         }
         else {
             if (this.device.mqttURL) {
-                this.mqttPublish('StatusLowBattery', this.StatusLowBattery);
-            }
-            this.accessory.context.StatusLowBattery = this.StatusLowBattery;
-            this.batteryService?.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.StatusLowBattery);
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
-        }
-    }
-    /*
-     * Publish MQTT message for topics of
-     * 'homebridge-switchbot/curtain/xx:xx:xx:xx:xx:xx'
-     */
-    mqttPublish(topic, message) {
-        const mac = this.device.deviceId
-            ?.toLowerCase()
-            .match(/[\s\S]{1,2}/g)
-            ?.join(':');
-        const options = this.device.mqttPubOptions || {};
-        this.mqttClient?.publish(`homebridge-switchbot/curtain/${mac}/${topic}`, `${message}`, options);
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MQTT message: ${topic}/${message} options:${JSON.stringify(options)}`);
-    }
-    /*
-     * Setup MQTT hadler if URL is specified.
-     */
-    async setupMqtt(device) {
-        if (device.mqttURL) {
-            try {
-                const { connectAsync } = asyncmqtt;
-                this.mqttClient = await connectAsync(device.mqttURL, device.mqttOptions || {});
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MQTT connection has been established successfully.`);
-                this.mqttClient.on('error', (e) => {
-                    this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Failed to publish MQTT messages. ${e}`);
-                });
-            }
-            catch (e) {
-                this.mqttClient = null;
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Failed to establish MQTT connection. ${e}`);
+                this.mqttPublish('StatusLowBattery', this.Battery.StatusLowBattery.toString());
             }
+            this.accessory.context.StatusLowBattery = this.Battery.StatusLowBattery;
+            this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+                + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
         }
-    }
-    async stopScanning(switchbot) {
-        switchbot.stopScan();
-        if (this.BLE_IsConnected) {
-            await this.BLEparseStatus();
-            await this.updateHomeKitCharacteristics();
+        if (this.Battery.ChargingState === undefined) {
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ChargingState: ${this.Battery.ChargingState}`);
         }
         else {
-            await this.BLERefreshConnection(switchbot);
-        }
-    }
-    async getCustomBLEAddress(switchbot) {
-        if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
-            (async () => {
-                // Start to monitor advertisement packets
-                await switchbot.startScan({
-                    model: 'c',
-                });
-                // Set an event handler
-                switchbot.onadvertisement = (ad) => {
-                    this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, '  ')}`);
-                };
-                await sleep(10000);
-                // Stop to monitor
-                switchbot.stopScan();
-            })();
+            if (this.device.mqttURL) {
+                this.mqttPublish('ChargingState', this.Battery.ChargingState.toString());
+            }
+            this.accessory.context.ChargingState = this.Battery.ChargingState;
+            this.Battery.Service.updateCharacteristic(this.hap.Characteristic.ChargingState, this.Battery.ChargingState);
+            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
+                + ` ChargingState: ${this.Battery.ChargingState}`);
         }
     }
     async BLEPushConnection() {
@@ -981,354 +828,104 @@ export class Curtain {
             await this.openAPIRefreshStatus();
         }
     }
-    async SilentPerformance() {
-        if (Number(this.TargetPosition) > 50) {
-            if (this.device.curtain?.setOpenMode === '1') {
-                this.setPositionMode = '1';
-                this.Mode = 'Silent Mode';
+    async setPerformance() {
+        let setPositionMode;
+        let Mode;
+        if (Number(this.WindowCovering.TargetPosition) > 50) {
+            if (this.device.blindTilt?.setOpenMode === '1') {
+                setPositionMode = 1;
+                Mode = 'Silent Mode';
+            }
+            else if (this.device.blindTilt?.setOpenMode === '0') {
+                setPositionMode = 0;
+                Mode = 'Performance Mode';
             }
             else {
-                this.setPositionMode = '0';
-                this.Mode = 'Performance Mode';
+                setPositionMode = 0;
+                Mode = 'Default Mode';
             }
         }
         else {
-            if (this.device.curtain?.setCloseMode === '1') {
-                this.setPositionMode = '1';
-                this.Mode = 'Silent Mode';
+            if (this.device.blindTilt?.setCloseMode === '1') {
+                setPositionMode = 1;
+                Mode = 'Silent Mode';
+            }
+            else if (this.device.blindTilt?.setOpenMode === '0') {
+                setPositionMode = 0;
+                Mode = 'Performance Mode';
             }
             else {
-                this.setPositionMode = '0';
-                this.Mode = 'Performance Mode';
+                setPositionMode = 0;
+                Mode = 'Default Mode';
             }
         }
+        return { setPositionMode, Mode };
     }
     async setMinMax() {
         if (this.device.curtain?.set_min) {
-            if (Number(this.CurrentPosition) <= this.device.curtain?.set_min) {
-                this.CurrentPosition = 0;
+            if (Number(this.WindowCovering.CurrentPosition) <= this.device.curtain?.set_min) {
+                this.WindowCovering.CurrentPosition = 0;
             }
         }
         if (this.device.curtain?.set_max) {
-            if (Number(this.CurrentPosition) >= this.device.curtain?.set_max) {
-                this.CurrentPosition = 100;
+            if (Number(this.WindowCovering.CurrentPosition) >= this.device.curtain?.set_max) {
+                this.WindowCovering.CurrentPosition = 100;
             }
         }
         if (this.device.history) {
             const motion = this.accessory.getService(this.hap.Service.MotionSensor);
-            const state = Number(this.CurrentPosition) > 0 ? 1 : 0;
+            const state = Number(this.WindowCovering.CurrentPosition) > 0 ? 1 : 0;
             motion?.updateCharacteristic(this.hap.Characteristic.MotionDetected, state);
         }
     }
-    minStep(device) {
+    async minStep(device) {
+        let set_minStep;
         if (device.curtain?.set_minStep) {
-            this.set_minStep = device.curtain?.set_minStep;
+            set_minStep = device.curtain?.set_minStep;
         }
         else {
-            this.set_minStep = 1;
+            set_minStep = 1;
         }
-        return this.set_minStep;
+        return set_minStep;
     }
-    minLux() {
+    async minLux() {
+        let set_minLux;
         if (this.device.curtain?.set_minLux) {
-            this.set_minLux = this.device.curtain?.set_minLux;
+            set_minLux = this.device.curtain?.set_minLux;
         }
         else {
-            this.set_minLux = 1;
+            set_minLux = 1;
         }
-        return this.set_minLux;
+        return set_minLux;
     }
-    maxLux() {
+    async maxLux() {
+        let set_maxLux;
         if (this.device.curtain?.set_maxLux) {
-            this.set_maxLux = this.device.curtain?.set_maxLux;
+            set_maxLux = this.device.curtain?.set_maxLux;
         }
         else {
-            this.set_maxLux = 6001;
-        }
-        return this.set_maxLux;
-    }
-    async scan(device) {
-        if (device.scanDuration) {
-            if (this.updateRate > device.scanDuration) {
-                this.scanDuration = this.updateRate;
-                if (this.BLE) {
-                    this.warnLog(`${this.device.deviceType}: ` +
-                        `${this.accessory.displayName} scanDuration is less than updateRate, overriding scanDuration with updateRate`);
-                }
-            }
-            else {
-                this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
-            }
-            if (this.BLE) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
-            }
-        }
-        else {
-            if (this.updateRate > 1) {
-                this.scanDuration = this.updateRate;
-            }
-            else {
-                this.scanDuration = this.accessory.context.scanDuration = 1;
-            }
-            if (this.BLE) {
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
-            }
-        }
-    }
-    async statusCode(statusCode) {
-        switch (statusCode) {
-            case 151:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this deviceType, statusCode: ${statusCode}`);
-                break;
-            case 152:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found, statusCode: ${statusCode}`);
-                break;
-            case 160:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported, statusCode: ${statusCode}`);
-                break;
-            case 161:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline, statusCode: ${statusCode}`);
-                this.offlineOff();
-                break;
-            case 171:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline, statusCode: ${statusCode}. ` +
-                    `Hub: ${this.device.hubDeviceId}`);
-                this.offlineOff();
-                break;
-            case 190:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
-                    ` Or command format is invalid, statusCode: ${statusCode}`);
-                break;
-            case 100:
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent, statusCode: ${statusCode}`);
-                break;
-            case 200:
-                this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Request successful, statusCode: ${statusCode}`);
-                break;
-            case 400:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Bad Request, The client has issued an invalid request. `
-                    + `This is commonly used to specify validation errors in a request payload, statusCode: ${statusCode}`);
-                break;
-            case 401:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unauthorized,	Authorization for the API is required, `
-                    + `but the request has not been authenticated, statusCode: ${statusCode}`);
-                break;
-            case 403:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Forbidden,	The request has been authenticated but does not `
-                    + `have appropriate permissions, or a requested resource is not found, statusCode: ${statusCode}`);
-                break;
-            case 404:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Found,	Specifies the requested path does not exist, `
-                    + `statusCode: ${statusCode}`);
-                break;
-            case 406:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Acceptable,	The client has requested a MIME type via `
-                    + `the Accept header for a value not supported by the server, statusCode: ${statusCode}`);
-                break;
-            case 415:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unsupported Media Type,	The client has defined a contentType `
-                    + `header that is not supported by the server, statusCode: ${statusCode}`);
-                break;
-            case 422:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unprocessable Entity,	The client has made a valid request, `
-                    + `but the server cannot process it. This is often used for APIs for which certain limits have been exceeded, statusCode: ${statusCode}`);
-                break;
-            case 429:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Too Many Requests,	The client has exceeded the number of `
-                    + `requests allowed for a given time window, statusCode: ${statusCode}`);
-                break;
-            case 500:
-                this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Internal Server Error,	An unexpected error on the SmartThings `
-                    + `servers has occurred. These errors should be rare, statusCode: ${statusCode}`);
-                break;
-            default:
-                this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode: ` +
-                    `${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
+            set_maxLux = 6001;
         }
+        return set_maxLux;
     }
     async offlineOff() {
         if (this.device.offline) {
-            await this.deviceContext();
-            await this.updateHomeKitCharacteristics();
+            this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, 100);
+            this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 100);
+            this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.PositionState, this.hap.Characteristic.PositionState.STOPPED);
         }
     }
     async apiError(e) {
-        this.windowCoveringService.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
-        this.windowCoveringService.updateCharacteristic(this.hap.Characteristic.PositionState, e);
-        this.windowCoveringService.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
-        if (!this.device.curtain?.hide_lightsensor) {
-            this.lightSensorService?.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, e);
-        }
-        this.batteryService?.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e);
-        this.batteryService?.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e);
-        //throw new this.platform.api.hap.HapStatusError(HAPStatus.SERVICE_COMMUNICATION_FAILURE);
-    }
-    async deviceContext() {
-        if (this.accessory.context.CurrentPosition === undefined) {
-            this.CurrentPosition = 0;
-        }
-        else {
-            this.CurrentPosition = this.accessory.context.CurrentPosition;
-        }
-        if (this.accessory.context.TargetPosition === undefined) {
-            this.TargetPosition = 0;
-        }
-        else {
-            this.TargetPosition = this.accessory.context.TargetPosition;
-        }
-        if (this.accessory.context.PositionState === undefined) {
-            this.PositionState = this.hap.Characteristic.PositionState.STOPPED;
-        }
-        else {
-            this.PositionState = this.accessory.context.PositionState;
-        }
+        this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
+        this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.PositionState, e);
+        this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
+        this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e);
+        this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e);
+        this.Battery.Service.updateCharacteristic(this.hap.Characteristic.ChargingState, e);
         if (!this.device.curtain?.hide_lightsensor) {
-            if (this.accessory.context.CurrentAmbientLightLevel !== undefined) {
-                this.CurrentAmbientLightLevel = this.accessory.context.CurrentAmbientLightLevel;
-            }
+            this.LightSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, e);
+            this.LightSensor.Service.updateCharacteristic(this.hap.Characteristic.StatusActive, e);
         }
-        if (this.BLE) {
-            if (this.accessory.context.BatteryLevel === undefined) {
-                this.BatteryLevel = 100;
-            }
-            else {
-                this.BatteryLevel = this.accessory.context.BatteryLevel;
-            }
-            if (this.accessory.context.StatusLowBattery === undefined) {
-                this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
-            }
-            else {
-                this.StatusLowBattery = this.accessory.context.StatusLowBattery;
-            }
-        }
-        if (this.device.history === true) {
-            // initialize when this accessory is newly created.
-            this.accessory.context.lastActivation = this.accessory.context.lastActivation ?? 0;
-        }
-        else {
-            // removes cached values if history is turned off
-            delete this.accessory.context.lastActivation;
-        }
-        if (this.FirmwareRevision === undefined) {
-            this.FirmwareRevision = this.platform.version;
-            this.accessory.context.FirmwareRevision = this.FirmwareRevision;
-        }
-    }
-    async refreshRate(device) {
-        // refreshRate
-        if (device.refreshRate) {
-            this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
-        }
-        else if (this.platform.config.options.refreshRate) {
-            this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options.refreshRate;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
-        }
-        // updateRate
-        if (device?.curtain?.updateRate) {
-            this.updateRate = device?.curtain?.updateRate;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Curtain updateRate: ${this.updateRate}`);
-        }
-        else {
-            this.updateRate = 7;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default Curtain updateRate: ${this.updateRate}`);
-        }
-    }
-    async deviceConfig(device) {
-        let config = {};
-        if (device.curtain) {
-            config = device.curtain;
-        }
-        if (device.connectionType !== undefined) {
-            config['connectionType'] = device.connectionType;
-        }
-        if (device.external !== undefined) {
-            config['external'] = device.external;
-        }
-        if (device.mqttURL !== undefined) {
-            config['mqttURL'] = device.mqttURL;
-        }
-        if (device.logging !== undefined) {
-            config['logging'] = device.logging;
-        }
-        if (device.refreshRate !== undefined) {
-            config['refreshRate'] = device.refreshRate;
-        }
-        if (device.scanDuration !== undefined) {
-            config['scanDuration'] = device.scanDuration;
-        }
-        if (device.maxRetry !== undefined) {
-            config['maxRetry'] = device.maxRetry;
-        }
-        if (device.webhook !== undefined) {
-            config['webhook'] = device.webhook;
-        }
-        if (Object.entries(config).length !== 0) {
-            this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
-        }
-    }
-    async deviceLogs(device) {
-        if (this.platform.debugMode) {
-            this.deviceLogging = this.accessory.context.logging = 'debugMode';
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
-        }
-        else if (device.logging) {
-            this.deviceLogging = this.accessory.context.logging = device.logging;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
-        }
-        else if (this.platform.config.options?.logging) {
-            this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
-        }
-        else {
-            this.deviceLogging = this.accessory.context.logging = 'standard';
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
-        }
-    }
-    /**
-     * Logging for Device
-     */
-    infoLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            this.platform.log.info(String(...log));
-        }
-    }
-    warnLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            this.platform.log.warn(String(...log));
-        }
-    }
-    debugWarnLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            if (this.deviceLogging?.includes('debug')) {
-                this.platform.log.warn('[DEBUG]', String(...log));
-            }
-        }
-    }
-    errorLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            this.platform.log.error(String(...log));
-        }
-    }
-    debugErrorLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            if (this.deviceLogging?.includes('debug')) {
-                this.platform.log.error('[DEBUG]', String(...log));
-            }
-        }
-    }
-    debugLog(...log) {
-        if (this.enablingDeviceLogging()) {
-            if (this.deviceLogging === 'debug') {
-                this.platform.log.info('[DEBUG]', String(...log));
-            }
-            else {
-                this.platform.log.debug(String(...log));
-            }
-        }
-    }
-    enablingDeviceLogging() {
-        return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
     }
 }
 //# sourceMappingURL=curtain.js.map