@switchbot/homebridge-switchbot 2.8.0-beta.9 → 2.8.1-beta.0

package/src/device/colorbulb.ts

@@ -5,7 +5,7 @@ import { sleep } from '../utils';
 import { interval, Subject } from 'rxjs';
 import { SwitchBotPlatform } from '../platform';
 import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
-import { device, devicesConfig, deviceStatus, switchbot, hs2rgb, rgb2hs, m2hs, serviceData, ad, Devices } from '../settings';
+import { device, devicesConfig, deviceStatus, hs2rgb, rgb2hs, m2hs, serviceData, ad, Devices } from '../settings';
 import { Service, PlatformAccessory, CharacteristicValue, ControllerConstructor, Controller, ControllerServiceMap } from 'homebridge';
 
 /**
@@ -24,31 +24,26 @@ export class ColorBulb {
   Brightness!: CharacteristicValue;
   ColorTemperature?: CharacteristicValue;
 
-  // OpenAPI Others
-  power: deviceStatus['power'];
-  color: deviceStatus['color'];
-  brightness: deviceStatus['brightness'];
-  colorTemperature?: deviceStatus['colorTemperature'];
-  deviceStatus!: any;
+  // OpenAPI Status
+  OpenAPI_On: deviceStatus['power'];
+  OpenAPI_RGB: deviceStatus['color'];
+  OpenAPI_Brightness: deviceStatus['brightness'];
+  OpenAPI_FirmwareRevision: deviceStatus['version'];
+  OpenAPI_ColorTemperature?: deviceStatus['colorTemperature'];
+
+  // BLE Status
+  BLE_Red: serviceData['red'];
+  BLE_On: serviceData['state'];
+  BLE_Blue: serviceData['blue'];
+  BLE_Power: serviceData['power'];
+  BLE_Green: serviceData['green'];
+  BLE_Delay: serviceData['delay'];
+  BLE_WifiRssi: serviceData['wifiRssi'];
+  BLE_Brightness: serviceData['brightness'];
+  BLE_ColorTemperature: serviceData['color_temperature'];
 
   // BLE Others
-  connected?: boolean;
-  switchbot!: switchbot;
-  address!: ad['address'];
-  serviceData!: serviceData;
-  powerState: serviceData['power'];
-  state: serviceData['state'];
-  red: serviceData['red'];
-  green: serviceData['green'];
-  blue: serviceData['blue'];
-  delay: serviceData['delay'];
-  wifiRssi: serviceData['wifiRssi'];
-  brightnessBLE: serviceData['brightness'];
-  color_temperature: serviceData['color_temperature'];
-  preset: any; //serviceData['preset'];
-  color_mode: any; //serviceData['color_mode'];
-  speed: any; //serviceData['speed'];
-  loop_index: any; //serviceData['loop_index'];
+  BLE_IsConnected?: boolean;
 
   // Config
   set_minStep?: number;
@@ -249,7 +244,7 @@ export class ColorBulb {
   async BLEparseStatus(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
     // State
-    switch (this.state) {
+    switch (this.BLE_On) {
       case true:
         this.On = true;
         break;
@@ -259,18 +254,18 @@ export class ColorBulb {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
 
     // Brightness
-    this.Brightness = Number(this.brightnessBLE);
+    this.Brightness = Number(this.BLE_Brightness);
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
 
     // Color, Hue & Brightness
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${this.red}`);
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${this.green}`);
-    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${this.blue}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${this.BLE_Red}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${this.BLE_Green}`);
+    this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${this.BLE_Blue}`);
 
-    const [hue, saturation] = rgb2hs(Number(this.red), Number(this.green), Number(this.blue));
+    const [hue, saturation] = rgb2hs(Number(this.BLE_Red), Number(this.BLE_Green), Number(this.BLE_Blue));
     this.debugLog(
       `${this.device.deviceType}: ${this.accessory.displayName}` +
-      ` hs: ${JSON.stringify(rgb2hs(Number(this.red), Number(this.green), Number(this.blue)))}`,
+      ` hs: ${JSON.stringify(rgb2hs(Number(this.BLE_Red), Number(this.BLE_Green), Number(this.BLE_Blue)))}`,
     );
 
     // Hue
@@ -282,9 +277,9 @@ export class ColorBulb {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
 
     // ColorTemperature
-    if (this.color_temperature) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE ColorTemperature: ${this.color_temperature}`);
-      this.ColorTemperature = this.color_temperature!;
+    if (this.BLE_ColorTemperature) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLE ColorTemperature: ${this.BLE_ColorTemperature}`);
+      this.ColorTemperature = this.BLE_ColorTemperature!;
 
       this.ColorTemperature = Math.max(Math.min(this.ColorTemperature, 500), 140);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
@@ -293,7 +288,7 @@ export class ColorBulb {
 
   async openAPIparseStatus() {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
-    switch (this.power) {
+    switch (this.OpenAPI_On) {
       case 'on':
         this.On = true;
         break;
@@ -303,13 +298,13 @@ export class ColorBulb {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
 
     // Brightness
-    this.Brightness = Number(this.brightness);
+    this.Brightness = Number(this.OpenAPI_Brightness);
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
 
     // Color, Hue & Brightness
-    if (this.color) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} color: ${JSON.stringify(this.color)}`);
-      const [red, green, blue] = this.color!.split(':');
+    if (this.OpenAPI_RGB) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} color: ${JSON.stringify(this.OpenAPI_RGB)}`);
+      const [red, green, blue] = this.OpenAPI_RGB!.split(':');
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${JSON.stringify(red)}`);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${JSON.stringify(green)}`);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${JSON.stringify(blue)}`);
@@ -329,9 +324,9 @@ export class ColorBulb {
     }
 
     // ColorTemperature
-    if (!Number.isNaN(this.colorTemperature)) {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI ColorTemperature: ${this.colorTemperature}`);
-      const mired = Math.round(1000000 / this.colorTemperature!);
+    if (!Number.isNaN(this.OpenAPI_ColorTemperature)) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI ColorTemperature: ${this.OpenAPI_ColorTemperature}`);
+      const mired = Math.round(1000000 / this.OpenAPI_ColorTemperature!);
 
       this.ColorTemperature = Number(mired);
 
@@ -378,26 +373,20 @@ export class ColorBulb {
         })
         .then(async () => {
           // Set an event hander
-          switchbot.onadvertisement = async (ad: any) => {
-            this.address = ad.address;
+          switchbot.onadvertisement = async (ad: ad) => {
             this.debugLog(
               `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
-              ` BLE Address Found: ${this.address}`,
+              ` BLE Address Found: ${ad.address}`,
             );
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
-            this.serviceData = ad.serviceData;
-            this.powerState = ad.serviceData.power;
-            this.state = ad.serviceData.state;
-            this.red = ad.serviceData.red;
-            this.green = ad.serviceData.green;
-            this.blue = ad.serviceData.blue;
-            this.color_temperature = ad.serviceData.color_temperature;
-            this.brightnessBLE = ad.serviceData.brightness;
-            this.delay = ad.serviceData.delay;
-            this.preset = ad.serviceData.preset;
-            this.color_mode = ad.serviceData.color_mode;
-            this.speed = ad.serviceData.speed;
-            this.loop_index = ad.serviceData.loop_index;
+            this.BLE_Power = ad.serviceData.power;
+            this.BLE_On = ad.serviceData.state;
+            this.BLE_Red = ad.serviceData.red;
+            this.BLE_Green = ad.serviceData.green;
+            this.BLE_Blue = ad.serviceData.blue;
+            this.BLE_ColorTemperature = ad.serviceData.color_temperature;
+            this.BLE_Brightness = ad.serviceData.brightness;
+            this.BLE_Delay = ad.serviceData.delay;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
             /*this.debugLog(
               `${this.device.deviceType}: ${this.accessory.displayName} state: ${ad.serviceData.state}, ` +
@@ -405,13 +394,13 @@ export class ColorBulb {
                 `wifiRssi: ${ad.serviceData.wifiRssi}, overload: ${ad.serviceData.overload}, currentPower: ${ad.serviceData.currentPower}`,
             );*/
 
