@switchbot/homebridge-switchbot 3.5.0-beta.7 → 3.5.0-beta.70

package/src/device/blindtilt.ts

@@ -1,113 +1,63 @@
+/* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
+ *
+ * blindtilt.ts: @switchbot/homebridge-switchbot.
+ */
 import { request } from 'undici';
-import { sleep } from '../utils.js';
-import { MqttClient } from 'mqtt';
+import { Devices } from '../settings.js';
 import { interval, Subject } from 'rxjs';
-import asyncmqtt from 'async-mqtt';
-import { SwitchBotPlatform } from '../platform.js';
+import { deviceBase } from './device.js';
+import { BlindTiltMappingMode } from '../utils.js';
 import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
-import { Service, PlatformAccessory, CharacteristicValue, Logging, API, HAP } from 'homebridge';
-import { device, devicesConfig, serviceData, deviceStatus, Devices, SwitchBotPlatformConfig } from '../settings.js';
-
-enum BlindTiltMappingMode {
-  OnlyUp = 'only_up',
-  OnlyDown = 'only_down',
-  DownAndUp = 'down_and_up',
-  UpAndDown = 'up_and_down',
-  UseTiltForDirection = 'use_tilt_for_direction',
-}
 
-export class BlindTilt {
-  public readonly api: API;
-  public readonly log: Logging;
-  public readonly config!: SwitchBotPlatformConfig;
-  protected readonly hap: HAP;
+import type { SwitchBotPlatform } from '../platform.js';
+import type { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
+import type { device, devicesConfig, serviceData, deviceStatus } from '../settings.js';
+
+
+export class BlindTilt extends deviceBase {
   // Services
-  batteryService!: Service;
-  lightSensorService?: Service;
-  windowCoveringService!: Service;
-
-  // Characteristic Values
-  BatteryLevel!: CharacteristicValue;
-  PositionState!: CharacteristicValue;
-  TargetPosition!: CharacteristicValue;
-  CurrentPosition!: CharacteristicValue;
-  StatusLowBattery!: CharacteristicValue;
-  FirmwareRevision!: CharacteristicValue;
-  CurrentAmbientLightLevel?: CharacteristicValue;
-  TargetHorizontalTiltAngle!: CharacteristicValue;
-  CurrentHorizontalTiltAngle!: CharacteristicValue;
-
-  // OpenAPI Status
-  OpenAPI_InMotion: deviceStatus['moving'];
-  OpenAPI_BatteryLevel: serviceData['battery'];
-  OpenAPI_Direction: deviceStatus['direction'];
-  OpenAPI_Calibration: serviceData['calibration'];
-  OpenAPI_CurrentPosition: serviceData['position'];
-  OpenAPI_FirmwareRevision: deviceStatus['version'];
-  OpenAPI_CurrentAmbientLightLevel: deviceStatus['brightness'];
+  private WindowCovering: {
+    Name: CharacteristicValue;
+    Service: Service;
+    PositionState: CharacteristicValue;
+    TargetPosition: CharacteristicValue;
+    CurrentPosition: CharacteristicValue;
+    TargetHorizontalTiltAngle: CharacteristicValue;
+    CurrentHorizontalTiltAngle: CharacteristicValue;
+  };
+
+  private Battery: {
+    Name: CharacteristicValue;
+    Service: Service;
+    BatteryLevel: CharacteristicValue;
+    StatusLowBattery: CharacteristicValue;
+    ChargingState?: CharacteristicValue;
+  };
+
+  private LightSensor?: {
+    Name: CharacteristicValue;
+    Service: Service;
+    CurrentAmbientLightLevel?: CharacteristicValue;
+  };
 
   // OpenAPI Others
-  Mode!: string;
-  setPositionMode?: string | number;
   mappingMode: BlindTiltMappingMode = BlindTiltMappingMode.OnlyUp;
 
-  // BLE Status
-  BLE_InMotion: serviceData['inMotion'];
-  BLE_BatteryLevel: serviceData['battery'];
-  BLE_Calibration: serviceData['calibration'];
-  BLE_CurrentPosition: serviceData['position'];
-  BLE_CurrentAmbientLightLevel: serviceData['lightLevel'];
-
-  // BLE Others
-  BLE_IsConnected?: boolean;
-  spaceBetweenLevels!: number;
-
   // Target
   setNewTarget!: boolean;
   setNewTargetTimer!: NodeJS.Timeout;
 
-  //MQTT stuff
-  mqttClient: MqttClient | null = null;
-
-  // Config
-  set_minStep!: number;
-  updateRate!: number;
-  set_minLux!: number;
-  set_maxLux!: number;
-  scanDuration!: number;
-  deviceLogging!: string;
-  deviceRefreshRate!: number;
-  setCloseMode!: string;
-  setOpenMode!: string;
-
   // Updates
   blindTiltUpdateInProgress!: boolean;
   doBlindTiltUpdate!: Subject<void>;
 
-  // Connection
-  private readonly OpenAPI: boolean;
-  private readonly BLE: boolean;
-
   constructor(
-    private readonly platform: SwitchBotPlatform,
-    private accessory: PlatformAccessory,
-    public device: device & devicesConfig,
+    readonly platform: SwitchBotPlatform,
+    accessory: PlatformAccessory,
+    device: device & devicesConfig,
   ) {
-    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';
+    super(platform, accessory, device);
     // default placeholders
-    this.deviceLogs(device);
-    this.refreshRate(device);
-    this.scan(device);
-    this.setupMqtt(device);
-    this.deviceContext();
-    this.deviceConfig(device);
-
     this.mappingMode = (device.blindTilt?.mode as BlindTiltMappingMode) ?? BlindTiltMappingMode.OnlyUp;
     this.debugLog(`Mapping mode: ${this.mappingMode}`);
 
@@ -116,57 +66,49 @@ export class BlindTilt {
     this.blindTiltUpdateInProgress = 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, 'W2701600')
-      .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 = `${device.deviceName} ${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);
-    }
-
-    // create handlers for required characteristics
-    this.windowCoveringService.setCharacteristic(this.hap.Characteristic.PositionState, this.PositionState);
-
-    this.windowCoveringService
-      .getCharacteristic(this.hap.Characteristic.CurrentPosition)
+    // Initialize WindowCovering Service
+    accessory.context.WindowCovering = accessory.context.WindowCovering ?? {};
+    this.WindowCovering = {
+      Name: accessory.context.WindowCovering.Name ?? accessory.displayName,
+      Service: accessory.getService(this.hap.Service.WindowCovering) ?? accessory.addService(this.hap.Service.WindowCovering) as Service,
+      PositionState: accessory.context.PositionState ?? this.hap.Characteristic.PositionState.STOPPED,
+      TargetPosition: accessory.context.TargetPosition ?? 100,
+      CurrentPosition: accessory.context.CurrentPosition ?? 100,
+      TargetHorizontalTiltAngle: accessory.context.TargetHorizontalTiltAngle ?? 90,
+      CurrentHorizontalTiltAngle: accessory.context.CurrentHorizontalTiltAngle ?? 90,
+    };
+    accessory.context.WindowCovering = this.WindowCovering as object;
+
+    // Initialize WindowCovering Characteristics
+    this.WindowCovering.Service
+      .setCharacteristic(this.hap.Characteristic.Name, this.WindowCovering.Name)
+      .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.CurrentPosition;
-      });
+        return this.WindowCovering.TargetPosition;
+      })
+      .onSet(this.TargetPositionSet.bind(this));
 
-    this.windowCoveringService
-      .getCharacteristic(this.hap.Characteristic.TargetPosition)
+    // Initialize WindowCovering CurrentPosition Characteristic
+    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],
-      })
-      .onSet(this.TargetPositionSet.bind(this));
+      }).onGet(() => {
+        return this.WindowCovering?.CurrentPosition ?? 0;
+      });
 
-    this.CurrentHorizontalTiltAngle = 90;
-    this.windowCoveringService
-      .getCharacteristic(this.hap.Characteristic.CurrentHorizontalTiltAngle)
+    // Initialize WindowCovering TargetHorizontalTiltAngle Characteristic
+    this.WindowCovering.Service
+      .getCharacteristic(this.hap.Characteristic.TargetHorizontalTiltAngle)
       .setProps({
         minStep: 180,
         minValue: -90,
@@ -174,31 +116,68 @@ export class BlindTilt {
         validValues: [-90, 90],
       })
       .onGet(() => {
-        // this.debugLog(`requested CurrentHorizontalTiltAngle: ${this.CurrentHorizontalTiltAngle}`);
-        return this.CurrentHorizontalTiltAngle;
-      });
+        return this.WindowCovering.TargetHorizontalTiltAngle;
+      })
+      .onSet(this.TargetHorizontalTiltAngleSet.bind(this));
 
-    this.TargetHorizontalTiltAngle = 90;
-    this.windowCoveringService
-      .getCharacteristic(this.hap.Characteristic.TargetHorizontalTiltAngle)
+    // Initialize WindowCovering CurrentHorizontalTiltAngle Characteristic
+    this.WindowCovering.Service
+      .getCharacteristic(this.hap.Characteristic.CurrentHorizontalTiltAngle)
       .setProps({
         minStep: 180,
         minValue: -90,
         maxValue: 90,
         validValues: [-90, 90],
-      })
-      .onSet(this.TargetHorizontalTiltAngleSet.bind(this));
-
-    // Battery Service
-    const batteryService = `${accessory.displayName} Battery`;
-    (this.batteryService = this.accessory.getService(this.hap.Service.Battery)
-      || accessory.addService(this.hap.Service.Battery)), batteryService;
+      }).onGet(() => {
+        return this.WindowCovering.CurrentHorizontalTiltAngle ?? 0;
+      });
 
-    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`);
+    // Initialize Battery Service
+    accessory.context.Battery = accessory.context.Battery ?? {};
+    this.Battery = {
+      Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
+      Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery) as Service,
+      BatteryLevel: accessory.context.BatteryLevel ?? 100,
+      StatusLowBattery: this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
+      ChargingState: accessory.context.ChargingState ?? this.hap.Characteristic.ChargingState.NOT_CHARGING,
+    };
+    accessory.context.Battery = this.Battery as object;
+
+    // Initialize Battery Name Characteristic
+    this.Battery.Service
+      .setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name)
+      .setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
+
+    // Initialize LightSensor Service
+    if (device.blindTilt?.hide_lightsensor) {
+      if (this.LightSensor?.Service) {
+        this.debugLog(`${device.deviceType}: ${accessory.displayName} Removing Light Sensor Service`);
+        this.LightSensor.Service = accessory.getService(this.hap.Service.LightSensor) as Service;
+        accessory.removeService(this.LightSensor.Service);
+        accessory.context.LightSensor = {};
+      }
+    } else {
+      accessory.context.LightSensor = accessory.context.LightSensor ?? {};
+      this.LightSensor = {
+        Name: accessory.context.LightSensor.Name ?? `${accessory.displayName} Light Sensor`,
+        Service: accessory.getService(this.hap.Service.LightSensor) ?? accessory.addService(this.hap.Service.LightSensor) as Service,
+        CurrentAmbientLightLevel: accessory.context.CurrentAmbientLightLevel ?? 0.0001,
+      };
+      accessory.context.LightSensor = this.LightSensor as object;
+
+      // Initialize LightSensor Characteristics
+      this.LightSensor.Service
+        .setCharacteristic(this.hap.Characteristic.Name, this.LightSensor.Name)
+        .setCharacteristic(this.hap.Characteristic.StatusActive, true)
+        .getCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel)
+        .onGet(() => {
+          return this.LightSensor?.CurrentAmbientLightLevel ?? 0.0001;
+        });
     }
 
