@switchbot/homebridge-switchbot 3.5.0-beta.35 → 3.5.0-beta.37

package/src/device/blindtilt.ts

@@ -263,7 +263,7 @@ export class BlindTilt extends deviceBase {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Stopped`);
     }
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentPosition: ${this.WindowCovering.CurrentPosition},`
-    + ` TargetPosition: ${this.WindowCovering.TargetPosition}, PositionState: ${this.WindowCovering.PositionState},`);
+      + ` TargetPosition: ${this.WindowCovering.TargetPosition}, PositionState: ${this.WindowCovering.PositionState},`);
 
     if (!this.device.blindTilt?.hide_lightsensor) {
       const set_minLux = await this.minLux();
@@ -436,12 +436,14 @@ export class BlindTilt extends deviceBase {
       + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
 
     // FirmwareRevision
-    this.accessory.context.FirmwareRevision = deviceStatus.body.version;
+    if (deviceStatus.body.version) {
+      this.accessory.context.FirmwareRevision = deviceStatus.body.version;
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
         .updateValue(this.accessory.context.FirmwareRevision);
+    }
   }
 
   async refreshStatus(): Promise<void> {

package/src/device/bot.ts

@@ -519,12 +519,14 @@ export class Bot extends deviceBase {
       + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
 
     // FirmwareRevision
-    this.accessory.context.FirmwareRevision = deviceStatus.body.version;
-    this.accessory
-      .getService(this.hap.Service.AccessoryInformation)!
-      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
-      .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-      .updateValue(this.accessory.context.FirmwareRevision);
+    if (deviceStatus.body.version) {
+      this.accessory.context.FirmwareRevision = deviceStatus.body.version;
+      this.accessory
+        .getService(this.hap.Service.AccessoryInformation)!
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
+        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+        .updateValue(this.accessory.context.FirmwareRevision);
+    }
   }
 
   /**
@@ -1065,36 +1067,36 @@ export class Bot extends deviceBase {
   async removeOutletService(accessory: PlatformAccessory): Promise<void> {
     // If outletService still present, then remove first
     if (this.Outlet?.Service) {
-    this.Outlet!.Service = this.accessory.getService(this.hap.Service.Outlet) as Service;
-    this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Outlet Service`);
-    accessory.removeService(this.Outlet!.Service);
+      this.Outlet!.Service = this.accessory.getService(this.hap.Service.Outlet) as Service;
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Outlet Service`);
+      accessory.removeService(this.Outlet!.Service);
     }
   }
 
   async removeGarageDoorService(accessory: PlatformAccessory): Promise<void> {
     // If garageDoorService still present, then remove first
     if (this.GarageDoor?.Service) {
-    this.GarageDoor!.Service = this.accessory.getService(this.hap.Service.GarageDoorOpener) as Service;
-    this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Garage Door Service`);
-    accessory.removeService(this.GarageDoor!.Service);
+      this.GarageDoor!.Service = this.accessory.getService(this.hap.Service.GarageDoorOpener) as Service;
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Garage Door Service`);
+      accessory.removeService(this.GarageDoor!.Service);
     }
   }
 
   async removeDoorService(accessory: PlatformAccessory): Promise<void> {
     // If doorService still present, then remove first
     if (this.Door?.Service) {
-    this.Door!.Service = this.accessory.getService(this.hap.Service.Door) as Service;
-    this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Door Service`);
-    accessory.removeService(this.Door!.Service);
+      this.Door!.Service = this.accessory.getService(this.hap.Service.Door) as Service;
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Door Service`);
+      accessory.removeService(this.Door!.Service);
     }
   }
 
   async removeLockService(accessory: PlatformAccessory): Promise<void> {
     // If lockService still present, then remove first
     if (this.Lock?.Service) {
-    this.Lock!.Service = this.accessory.getService(this.hap.Service.LockMechanism) as Service;
-    this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Lock Service`);
-    accessory.removeService(this.Lock!.Service);
+      this.Lock!.Service = this.accessory.getService(this.hap.Service.LockMechanism) as Service;
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Lock Service`);
+      accessory.removeService(this.Lock!.Service);
     }
   }
 
@@ -1110,27 +1112,27 @@ export class Bot extends deviceBase {
   async removeFanService(accessory: PlatformAccessory): Promise<void> {
     // If fanService still present, then remove first
     if (this.Fan?.Service) {
-    this.Fan!.Service = this.accessory.getService(this.hap.Service.Fanv2) as Service;
-    this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Fan Service`);
-    accessory.removeService(this.Fan!.Service);
+      this.Fan!.Service = this.accessory.getService(this.hap.Service.Fanv2) as Service;
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Fan Service`);
+      accessory.removeService(this.Fan!.Service);
     }
   }
 
   async removeWindowService(accessory: PlatformAccessory): Promise<void> {
     // If windowService still present, then remove first
     if (this.Window?.Service) {
-    this.Window!.Service = this.accessory.getService(this.hap.Service.Window) as Service;
-    this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Window Service`);
-    accessory.removeService(this.Window!.Service);
+      this.Window!.Service = this.accessory.getService(this.hap.Service.Window) as Service;
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Window Service`);
+      accessory.removeService(this.Window!.Service);
     }
   }
 
   async removeWindowCoveringService(accessory: PlatformAccessory): Promise<void> {
     // If windowCoveringService still present, then remove first
     if (this.WindowCovering?.Service) {
-    this.WindowCovering!.Service = this.accessory.getService(this.hap.Service.WindowCovering) as Service;
-    this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Window Covering Service`);
-    accessory.removeService(this.WindowCovering!.Service);
+      this.WindowCovering!.Service = this.accessory.getService(this.hap.Service.WindowCovering) as Service;
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Window Covering Service`);
+      accessory.removeService(this.WindowCovering!.Service);
     }
   }
 
@@ -1146,9 +1148,9 @@ export class Bot extends deviceBase {
   async removeSwitchService(accessory: PlatformAccessory): Promise<void> {
     // If switchService still present, then remove first
     if (this.Switch?.Service) {
-    this.Switch!.Service = this.accessory.getService(this.hap.Service.Switch) as Service;
-    this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Switch Service`);
-    accessory.removeService(this.Switch!.Service);
+      this.Switch!.Service = this.accessory.getService(this.hap.Service.Switch) as Service;
+      this.warnLog(`${this.device.deviceType}: ${accessory.displayName} Removing Leftover Switch Service`);
+      accessory.removeService(this.Switch!.Service);
     }
   }
 

package/src/device/ceilinglight.ts

@@ -288,12 +288,14 @@ export class CeilingLight extends deviceBase {
     }
 
     // FirmwareRevision
-    this.accessory.context.FirmwareRevision = deviceStatus.body.version;
-    this.accessory
-      .getService(this.hap.Service.AccessoryInformation)!
-      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
-      .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-      .updateValue(this.accessory.context.FirmwareRevision);
+    if (deviceStatus.body.version) {
+      this.accessory.context.FirmwareRevision = deviceStatus.body.version;
+      this.accessory
+        .getService(this.hap.Service.AccessoryInformation)!
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
+        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+        .updateValue(this.accessory.context.FirmwareRevision);
+    }
   }
 
   /**

package/src/device/colorbulb.ts

@@ -349,12 +349,14 @@ export class ColorBulb extends deviceBase {
     }
 
     // FirmwareRevision
-    this.accessory.context.FirmwareRevision = deviceStatus.body.version;
-    this.accessory
-      .getService(this.hap.Service.AccessoryInformation)!
-      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
-      .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-      .updateValue(this.accessory.context.FirmwareRevision);
+    if (deviceStatus.body.version) {
+      this.accessory.context.FirmwareRevision = deviceStatus.body.version;
+      this.accessory
+        .getService(this.hap.Service.AccessoryInformation)!
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
+        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+        .updateValue(this.accessory.context.FirmwareRevision);
+    }
   }
 
   /**

package/src/device/contact.ts

@@ -279,12 +279,14 @@ export class Contact extends deviceBase {
       + `StatusLowBattery: ${this.Battery.StatusLowBattery}`);
 
     // FirmwareRevision
-    this.accessory.context.FirmwareRevision = deviceStatus.body.version;
-    this.accessory
-      .getService(this.hap.Service.AccessoryInformation)!
-      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
-      .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-      .updateValue(this.accessory.context.FirmwareRevision);
+    if (deviceStatus.body.version) {
+      this.accessory.context.FirmwareRevision = deviceStatus.body.version;
+      this.accessory
+        .getService(this.hap.Service.AccessoryInformation)!
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
+        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+        .updateValue(this.accessory.context.FirmwareRevision);
+    }
   }
 
   /**

package/src/device/curtain.ts

@@ -464,12 +464,14 @@ export class Curtain extends deviceBase {
       + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
 
     // FirmwareRevision
-    this.accessory.context.FirmwareRevision = deviceStatus.body.version;
-    this.accessory
-      .getService(this.hap.Service.AccessoryInformation)!
-      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
-      .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-      .updateValue(this.accessory.context.FirmwareRevision);
+    if (deviceStatus.body.version) {
+      this.accessory.context.FirmwareRevision = deviceStatus.body.version;
+      this.accessory
+        .getService(this.hap.Service.AccessoryInformation)!
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
+        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+        .updateValue(this.accessory.context.FirmwareRevision);
+    }
   }
 
   async refreshStatus(): Promise<void> {

package/src/device/device.ts

@@ -179,91 +179,108 @@ export abstract class deviceBase {
   }
 
   async getDeviceConfigSettings(device: device & devicesConfig): Promise<void> {
-    let config = {};
-    if (device.logging !== undefined) {
-      config['logging'] = device.logging;
+    const deviceConfig = {};
+    if (device.logging !== 'standard') {
+      deviceConfig['logging'] = device.logging;
     }
-    if (device.refreshRate !== undefined) {
-      config['refreshRate'] = device.refreshRate;
+    if (device.refreshRate !== 0) {
+      deviceConfig['refreshRate'] = device.refreshRate;
     }
-    if (device.updateRate !== undefined) {
-      config['updateRate'] = device.updateRate;
+    if (device.updateRate !== 0) {
+      deviceConfig['updateRate'] = device.updateRate;
     }
-    if (device.scanDuration !== undefined) {
-      config['scanDuration'] = device.scanDuration;
+    if (device.scanDuration !== 0) {
+      deviceConfig['scanDuration'] = device.scanDuration;
     }
-    if (device.offline !== undefined) {
-      config['offline'] = device.offline;
+    if (device.offline === true) {
+      deviceConfig['offline'] = device.offline;
     }
-    if (device.maxRetry !== 0 ) {
-      config['maxRetry'] = device.maxRetry;
+    if (device.maxRetry !== 0) {
+      deviceConfig['maxRetry'] = device.maxRetry;
     }
     if (device.webhook === true) {
-      config['webhook'] = device.webhook;
+      deviceConfig['webhook'] = device.webhook;
     }
-    if (device.connectionType) {
-      config['connectionType'] = device.connectionType;
+    if (device.connectionType !== '') {
+      deviceConfig['connectionType'] = device.connectionType;
     }
-    if (device.external !== undefined) {
-      config['external'] = device.external;
+    if (device.external === true) {
+      deviceConfig['external'] = device.external;
     }
-    if (device.mqttURL !== undefined) {
-      config['mqttURL'] = device.mqttURL;
+    if (device.mqttURL !== '') {
+      deviceConfig['mqttURL'] = device.mqttURL;
     }
-    if (device.maxRetries !== undefined) {
-      config['maxRetries'] = device.maxRetries;
+    if (device.maxRetries !== 0) {
+      deviceConfig['maxRetries'] = device.maxRetries;
     }
-    if (device.delayBetweenRetries !== undefined) {
-      config['delayBetweenRetries'] = device.delayBetweenRetries;
+    if (device.delayBetweenRetries !== 0) {
+      deviceConfig['delayBetweenRetries'] = device.delayBetweenRetries;
     }
+    let botConfig = {};
     if (device.bot) {
-      config = device.bot;
+      botConfig = device.bot;
     }
+    let lockConfig = {};
     if (device.lock) {
-      config = device.lock;
+      lockConfig = device.lock;
     }
+    let ceilinglightConfig = {};
     if (device.ceilinglight) {
-      config = device.ceilinglight;
+      ceilinglightConfig = device.ceilinglight;
     }
+    let colorbulbConfig = {};
     if (device.colorbulb) {
-      config = device.colorbulb;
+      colorbulbConfig = device.colorbulb;
     }
+    let contactConfig = {};
     if (device.contact) {
-      config = device.contact;
+      contactConfig = device.contact;
     }
+    let motionConfig = {};
     if (device.motion) {
-      config = device.motion;
+      motionConfig = device.motion;
     }
+    let curtainConfig = {};
     if (device.curtain) {
-      config = device.curtain;
+      curtainConfig = device.curtain;
     }
+    let hubConfig = {};
     if (device.hub) {
-      config = device.hub;
+      hubConfig = device.hub;
     }
+    let waterdetectorConfig = {};
     if (device.waterdetector) {
-      config = device.waterdetector;
+      waterdetectorConfig = device.waterdetector;
     }
+    let humidifierConfig = {};
     if (device.humidifier) {
-      config = device.humidifier;
+      humidifierConfig = device.humidifier;
     }
+    let meterConfig = {};
     if (device.meter) {
-      config = device.meter;
+      meterConfig = device.meter;
     }
+    let iosensorConfig = {};
+    if (device.iosensor) {
+      iosensorConfig = device.iosensor;
+    }
+    let striplightConfig = {};
     if (device.striplight) {
-      config = device.striplight;
+      striplightConfig = device.striplight;
     }
+    let plugConfig = {};
     if (device.plug) {
-      config = device.plug;
+      plugConfig = device.plug;
     }
+    let blindTiltConfig = {};
     if (device.blindTilt) {
       if (device.blindTilt?.mode === undefined) {
-        config['mode'] = BlindTiltMappingMode.OnlyUp;
-      } else {
-        config['mode'] = device.blindTilt?.mode;
-
-        config = device.blindTilt;
+        blindTiltConfig['mode'] = BlindTiltMappingMode.OnlyUp;
       }
+      blindTiltConfig = device.blindTilt;
     }
+    const config = Object.assign({}, deviceConfig, botConfig, curtainConfig, waterdetectorConfig, striplightConfig, plugConfig, iosensorConfig,
+      meterConfig, humidifierConfig, hubConfig, lockConfig, ceilinglightConfig, colorbulbConfig, contactConfig, motionConfig, blindTiltConfig);
     if (Object.entries(config).length !== 0) {
       this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
     }
@@ -542,8 +559,6 @@ export abstract class deviceBase {
   async statusCode(statusCode: number): Promise<void> {
     switch (this.device.deviceType) {
       case this.device.hubDeviceId:
-        statusCode = 161;
-        break;
       case '000000000000':
         statusCode = 161;
         break;
@@ -613,7 +628,7 @@ export abstract class deviceBase {
         break;
       default:
         this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode: `
-        + `${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
+          + `${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
     }
   }
 

package/src/device/fan.ts

@@ -119,12 +119,14 @@ export class Fan extends deviceBase {
           this.Battery.BatteryLevel = battery;
 
           // FirmwareRevision
-          this.accessory.context.FirmwareRevision = version;
+          if (version) {
+            this.accessory.context.FirmwareRevision = version;
           this.accessory
             .getService(this.hap.Service.AccessoryInformation)!
             .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
             .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
             .updateValue(this.accessory.context.FirmwareRevision);
+          }
           this.updateHomeKitCharacteristics();
         } catch (e: any) {
           this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
@@ -202,12 +204,14 @@ export class Fan extends deviceBase {
       + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
 
     // FirmwareRevision
-    this.accessory.context.FirmwareRevision = deviceStatus.body.version;
-    this.accessory
-      .getService(this.hap.Service.AccessoryInformation)!
-      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
-      .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-      .updateValue(this.accessory.context.FirmwareRevision);
+    if (deviceStatus.body.version) {
+      this.accessory.context.FirmwareRevision = deviceStatus.body.version;
+      this.accessory
+        .getService(this.hap.Service.AccessoryInformation)!
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
+        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+        .updateValue(this.accessory.context.FirmwareRevision);
+    }
   }
 
 
@@ -475,7 +479,7 @@ export class Fan extends deviceBase {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Active: ${this.Fan.Active}`);
     }
     // RotationSpeed
-    if(this.Fan.RotationSpeed === undefined) {
+    if (this.Fan.RotationSpeed === undefined) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} RotationSpeed: ${this.Fan.RotationSpeed}`);
     } else {
       this.accessory.context.RotationSpeed = this.Fan.RotationSpeed;
@@ -483,7 +487,7 @@ export class Fan extends deviceBase {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic RotationSpeed: ${this.Fan.RotationSpeed}`);
     }
     // SwingMode
-    if(this.Fan.SwingMode === undefined) {
+    if (this.Fan.SwingMode === undefined) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} SwingMode: ${this.Fan.SwingMode}`);
     } else {
       this.accessory.context.SwingMode = this.Fan.SwingMode;
@@ -491,7 +495,7 @@ export class Fan extends deviceBase {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic SwingMode: ${this.Fan.SwingMode}`);
     }
     // BateryLevel
-    if(this.Battery.BatteryLevel === undefined) {
+    if (this.Battery.BatteryLevel === undefined) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}`);
     } else {
       this.accessory.context.BatteryLevel = this.Battery.BatteryLevel;
@@ -499,7 +503,7 @@ export class Fan extends deviceBase {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.Battery.BatteryLevel}`);
     }
     // ChargingState
-    if(this.Battery.ChargingState === undefined) {
+    if (this.Battery.ChargingState === undefined) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ChargingState: ${this.Battery.ChargingState}`);
     } else {
       this.accessory.context.ChargingState = this.Battery.ChargingState;
@@ -507,7 +511,7 @@ export class Fan extends deviceBase {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic ChargingState: ${this.Battery.ChargingState}`);
     }
     // StatusLowBattery
-    if(this.Battery.StatusLowBattery === undefined) {
+    if (this.Battery.StatusLowBattery === undefined) {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.Battery.StatusLowBattery}`);
     } else {
       this.accessory.context.StatusLowBattery = this.Battery.StatusLowBattery;

package/src/device/hub.ts

@@ -157,12 +157,12 @@ export class Hub extends deviceBase {
           const { CurrentRelativeHumidity } = this.HumiditySensor || { CurrentRelativeHumidity: undefined };
           if (context.scale !== 'CELCIUS' && device.hub?.convertUnitTo === undefined) {
             this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} received a non-CELCIUS Webhook scale: `
-                  + `${context.scale}, Use the *convertUnitsTo* config under Hub settings, if displaying incorrectly in HomeKit.`);
+              + `${context.scale}, Use the *convertUnitsTo* config under Hub settings, if displaying incorrectly in HomeKit.`);
           }
           this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
-              '(scale, temperature, humidity, lightLevel) = ' +
-              `Webhook:(${context.scale}, ${convertUnits(temperature, context.scale, device.hub?.convertUnitTo)}, ${humidity}, ${lightLevel}), ` +
-              `current:(${CurrentTemperature}, ${CurrentRelativeHumidity}, ${CurrentAmbientLightLevel})`);
+            '(scale, temperature, humidity, lightLevel) = ' +
+            `Webhook:(${context.scale}, ${convertUnits(temperature, context.scale, device.hub?.convertUnitTo)}, ${humidity}, ${lightLevel}), ` +
+            `current:(${CurrentTemperature}, ${CurrentRelativeHumidity}, ${CurrentAmbientLightLevel})`);
           if (!this.device.hub?.hide_humidity) {
             this.HumiditySensor!.CurrentRelativeHumidity = humidity;
           }
@@ -217,12 +217,14 @@ export class Hub extends deviceBase {
     }
 
     // FirmwareRevision
-    this.accessory.context.FirmwareRevision = deviceStatus.body.version;
+    if (deviceStatus.body.version) {
+      this.accessory.context.FirmwareRevision = deviceStatus.body.version;
       this.accessory
         .getService(this.hap.Service.AccessoryInformation)!
         .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
         .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
         .updateValue(this.accessory.context.FirmwareRevision);
+    }
   }
 
   async refreshStatus(): Promise<void> {
@@ -278,7 +280,7 @@ export class Hub extends deviceBase {
     if (!this.device.hub?.hide_humidity) {
       if (this.HumiditySensor!.CurrentRelativeHumidity === undefined) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
-        +` CurrentRelativeHumidity: ${this.HumiditySensor!.CurrentRelativeHumidity}`);
+          + ` CurrentRelativeHumidity: ${this.HumiditySensor!.CurrentRelativeHumidity}`);
       } else {
         if (this.device.mqttURL) {
           mqttmessage.push(`"humidity": ${this.HumiditySensor!.CurrentRelativeHumidity}`);
@@ -308,7 +310,7 @@ export class Hub extends deviceBase {
         this.accessory.context.CurrentTemperature = this.TemperatureSensor!.CurrentTemperature;
         this.TemperatureSensor!.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, this.TemperatureSensor!.CurrentTemperature);
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
-        + ` CurrentTemperature: ${this.TemperatureSensor!.CurrentTemperature}`);
+          + ` CurrentTemperature: ${this.TemperatureSensor!.CurrentTemperature}`);
       }
     }
 
@@ -316,7 +318,7 @@ export class Hub extends deviceBase {
     if (!this.device.hub?.hide_lightsensor) {
       if (this.LightSensor!.CurrentAmbientLightLevel === undefined) {
         this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
-        + ` CurrentAmbientLightLevel: ${this.LightSensor!.CurrentAmbientLightLevel}`);
+          + ` CurrentAmbientLightLevel: ${this.LightSensor!.CurrentAmbientLightLevel}`);
       } else {
         if (this.device.mqttURL) {
           mqttmessage.push(`"light": ${this.LightSensor!.CurrentAmbientLightLevel}`);

package/src/device/humidifier.ts

@@ -269,12 +269,14 @@ export class Humidifier extends deviceBase {
     this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} WaterLevel: ${this.HumidifierDehumidifier.WaterLevel}`);
 
     // FirmwareRevision
-    this.accessory.context.FirmwareRevision = deviceStatus.body.version;
-    this.accessory
-      .getService(this.hap.Service.AccessoryInformation)!
-      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
-      .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-      .updateValue(this.accessory.context.FirmwareRevision);
+    if (deviceStatus.body.version) {
+      this.accessory.context.FirmwareRevision = deviceStatus.body.version;
+      this.accessory
+        .getService(this.hap.Service.AccessoryInformation)!
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
+        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+        .updateValue(this.accessory.context.FirmwareRevision);
+    }
   }
 
   async refreshStatus(): Promise<void> {

package/src/device/iosensor.ts

@@ -228,12 +228,14 @@ export class IOSensor extends deviceBase {
       this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.TemperatureSensor!.CurrentTemperature}°c`);
     }
     // FirmwareRevision
-    this.accessory.context.FirmwareRevision = deviceStatus.body.version;
-    this.accessory
-      .getService(this.hap.Service.AccessoryInformation)!
-      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
-      .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-      .updateValue(this.accessory.context.FirmwareRevision);
+    if (deviceStatus.body.version) {
+      this.accessory.context.FirmwareRevision = deviceStatus.body.version;
+      this.accessory
+        .getService(this.hap.Service.AccessoryInformation)!
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
+        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+        .updateValue(this.accessory.context.FirmwareRevision);
+    }
   }
 
   /**

package/src/device/lightstrip.ts

@@ -326,12 +326,14 @@ export class StripLight extends deviceBase {
     }
 
     // FirmwareRevision
-    this.accessory.context.FirmwareRevision = deviceStatus.body.version;
-    this.accessory
-      .getService(this.hap.Service.AccessoryInformation)!
-      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
-      .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-      .updateValue(this.accessory.context.FirmwareRevision);
+    if (deviceStatus.body.version) {
+      this.accessory.context.FirmwareRevision = deviceStatus.body.version;
+      this.accessory
+        .getService(this.hap.Service.AccessoryInformation)!
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
+        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+        .updateValue(this.accessory.context.FirmwareRevision);
+    }
   }
 
   /**

package/src/device/lock.ts

@@ -256,12 +256,14 @@ export class Lock extends deviceBase {
       + ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
 
     // FirmwareRevision
-    this.accessory.context.FirmwareRevision = deviceStatus.body.version;
-    this.accessory
-      .getService(this.hap.Service.AccessoryInformation)!
-      .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
-      .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
-      .updateValue(this.accessory.context.FirmwareRevision);
+    if (deviceStatus.body.version) {
+      this.accessory.context.FirmwareRevision = deviceStatus.body.version;
+      this.accessory
+        .getService(this.hap.Service.AccessoryInformation)!
+        .setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.FirmwareRevision)
+        .getCharacteristic(this.hap.Characteristic.FirmwareRevision)
+        .updateValue(this.accessory.context.FirmwareRevision);
+    }
   }
 
   /**