-            if (this.serviceData) {
-              this.connected = true;
-              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
+            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.connected = false;
-              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
+              this.BLE_IsConnected = false;
+              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
             }
           };
           // Wait
@@ -440,15 +429,16 @@ export class ColorBulb {
       const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/status`, {
         headers: this.platform.generateHeaders(),
       });
-      const deviceStatus = await body.json();
+      const deviceStatus: any = await body.json();
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Devices: ${JSON.stringify(deviceStatus.body)}`);
       this.statusCode(statusCode);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Headers: ${JSON.stringify(headers)}`);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(deviceStatus)}`);
-      this.power = deviceStatus.body.power;
-      this.color = deviceStatus.body.color;
-      this.brightness = deviceStatus.body.brightness;
-      this.colorTemperature = deviceStatus.body.colorTemperature;
+      this.OpenAPI_On = deviceStatus.body.power;
+      this.OpenAPI_RGB = deviceStatus.body.color;
+      this.OpenAPI_Brightness = deviceStatus.body.brightness;
+      this.OpenAPI_ColorTemperature = deviceStatus.body.colorTemperature;
+      this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
       this.openAPIparseStatus();
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
@@ -698,7 +688,7 @@ export class ColorBulb {
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        const deviceStatus = await body.json();
+        const deviceStatus: any = await body.json();
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Devices: ${JSON.stringify(deviceStatus.body)}`);
         this.statusCode(statusCode);
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Headers: ${JSON.stringify(headers)}`);
@@ -749,7 +739,7 @@ export class ColorBulb {
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        const deviceStatus = await body.json();
+        const deviceStatus: any = await body.json();
         this.debugLog(`Devices: ${JSON.stringify(deviceStatus.body)}`);
         this.statusCode(statusCode);
         this.debugLog(`Headers: ${JSON.stringify(headers)}`);
@@ -785,7 +775,7 @@ export class ColorBulb {
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        const deviceStatus = await body.json();
+        const deviceStatus: any = await body.json();
         this.debugLog(`Devices: ${JSON.stringify(deviceStatus.body)}`);
         this.statusCode(statusCode);
         this.debugLog(`Headers: ${JSON.stringify(headers)}`);
@@ -819,7 +809,7 @@ export class ColorBulb {
           method: 'POST',
           headers: this.platform.generateHeaders(),
         });
-        const deviceStatus = await body.json();
+        const deviceStatus: any = await body.json();
         this.debugLog(`Devices: ${JSON.stringify(deviceStatus.body)}`);
         this.statusCode(statusCode);
         this.debugLog(`Headers: ${JSON.stringify(headers)}`);
@@ -972,6 +962,16 @@ export class ColorBulb {
       this.lightBulbService.updateCharacteristic(this.platform.Characteristic.Saturation, this.Saturation);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Saturation: ${this.Saturation}`);
     }
+    // FirmwareRevision
+    if (this.OpenAPI_FirmwareRevision === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} FirmwareRevision: ${this.OpenAPI_FirmwareRevision}`);
+    } else {
+      this.accessory.context.OpenAPI_FirmwareRevision = this.OpenAPI_FirmwareRevision;
+      this.accessory.getService(this.platform.Service.AccessoryInformation)!
+        .updateCharacteristic(this.platform.Characteristic.FirmwareRevision, this.OpenAPI_FirmwareRevision);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+        + `updateCharacteristic CurrentTemperature: ${this.OpenAPI_FirmwareRevision}`);
+    }
   }
 
   async adaptiveLighting(device: device & devicesConfig): Promise<void> {
@@ -986,7 +986,7 @@ export class ColorBulb {
 
   async stopScanning(switchbot: any) {
     await switchbot.stopScan();
-    if (this.connected) {
+    if (this.BLE_IsConnected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();
     } else {
@@ -1135,10 +1135,12 @@ export class ColorBulb {
     );
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
-    if (accessory.context.FirmwareRevision) {
-      FirmwareRevision = accessory.context.FirmwareRevision;
-    } else if (device.firmware) {
+    if (device.firmware) {
       FirmwareRevision = device.firmware;
+    } else if (device.version) {
+      FirmwareRevision = JSON.stringify(device.version);
+    } if (accessory.context.FirmwareRevision) {
+      FirmwareRevision = accessory.context.FirmwareRevision;
     } else {
       FirmwareRevision = this.platform.version;
     }

package/src/device/contact.ts

@@ -5,7 +5,7 @@ import { interval, Subject } from 'rxjs';
 import { skipWhile } from 'rxjs/operators';
 import { SwitchBotPlatform } from '../platform';
 import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
-import { device, devicesConfig, serviceData, switchbot, deviceStatus, ad, Devices } from '../settings';
+import { device, devicesConfig, serviceData, deviceStatus, ad, Devices } from '../settings';
 
 /**
  * Platform Accessory
@@ -14,38 +14,34 @@ import { device, devicesConfig, serviceData, switchbot, deviceStatus, ad, Device
  */
 export class Contact {
   // Services
-  contactSensorservice: Service;
   motionService?: Service;
+  batteryService: Service;
   lightSensorService?: Service;
-  batteryService?: Service;
+  contactSensorservice: Service;
 
   // Characteristic Values
-  ContactSensorState!: CharacteristicValue;
-  MotionDetected!: CharacteristicValue;
-  CurrentAmbientLightLevel!: CharacteristicValue;
   BatteryLevel!: CharacteristicValue;
+  MotionDetected!: CharacteristicValue;
   StatusLowBattery!: CharacteristicValue;
+  ContactSensorState!: CharacteristicValue;
+  CurrentAmbientLightLevel!: CharacteristicValue;
+
+  // OpenAPI Status
+  OpenAPI_BatteryLevel: deviceStatus['battery'];
+  OpenAPI_FirmwareRevision: deviceStatus['version'];
+  OpenAPI_MotionDetected: deviceStatus['moveDetected'];
+  OpenAPI_ContactSensorState: deviceStatus['openState'];
+  OpenAPI_CurrentAmbientLightLevel: deviceStatus['brightness'];
 
-  // OpenAPI others
-  openState: deviceStatus['openState'];
-  moveDetected: deviceStatus['moveDetected'];
-  brightness: deviceStatus['brightness'];
-  deviceStatus!: any; //deviceStatusResponse;
+  // BLE Status
+  BLE_BateryLevel!: serviceData['battery'];
+  BLE_MotionDetected!: serviceData['movement'];
+  BLE_ContactSensorState!: serviceData['doorState'];
+  BLE_CurrentAmbientLightLevel: serviceData['lightLevel'];
 
   // BLE Others
-  tested!: any;
-  contact_open!: any;
-  button_count!: any;
   scanning!: boolean;
-  connected?: boolean;
-  contact_timeout!: any;
-  switchbot!: switchbot;
-  serviceData!: serviceData;
-  address!: ad['address'];
-  battery!: serviceData['battery'];
-  movement!: serviceData['movement'];
-  doorState!: serviceData['doorState'];
-  is_light!: any; //serviceData['lightLevel'];
+  BLE_IsConnected?: boolean;
 
   // Config
   set_minLux!: number;
@@ -145,20 +141,14 @@ export class Contact {
     }
 
     // Battery Service
-    if (!this.BLE) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Battery Service`);
-      this.batteryService = this.accessory.getService(this.platform.Service.Battery);
-      accessory.removeService(this.batteryService!);
-    } else if (this.BLE && !this.batteryService) {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Battery Service`);
-      (this.batteryService = this.accessory.getService(this.platform.Service.Battery) || this.accessory.addService(this.platform.Service.Battery)),
-      `${accessory.displayName} Battery`;
-
-      this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
-      this.batteryService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Battery`);
-    } else {
-      this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Battery Service Not Added`);
+    (this.batteryService = this.accessory.getService(this.platform.Service.Battery) || accessory.addService(this.platform.Service.Battery)),
+    `${accessory.displayName} Battery`;
+
+    this.batteryService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Battery`);
+    if (!this.batteryService.testCharacteristic(this.platform.Characteristic.ConfiguredName)) {
+      this.batteryService.addCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Battery`);
     }
+    this.batteryService.setCharacteristic(this.platform.Characteristic.ChargingState, this.platform.Characteristic.ChargingState.NOT_CHARGEABLE);
 
     // Retrieve initial values and updateHomekit
     this.updateHomeKitCharacteristics();
@@ -192,7 +182,7 @@ export class Contact {
   async BLEparseStatus(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
     // Door State
-    switch (this.doorState) {
+    switch (this.BLE_ContactSensorState) {
       case 'open':
       case 1:
         this.ContactSensorState = this.platform.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
@@ -202,7 +192,7 @@ export class Contact {
         this.ContactSensorState = this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED;
         break;
       default:
-        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} timeout no closed, doorstate: ${this.doorState}`);
+        this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} timeout no closed, doorstate: ${this.BLE_ContactSensorState}`);
     }
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensorState}`);
     if (
@@ -213,7 +203,7 @@ export class Contact {
     }
     // Movement
     if (!this.device.contact?.hide_motionsensor) {
-      this.MotionDetected = Boolean(this.movement);
+      this.MotionDetected = Boolean(this.BLE_MotionDetected);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
       if (this.MotionDetected !== this.accessory.context.MotionDetected && this.MotionDetected) {
         this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Detected Motion`);
@@ -223,7 +213,7 @@ export class Contact {
     if (!this.device.contact?.hide_lightsensor) {
       this.set_minLux = this.minLux();
       this.set_maxLux = this.maxLux();
-      switch (this.is_light) {
+      switch (this.BLE_CurrentAmbientLightLevel) {
         case true:
           this.CurrentAmbientLightLevel = this.set_minLux;
           break;
@@ -231,7 +221,7 @@ export class Contact {
           this.CurrentAmbientLightLevel = this.set_maxLux;
       }
       this.debugLog(
-        `${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.is_light},` +
+        `${this.device.deviceType}: ${this.accessory.displayName} LightLevel: ${this.BLE_CurrentAmbientLightLevel},` +
         ` CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`,
       );
       if (this.CurrentAmbientLightLevel !== this.accessory.context.CurrentAmbientLightLevel) {
@@ -239,10 +229,10 @@ export class Contact {
       }
     }
     // Battery
-    if (this.battery === undefined) {
-      this.battery === 100;
+    if (this.BLE_BateryLevel === undefined) {
+      this.BLE_BateryLevel === 100;
     }
-    this.BatteryLevel = Number(this.battery);
+    this.BatteryLevel = Number(this.BLE_BateryLevel);
     if (this.BatteryLevel < 10) {
       this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
     } else {
@@ -256,25 +246,25 @@ export class Contact {
   async openAPIparseStatus(): Promise<void> {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
     // Contact State
-    if (this.openState === 'open') {
+    if (this.OpenAPI_ContactSensorState === 'open') {
       this.ContactSensorState = this.platform.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensorState}`);
-    } else if (this.openState === 'close') {
+    } else if (this.OpenAPI_ContactSensorState === 'close') {
       this.ContactSensorState = this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED;
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensorState}`);
     } else {
-      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openState: ${this.openState}`);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openState: ${this.OpenAPI_ContactSensorState}`);
     }
     // Motion State
     if (!this.device.contact?.hide_motionsensor) {
-      this.MotionDetected = this.moveDetected!;
+      this.MotionDetected = this.OpenAPI_MotionDetected!;
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
     }
     // Light Level
     if (!this.device.contact?.hide_lightsensor) {
       this.set_minLux = this.minLux();
       this.set_maxLux = this.maxLux();
-      switch (this.brightness) {
+      switch (this.OpenAPI_CurrentAmbientLightLevel) {
         case 'dim':
           this.CurrentAmbientLightLevel = this.set_minLux;
           break;
@@ -284,6 +274,19 @@ export class Contact {
       }
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentAmbientLightLevel: ${this.CurrentAmbientLightLevel}`);
     }
+    // Battery
+    if (this.OpenAPI_BatteryLevel === undefined) {
+      this.OpenAPI_BatteryLevel === 100;
+    }
+    this.BatteryLevel = Number(this.OpenAPI_BatteryLevel);
+    if (this.BatteryLevel < 10) {
+      this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
+    } else {
+      this.StatusLowBattery = this.platform.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
+    }
+    this.debugLog(
+      `${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, ` + `StatusLowBattery: ${this.StatusLowBattery}`,
+    );
   }
 
   /**
@@ -327,35 +330,28 @@ export class Contact {
         .then(async () => {
           // Set an event hander
           this.scanning = true;
-          switchbot.onadvertisement = async (ad: any) => {
-            this.address = ad.address;
+          switchbot.onadvertisement = async (ad: ad) => {
             this.debugLog(
               `${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
-              ` BLE Address Found: ${this.address}`,
+              ` BLE Address Found: ${ad.address}`,
             );
-            this.serviceData = ad.serviceData;
-            this.movement = ad.serviceData.movement;
-            this.tested = ad.serviceData.tested;
-            this.battery = ad.serviceData.battery;
-            this.contact_open = ad.serviceData.contact_open;
-            this.contact_timeout = ad.serviceData.contact_timeout;
-            this.is_light = ad.serviceData.is_light;
-            this.button_count = ad.serviceData.button_count;
-            this.doorState = ad.serviceData.doorState;
+            this.BLE_MotionDetected = ad.serviceData.movement;
+            this.BLE_BateryLevel = ad.serviceData.battery;
+            this.BLE_ContactSensorState = ad.serviceData.doorState;
             this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
             this.debugLog(
               `${this.device.deviceType}: ${this.accessory.displayName} movement: ${ad.serviceData.movement}, doorState: ` +
-              `${ad.serviceData.doorState}, is_light: ${ad.serviceData.is_light}, battery: ${ad.serviceData.battery}`,
+              `${ad.serviceData.doorState}, battery: ${ad.serviceData.battery}`,
             );
 
-            if (this.serviceData) {
-              this.connected = true;
-              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
+            if (ad.serviceData) {
+              this.BLE_IsConnected = true;
+              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
               await this.stopScanning(switchbot);
               this.scanning = false;
             } else {
-              this.connected = false;
-              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.connected}`);
+              this.BLE_IsConnected = false;
+              this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
             }
           };
           // Wait
@@ -386,14 +382,16 @@ export class Contact {
       const { body, statusCode, headers } = await request(`${Devices}/${this.device.deviceId}/status`, {
         headers: this.platform.generateHeaders(),
       });
-      const deviceStatus = await body.json();
+      const deviceStatus: any = await body.json();
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Devices: ${JSON.stringify(deviceStatus.body)}`);
       this.statusCode(statusCode);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Headers: ${JSON.stringify(headers)}`);
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} refreshStatus: ${JSON.stringify(deviceStatus)}`);
-      this.openState = deviceStatus.body.openState;
-      this.moveDetected = deviceStatus.body.moveDetected;
-      this.brightness = deviceStatus.body.brightness;
+      this.OpenAPI_ContactSensorState = deviceStatus.body.openState;
+      this.OpenAPI_MotionDetected = deviceStatus.body.moveDetected;
+      this.OpenAPI_CurrentAmbientLightLevel = deviceStatus.body.brightness;
+      this.OpenAPI_BatteryLevel = deviceStatus.body.battery;
+      this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
       this.openAPIparseStatus();
       this.updateHomeKitCharacteristics();
     } catch (e: any) {
@@ -437,27 +435,35 @@ export class Contact {
         );
       }
     }
-    if (this.BLE) {
-      if (this.BatteryLevel === undefined) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
-      } else {
-        this.accessory.context.BatteryLevel = this.BatteryLevel;
-        this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
-      }
-      if (this.StatusLowBattery === undefined) {
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
-      } else {
-        this.accessory.context.StatusLowBattery = this.StatusLowBattery;
-        this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
-        this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
-      }
+    if (this.BatteryLevel === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
+    } else {
+      this.accessory.context.BatteryLevel = this.BatteryLevel;
+      this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
+    }
+    if (this.StatusLowBattery === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
+    } else {
+      this.accessory.context.StatusLowBattery = this.StatusLowBattery;
+      this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
+    }
+    // FirmwareRevision
+    if (this.OpenAPI_FirmwareRevision === undefined) {
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} FirmwareRevision: ${this.OpenAPI_FirmwareRevision}`);
+    } else {
+      this.accessory.context.OpenAPI_FirmwareRevision = this.OpenAPI_FirmwareRevision;
+      this.accessory.getService(this.platform.Service.AccessoryInformation)!
+        .updateCharacteristic(this.platform.Characteristic.FirmwareRevision, this.OpenAPI_FirmwareRevision);
+      this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} `
+        + `updateCharacteristic CurrentTemperature: ${this.OpenAPI_FirmwareRevision}`);
     }
   }
 
   async stopScanning(switchbot: any) {
     await switchbot.stopScan();
-    if (this.connected) {
+    if (this.BLE_IsConnected) {
       await this.BLEparseStatus();
       await this.updateHomeKitCharacteristics();
     } else {
@@ -580,10 +586,8 @@ export class Contact {
     if (!this.device.contact?.hide_lightsensor) {
       this.lightSensorService?.updateCharacteristic(this.platform.Characteristic.CurrentAmbientLightLevel, e);
     }
-    if (this.BLE) {
-      this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
-      this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
-    }
+    this.batteryService?.updateCharacteristic(this.platform.Characteristic.BatteryLevel, e);
+    this.batteryService?.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, e);
   }
 
   FirmwareRevision(accessory: PlatformAccessory<Context>, device: device & devicesConfig): CharacteristicValue {
@@ -593,10 +597,12 @@ export class Contact {
     );
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} device.firmware: ${device.firmware}`);
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} this.platform.version: ${this.platform.version}`);
-    if (accessory.context.FirmwareRevision) {
-      FirmwareRevision = accessory.context.FirmwareRevision;
-    } else if (device.firmware) {
+    if (device.firmware) {
       FirmwareRevision = device.firmware;
+    } else if (device.version) {
+      FirmwareRevision = JSON.stringify(device.version);
+    } else if (accessory.context.FirmwareRevision) {
+      FirmwareRevision = accessory.context.FirmwareRevision;
     } else {
       FirmwareRevision = this.platform.version;
     }