+    // Retrieve initial values and updateHomekit
+    this.refreshStatus();
+
     // Update Homekit
     this.updateHomeKitCharacteristics();
 
@@ -210,21 +189,23 @@ export class BlindTilt {
       });
 
     //regisiter webhook event handler
-    if (this.device.webhook) {
-      this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
+    if (device.webhook) {
+      this.debugLog(`${device.deviceType}: ${accessory.displayName} is listening webhook.`);
       this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
         try {
-          this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
-          this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Please Submit Logs: ` + 'https://tinyurl.com/SwitchBotBug');
-          /*const { temperature, humidity } = context;
-            const { CurrentTemperature, CurrentRelativeHumidity } = this;
-            this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
-                    '(temperature, humidity) = ' +
-                    `Webhook:(${temperature}, ${humidity}), ` +
-                    `current:(${CurrentTemperature}, ${CurrentRelativeHumidity})`);
-            this.CurrentRelativeHumidity = humidity;
-            this.CurrentTemperature = temperature;
-            this.updateHomeKitCharacteristics();*/
+          this.debugLog(`${device.deviceType}: ${accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
+          const { slidePosition, battery, lightLevel } = context;
+          const { CurrentPosition } = this.WindowCovering;
+          const { BatteryLevel } = this.Battery;
+          const { CurrentAmbientLightLevel } = this.LightSensor ?? {};
+          this.debugLog(`${device.deviceType}: ${accessory.displayName} (slidePosition, battery, lightLevel) = `
+            + `Webhook:(${slidePosition}, ${battery}, ${lightLevel}), current:(${CurrentPosition}, ${BatteryLevel}, ${CurrentAmbientLightLevel})`);
+          this.WindowCovering.CurrentPosition = slidePosition;
+          this.Battery.BatteryLevel = battery;
+          if (!device.blindTilt?.hide_lightsensor) {
+            this.LightSensor!.CurrentAmbientLightLevel = lightLevel;
+          }
+          this.updateHomeKitCharacteristics();
         } catch (e: any) {
           this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
             + `failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`);
@@ -233,13 +214,14 @@ export class BlindTilt {
     }
 
     // update slide progress
-    interval(this.updateRate * 1000)
+    interval(this.deviceUpdateRate * 1000)
       //.pipe(skipWhile(() => this.blindTiltUpdateInProgress))
       .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(`${device.deviceType}: ${accessory.displayName} Refresh Status When Moving,`
+          + ` PositionState: ${this.WindowCovering.PositionState}`);
         await this.refreshStatus();
       });
 
@@ -257,228 +239,247 @@ export class BlindTilt {
           await this.pushChanges();
         } catch (e: any) {
           this.apiError(e);
-          this.errorLog(
-            `${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with ${this.device.connectionType} Connection,` +
-            ` Error Message: ${JSON.stringify(e.message)}`,
-          );
+          this.errorLog(`${device.deviceType}: ${accessory.displayName} failed pushChanges with ${device.connectionType} Connection,` +
+            ` Error Message: ${JSON.stringify(e.message)}`);
         }
         this.blindTiltUpdateInProgress = false;
       });
   }
 
   /**
-   * Parse the device status from the SwitchBot api
+   * Parse the device status from the SwitchBotBLE API
    */
-  async parseStatus(): Promise<void> {
-    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(): Promise<void> {
+  async BLEparseStatus(serviceData: serviceData): Promise<void> {
     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 ...`);
     }
 
-    if (this.setNewTarget && this.BLE_InMotion) {
+    if (this.setNewTarget && serviceData.inMotion) {
       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} Standby2, 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} Standby2,`
+          + ` 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.blindTilt?.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;
+
+      if (this.LightSensor?.CurrentAmbientLightLevel === 0) {
+        this.LightSensor!.CurrentAmbientLightLevel = 0.0001;
+      }
 
       // 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.LightSensor!.CurrentAmbientLightLevel = (set_maxLux - set_minLux) / spaceBetweenLevels;
           this.debugLog(
-            `${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel},` +
-            ` Calculation: ${(this.set_maxLux - this.set_minLux) / this.spaceBetweenLevels}`,
+            `${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}`);
           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}`);
           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}`);
           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}`);
           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}`);
           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}`);
           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}`);
           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.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.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel},`
+      + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`,
     );
   }
 
-  async openAPIparseStatus(): Promise<void> {
+
+  /**
+   * Parse the device status from the SwitchBot OpenAPI
+   */
+  async openAPIparseStatus(deviceStatus: deviceStatus): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
 
-    const [homekitPosition, homekitTiltAngle] = this.mapDeviceValuesToHomekitValues(Number(this.OpenAPI_CurrentPosition),
-      String(this.OpenAPI_Direction));
-    this.debugLog(` device: ${this.OpenAPI_CurrentPosition} => HK: ${homekitPosition}`);
+    const [homekitPosition, homekitTiltAngle] = this.mapDeviceValuesToHomekitValues(Number(deviceStatus.body.slidePosition),
+      String(deviceStatus.body.direction));
+    this.debugLog(` device: ${deviceStatus.body.slidePosition} => HK: ${homekitPosition}`);
 
-    this.CurrentPosition = homekitPosition;
+    this.WindowCovering!.CurrentPosition = homekitPosition;
     // CurrentPosition
     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 (homekitTiltAngle) {
-      this.CurrentHorizontalTiltAngle = homekitTiltAngle!;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentHorizontalTiltAngle: ${this.CurrentHorizontalTiltAngle}`);
+      this.WindowCovering.CurrentHorizontalTiltAngle = homekitTiltAngle!;
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+        + ` CurrentHorizontalTiltAngle: ${this.WindowCovering.CurrentHorizontalTiltAngle}`);
     }
 
     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 (this.TargetPosition > this.CurrentPosition || (homekitTiltAngle && this.TargetHorizontalTiltAngle !== this.CurrentHorizontalTiltAngle)) {
-        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 (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 (this.WindowCovering.TargetPosition > this.WindowCovering.CurrentPosition
+        || (homekitTiltAngle && this.WindowCovering.TargetHorizontalTiltAngle !== this.WindowCovering.CurrentHorizontalTiltAngle)) {
+        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 (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 because reached position,` + ` CurrentPosition: ${this.CurrentPosition}`,
+          `${this.device.deviceType}: ${this.WindowCovering.CurrentPosition} Standby because reached position,`
+          + ` CurrentPosition: ${this.WindowCovering.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.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 because device not moving,` + ` CurrentPosition: ${this.CurrentPosition}`,
+        `${this.device.deviceType}: ${this.accessory.displayName} Standby because device not moving,`
+        + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`,
       );
-      this.TargetPosition = this.CurrentPosition;
+      this.WindowCovering.TargetPosition = this.WindowCovering.CurrentPosition;
       if (homekitTiltAngle) {
-        this.TargetHorizontalTiltAngle = this.CurrentHorizontalTiltAngle;
+        this.WindowCovering.TargetHorizontalTiltAngle = this.WindowCovering.CurrentHorizontalTiltAngle;
       }
-      this.PositionState = this.hap.Characteristic.PositionState.STOPPED;
+      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.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.WindowCovering.CurrentPosition},` +
+      ` TargetPosition: ${this.WindowCovering.TargetPosition}, PositionState: ${this.WindowCovering.PositionState},`,
     );
 
     if (!this.device.blindTilt?.hide_lightsensor) {
-      this.set_minLux = this.minLux();
-      this.set_maxLux = this.maxLux();
+      const set_minLux = await this.minLux();
+      const set_maxLux = await this.maxLux();
       // Brightness
-      switch (this.OpenAPI_CurrentAmbientLightLevel) {
+      switch (deviceStatus.body.brightness) {
         case 'dim':
-          this.CurrentAmbientLightLevel = this.set_minLux;
+          this.LightSensor!.CurrentAmbientLightLevel = set_minLux;
           break;
         case 'bright':
         default:
-          this.CurrentAmbientLightLevel = this.set_maxLux;
+          this.LightSensor!.CurrentAmbientLightLevel = set_maxLux;
       }
-      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;
-    }
-    if (Number.isNaN(this.BatteryLevel)) {
-      this.BatteryLevel = 100;
+      this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+    }
+    if (Number.isNaN(this.Battery.BatteryLevel)) {
+      this.Battery.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, '')}`);
+    let deviceVersion: string;
+    if (version?.includes('.') === false) {
+      const replace = version?.replace(/^V|-.*$/g, '');
+      const match = replace?.match(/.{1,1}/g);
+      const blindTiltVersion = match?.join('.') ?? '0.0.0';
+      deviceVersion = blindTiltVersion;
+    } else {
+      deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
     }
-    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;
+    this.accessory
+      .getService(this.hap.Service.AccessoryInformation)!
+      .setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
+      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
+      .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+      .updateValue(deviceVersion);
+    this.accessory.context.deviceVersion = deviceVersion;
+    this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
   }
 
   async refreshStatus(): Promise<void> {
@@ -510,21 +511,13 @@ export class BlindTilt {
     // Start to monitor advertisement packets
     (async () => {
       // Start to monitor advertisement packets
-      await switchbot.startScan({
-        model: 'x',
-        id: this.device.bleMac,
-      });
+      await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
       // Set an event handler
       switchbot.onadvertisement = (ad: any) => {
-        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}`);
-        if (this.device.bleMac === ad.address && ad.model === 'x') {
+        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)}`);
         }
@@ -534,83 +527,27 @@ export class BlindTilt {
       // 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: 'c',
-          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 {
+    if (switchbot === undefined) {
       await this.BLERefreshConnection(switchbot);
-    }*/
+    }
   }
 
   async openAPIRefreshStatus(): Promise<void> {
     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: any = 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_Direction = deviceStatus.body.direction;
-        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 {
         this.statusCode(statusCode);
@@ -649,7 +586,7 @@ export class BlindTilt {
 
   async BLEpushChanges(): Promise<void> {
     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
@@ -657,26 +594,24 @@ export class BlindTilt {
         .join(':')
         .toLowerCase();
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE Address: ${this.device.bleMac}`);
-      this.SilentPerformance();
-      const adjustedMode = this.setPositionMode || null;
-      if (adjustedMode === null) {
-        this.Mode = 'Default Mode';
-      }
-      this.debugLog(`${this.accessory.displayName} Mode: ${this.Mode}`);
+      const { setPositionMode, Mode }: { setPositionMode: number; Mode: string; } = await this.setPerformance();
+      this.debugLog(`${this.accessory.displayName} Mode: ${Mode}`);
       if (switchbot !== false) {
         switchbot
           .discover({ model: 'c', quick: true, id: this.device.bleMac })
           .then(async (device_list: any) => {
-            this.infoLog(`${this.accessory.displayName} Target Position: ${this.TargetPosition}`);
-            return await this.retry({
-              max: this.maxRetry(),
+            this.infoLog(`${this.accessory.displayName} Target Position: ${this.WindowCovering.TargetPosition}`);
+            return await this.retryBLE({
+              max: await this.maxRetryBLE(),
               fn: async () => {
-                return await device_list[0].runToPos(100 - Number(this.TargetPosition), adjustedMode);
+                return await device_list[0].runToPos(100 - Number(this.WindowCovering.TargetPosition), setPositionMode);
               },
             });
           })
           .then(() => {
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
+            this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+              + `Target Position: ${this.WindowCovering.TargetPosition} sent over BLE,  sent successfully`);
           })
           .catch(async (e: any) => {
             this.apiError(e);
@@ -693,48 +628,35 @@ export class BlindTilt {
     } else {
       this.debugLog(
         `${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges, CurrentPosition & TargetPosition Are the Same.` +
-        `  CurrentPosition: ${this.CurrentPosition}, TargetPosition  ${this.TargetPosition}`,
+        `  CurrentPosition: ${this.WindowCovering.CurrentPosition}, TargetPosition  ${this.WindowCovering.TargetPosition}`,
       );
     }
   }
 
-  async retry({ max, fn }: { max: number; fn: { (): any; (): Promise<any> } }): Promise<null> {
-    return fn().catch(async (e: any) => {
-      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(): number {
-    if (this.device.maxRetry) {
-      return this.device.maxRetry;
-    } else {
-      return 5;
-    }
-  }
-
   async openAPIpushChanges(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
     const hasDifferentAndRelevantHorizontalTiltAngle =
-      this.mappingMode === BlindTiltMappingMode.UseTiltForDirection && this.TargetHorizontalTiltAngle !== this.CurrentHorizontalTiltAngle;
-    if (this.TargetPosition !== this.CurrentPosition || hasDifferentAndRelevantHorizontalTiltAngle || this.device.disableCaching) {
-      const [direction, position] = this.mapHomekitValuesToDeviceValues(Number(this.TargetPosition), Number(this.TargetHorizontalTiltAngle));
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Pushing ${this.TargetPosition} (device = ${direction};${position})`);
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Mode: ${this.Mode}`);
+      this.mappingMode === BlindTiltMappingMode.UseTiltForDirection
+      && this.WindowCovering.TargetHorizontalTiltAngle !== this.WindowCovering.CurrentHorizontalTiltAngle;
+    if (this.WindowCovering.TargetPosition !== this.WindowCovering.CurrentPosition
+      || hasDifferentAndRelevantHorizontalTiltAngle || this.device.disableCaching) {
+      const [direction, position] = this.mapHomekitValuesToDeviceValues(Number(this.WindowCovering.TargetPosition),
+        Number(this.WindowCovering.TargetHorizontalTiltAngle));
+      const { Mode }: { setPositionMode: number; Mode: string; } = await this.setPerformance();
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+        + ` Pushing ${this.WindowCovering.TargetPosition} (device = ${direction};${position})`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Mode: ${Mode}`);
       let bodyChange = '';
       if (position === 100) {
         bodyChange = JSON.stringify({
           command: 'fullyOpen',
+          parameter: 'default',
           commandType: 'command',
         });
       } else if (position === 0) {
         bodyChange = JSON.stringify({
           command: direction === 'up' ? 'closeUp' : 'closeDown',
+          parameter: 'default',
           commandType: 'command',
         });
       } else {
@@ -757,8 +679,10 @@ export class BlindTilt {
         this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
         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.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+          + `request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`);
         } else {
           this.statusCode(statusCode);
           this.statusCode(deviceStatus.statusCode);
@@ -766,15 +690,16 @@ export class BlindTilt {
       } catch (e: any) {
         this.apiError(e);
         this.errorLog(
-          `${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}` +
-          ` Connection, Error Message: ${JSON.stringify(e.message)}`,
+          `${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}`
+          + ` Connection, Error Message: ${JSON.stringify(e.message)}`,
         );
       }
     } else {
       this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} No OpenAPI Changes, CurrentPosition & TargetPosition Are the Same.` +
-        ` CurrentPosition: ${this.CurrentPosition}, TargetPosition  ${this.TargetPosition}` +
-        ` CurrentHorizontalTiltAngle: ${this.CurrentHorizontalTiltAngle}, TargetPosition  ${this.TargetHorizontalTiltAngle}`,
+        `${this.device.deviceType}: ${this.accessory.displayName} No OpenAPI Changes, CurrentPosition & TargetPosition Are the Same.`
+        + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}, TargetPosition  ${this.WindowCovering.TargetPosition}`
+        + ` CurrentHorizontalTiltAngle: ${this.WindowCovering.CurrentHorizontalTiltAngle},`
+        + ` TargetPosition  ${this.WindowCovering.TargetHorizontalTiltAngle}`,
       );
     }
   }
@@ -783,16 +708,16 @@ export class BlindTilt {
    * Handle requests to set the value of the "Target Horizontal Tilt" characteristic
    */
   async TargetHorizontalTiltAngleSet(value: CharacteristicValue): Promise<void> {
-    if (this.TargetHorizontalTiltAngle === this.accessory.context.TargetHorizontalTiltAngle) {
+    if (this.WindowCovering.TargetHorizontalTiltAngle === this.accessory.context.TargetHorizontalTiltAngle) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set TargetHorizontalTiltAngle: ${value}`);
     } else {
       this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set TargetHorizontalTiltAngle: ${value}`);
     }
 
     //value = value < 0 ? -90 : 90;
-    this.TargetHorizontalTiltAngle = value;
+    this.WindowCovering.TargetHorizontalTiltAngle = value;
     if (this.device.mqttURL) {
-      this.mqttPublish('TargetHorizontalTiltAngle', this.TargetHorizontalTiltAngle);
+      this.mqttPublish('TargetHorizontalTiltAngle', this.WindowCovering.TargetHorizontalTiltAngle.toString());
     }
 
     this.startUpdatingBlindTiltIfNeeded();
@@ -802,15 +727,15 @@ export class BlindTilt {
    * Handle requests to set the value of the "Target Position" characteristic
    */
   async TargetPositionSet(value: CharacteristicValue): Promise<void> {
-    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}`);
     }
 
-    this.TargetPosition = value;
+    this.WindowCovering.TargetPosition = value;
     if (this.device.mqttURL) {
-      this.mqttPublish('TargetPosition', this.TargetPosition);
+      this.mqttPublish('TargetPosition', this.WindowCovering.TargetPosition.toString());
     }
     this.startUpdatingBlindTiltIfNeeded();
   }
@@ -818,39 +743,43 @@ export class BlindTilt {
   async startUpdatingBlindTiltIfNeeded(): Promise<void> {
     await this.setMinMax();
     this.debugLog('setMinMax');
-    if (this.TargetPosition > this.CurrentPosition || this.TargetHorizontalTiltAngle !== this.CurrentHorizontalTiltAngle) {
-      this.PositionState = this.hap.Characteristic.PositionState.INCREASING;
+    if (this.WindowCovering.TargetPosition > this.WindowCovering.CurrentPosition
+      || this.WindowCovering.TargetHorizontalTiltAngle !== this.WindowCovering.CurrentHorizontalTiltAngle) {
+      this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.INCREASING;
       this.setNewTarget = true;
       this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} value: ${this.CurrentPosition},` + ` CurrentPosition: ${this.CurrentPosition}`,
+        `${this.device.deviceType}: ${this.accessory.displayName} value: ${this.WindowCovering.CurrentPosition},`
+        + ` CurrentPosition: ${this.WindowCovering.CurrentPosition}`,
       );
-    } else if (this.TargetPosition < this.CurrentPosition) {
-      this.PositionState = this.hap.Characteristic.PositionState.DECREASING;
+    } else if (this.WindowCovering.TargetPosition < this.WindowCovering.CurrentPosition) {
+      this.WindowCovering.PositionState = this.hap.Characteristic.PositionState.DECREASING;
       this.setNewTarget = true;
       this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} value: ${this.CurrentPosition},` + ` CurrentPosition: ${this.CurrentPosition}`,
+        `${this.device.deviceType}: ${this.accessory.displayName} value: ${this.WindowCovering.CurrentPosition},`
+        + ` 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: ${this.CurrentPosition},` + ` CurrentPosition: ${this.CurrentPosition}`,
+        `${this.device.deviceType}: ${this.accessory.displayName} value: ${this.WindowCovering.CurrentPosition},`
+        + ` 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 Blind Tilt movement time is short, the moving flag from backend is always false.
      * The minimum time depends on the network control latency.
      */
     clearTimeout(this.setNewTargetTimer);
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateRate: ${this.updateRate}`);
+    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.doBlindTiltUpdate.next();
   }
@@ -859,152 +788,108 @@ export class BlindTilt {
     await this.setMinMax();
     // CurrentHorizontalTiltAngle
     if (this.mappingMode === BlindTiltMappingMode.UseTiltForDirection) {
-      if (this.CurrentHorizontalTiltAngle === undefined || Number.isNaN(this.CurrentHorizontalTiltAngle)) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentHorizontalTiltAngle: ${this.CurrentHorizontalTiltAngle}`);
+      if (this.WindowCovering.CurrentHorizontalTiltAngle === undefined || Number.isNaN(this.WindowCovering.CurrentHorizontalTiltAngle)) {
+        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
+          + ` CurrentHorizontalTiltAngle: ${this.WindowCovering.CurrentHorizontalTiltAngle}`);
       } else {
         if (this.device.mqttURL) {
-          this.mqttPublish('CurrentHorizontalTiltAngle', this.CurrentHorizontalTiltAngle);
+          this.mqttPublish('CurrentHorizontalTiltAngle', this.WindowCovering.CurrentHorizontalTiltAngle.toString());
         }
-        this.accessory.context.CurrentHorizontalTiltAngle = this.CurrentHorizontalTiltAngle;
-        this.windowCoveringService.updateCharacteristic(
+        this.accessory.context.CurrentHorizontalTiltAngle = this.WindowCovering.CurrentHorizontalTiltAngle;
+        this.WindowCovering.Service.updateCharacteristic(
           this.hap.Characteristic.CurrentHorizontalTiltAngle,
-          Number(this.CurrentHorizontalTiltAngle),
+          Number(this.WindowCovering.CurrentHorizontalTiltAngle),
         );
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} 
-        updateCharacteristic CurrentHorizontalTiltAngle: ${this.CurrentHorizontalTiltAngle}`);
+        updateCharacteristic CurrentHorizontalTiltAngle: ${this.WindowCovering.CurrentHorizontalTiltAngle}`);
       }
     }
     // CurrentPosition
-    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 {
       if (this.device.mqttURL) {
-        this.mqttPublish('CurrentPosition', this.CurrentPosition);
+        this.mqttPublish('CurrentPosition', this.WindowCovering.CurrentPosition.toString());
       }
-      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}`);
+      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}`);
     }
     // PositionState
-    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}`);
     }
     // TargetPosition
-    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}`);
     }
     // CurrentAmbientLightLevel
     if (!this.device.blindTilt?.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}`,
         );
       }
     }
     // BatteryLevel
-    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}`);
     }
     // StatusLowBattery
-    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/blindtilt/xx:xx:xx:xx:xx:xx'
-   */
-  mqttPublish(topic: string, message: any) {
-    const mac = this.device.deviceId
-      ?.toLowerCase()
-      .match(/[\s\S]{1,2}/g)
-      ?.join(':');
-    const options = this.device.mqttPubOptions || {};
-    this.mqttClient?.publish(`homebridge-switchbot/blindtilt/${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: device & devicesConfig): Promise<void> {
-    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: Error) => {
-          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: any) {
-    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: any) {
-    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: any) => {
-          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}`);
     }
   }
 
@@ -1024,218 +909,104 @@ export class BlindTilt {
     }
   }
 
-  async SilentPerformance() {
-    if (Number(this.TargetPosition) > 50) {
+  async setPerformance() {
+    let setPositionMode: number;
+    let Mode: string;
+    if (Number(this.WindowCovering.TargetPosition) > 50) {
       if (this.device.blindTilt?.setOpenMode === '1') {
-        this.setPositionMode = 1;
-        this.Mode = 'Silent Mode';
+        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.blindTilt?.setCloseMode === '1') {
-        this.setPositionMode = 1;
-        this.Mode = 'Silent Mode';
+        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(): Promise<void> {
     if (this.device.blindTilt?.set_min) {
-      if (Number(this.CurrentPosition) <= this.device.blindTilt?.set_min) {
-        this.CurrentPosition = 0;
+      if (Number(this.WindowCovering.CurrentPosition) <= this.device.blindTilt?.set_min) {
+        this.WindowCovering.CurrentPosition = 0;
       }
     }
     if (this.device.blindTilt?.set_max) {
-      if (Number(this.CurrentPosition) >= this.device.blindTilt?.set_max) {
-        this.CurrentPosition = 100;
+      if (Number(this.WindowCovering.CurrentPosition) >= this.device.blindTilt?.set_max) {
+        this.WindowCovering.CurrentPosition = 100;
       }
     }
 
     if (this.mappingMode === BlindTiltMappingMode.UseTiltForDirection) {
-      this.CurrentHorizontalTiltAngle = Number(this.CurrentHorizontalTiltAngle) < 0 ? -90 : 90;
+      this.WindowCovering.CurrentHorizontalTiltAngle = Number(this.WindowCovering.CurrentHorizontalTiltAngle) < 0 ? -90 : 90;
     }
   }
 
-  minStep(device: device & devicesConfig): number {
+  async minStep(device: device & devicesConfig): Promise<number> {
+    let set_minStep: number;
     if (device.blindTilt?.set_minStep) {
-      this.set_minStep = device.blindTilt?.set_minStep;
+      set_minStep = device.blindTilt?.set_minStep;
     } else {
-      this.set_minStep = 1;
+      set_minStep = 1;
     }
-    return this.set_minStep;
+    return set_minStep;
   }
 
-  minLux(): number {
+  async minLux(): Promise<number> {
+    let set_minLux: number;
     if (this.device.blindTilt?.set_minLux) {
-      this.set_minLux = this.device.blindTilt?.set_minLux;
+      set_minLux = this.device.blindTilt?.set_minLux;
     } else {
-      this.set_minLux = 1;
+      set_minLux = 1;
     }
-    return this.set_minLux;
+    return set_minLux;
   }
 
-  maxLux(): number {
+  async maxLux(): Promise<number> {
+    let set_maxLux: number;
     if (this.device.blindTilt?.set_maxLux) {
-      this.set_maxLux = this.device.blindTilt?.set_maxLux;
-    } else {
-      this.set_maxLux = 6001;
-    }
-    return this.set_maxLux;
-  }
-
-  async scan(device: device & devicesConfig): Promise<void> {
-    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}`);
-      }
+      set_maxLux = this.device.blindTilt?.set_maxLux;
     } 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: number): Promise<void> {
-    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(): Promise<void> {
     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.PositionState, this.hap.Characteristic.PositionState.STOPPED);
+      this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.TargetPosition, 100);
+      this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.CurrentHorizontalTiltAngle, 90);
+      this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.TargetHorizontalTiltAngle, 90);
     }
   }
 
   async apiError(e: any): Promise<void> {
-    this.windowCoveringService.updateCharacteristic(this.hap.Characteristic.CurrentPosition, e);
-    this.windowCoveringService.updateCharacteristic(this.hap.Characteristic.PositionState, e);
-    this.windowCoveringService.updateCharacteristic(this.hap.Characteristic.TargetPosition, e);
+    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.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.CurrentHorizontalTiltAngle, e);
+    this.WindowCovering.Service.updateCharacteristic(this.hap.Characteristic.TargetHorizontalTiltAngle, 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) {
-      this.lightSensorService?.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, e);
-    }
-    if (this.BLE) {
-      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.CurrentPosition === undefined) {
-      this.CurrentPosition = 0;
-    } else {
-      this.CurrentPosition = this.accessory.context.CurrentPosition;
-    }
-
-    if (this.TargetPosition === undefined) {
-      this.TargetPosition = 0;
-    } else {
-      this.TargetPosition = this.accessory.context.TargetPosition;
-    }
-
-    if (this.PositionState === undefined) {
-      this.PositionState = this.hap.Characteristic.PositionState.STOPPED;
-    } else {
-      this.PositionState = this.accessory.context.PositionState;
-    }
-    if (this.FirmwareRevision === undefined) {
-      this.FirmwareRevision = this.platform.version;
-      this.accessory.context.FirmwareRevision = this.FirmwareRevision;
+      this.LightSensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentAmbientLightLevel, e);
+      this.LightSensor!.Service.updateCharacteristic(this.hap.Characteristic.StatusActive, e);
     }
   }
 
@@ -1358,130 +1129,4 @@ export class BlindTilt {
         }
     }
   }
-
-  async refreshRate(device: device & devicesConfig): Promise<void> {
-    // 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?.blindTilt?.updateRate) {
-      this.updateRate = device?.blindTilt?.updateRate;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Blind Tilt updateRate: ${this.updateRate}`);
-    } else {
-      this.updateRate = 2;
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default Blind Tilt updateRate: ${this.updateRate}`);
-    }
-  }
-
-  async deviceConfig(device: device & devicesConfig): Promise<void> {
-    let config = {};
-    if (device.blindTilt) {
-      config = device.blindTilt;
-    }
-    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 (device.blindTilt?.mode === undefined) {
-      config['mode'] = BlindTiltMappingMode.OnlyUp;
-    } else {
-      config['mode'] = device.blindTilt?.mode;
-    }
-
-    if (Object.entries(config).length !== 0) {
-      this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
-    }
-  }
-
-  async deviceLogs(device: device & devicesConfig): Promise<void> {
-    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: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      this.platform.log.info(String(...log));
-    }
-  }
-
-  warnLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      this.platform.log.warn(String(...log));
-    }
-  }
-
-  debugWarnLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      if (this.deviceLogging?.includes('debug')) {
-        this.platform.log.warn('[DEBUG]', String(...log));
-      }
-    }
-  }
-
-  errorLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      this.platform.log.error(String(...log));
-    }
-  }
-
-  debugErrorLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      if (this.deviceLogging?.includes('debug')) {
-        this.platform.log.error('[DEBUG]', String(...log));
-      }
-    }
-  }
-
-  debugLog(...log: any[]): void {
-    if (this.enablingDeviceLogging()) {
-      if (this.deviceLogging === 'debug') {
-        this.platform.log.info('[DEBUG]', String(...log));
-      } else {
-        this.platform.log.debug(String(...log));
-      }
-    }
-  }
-
-  enablingDeviceLogging(): boolean {
-    return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
-  }
 }