@switchbot/homebridge-switchbot 0.1.2-beta.32 → 0.1.2-beta.36

package/src/devices/meters.ts

@@ -88,7 +88,7 @@ export class Meter {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.Battery) ||
-      accessory.addService(this.platform.Service.Battery)), `${device.deviceName} ${device.deviceType}`;
+      accessory.addService(this.platform.Service.Battery)), `${accessory.displayName} Battery`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
@@ -113,7 +113,9 @@ export class Meter {
       this.platform.device('Adding Temperature Sensor Service');
       (this.temperatureservice =
         this.accessory.getService(this.platform.Service.TemperatureSensor) ||
-        this.accessory.addService(this.platform.Service.TemperatureSensor)), `${device.deviceName} ${device.deviceType} TemperatureSensor`;
+        this.accessory.addService(this.platform.Service.TemperatureSensor)), `${accessory.displayName} Temperature Sensor`;
+
+      this.service.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Temperature Sensor`);
 
       this.temperatureservice
         .getCharacteristic(this.platform.Characteristic.CurrentTemperature)
@@ -140,7 +142,9 @@ export class Meter {
       this.platform.device('Adding Humidity Sensor Service');
       (this.humidityservice =
         this.accessory.getService(this.platform.Service.HumiditySensor) ||
-        this.accessory.addService(this.platform.Service.HumiditySensor)), `${device.deviceName} ${device.deviceType} HumiditySensor`;
+        this.accessory.addService(this.platform.Service.HumiditySensor)), `${accessory.displayName} Humidity Sensor`;
+
+      this.service.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Humidity Sensor`);
 
       this.humidityservice
         .getCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity)
@@ -312,28 +316,28 @@ export class Meter {
    */
   updateHomeKitCharacteristics() {
     if (this.StatusLowBattery === undefined) {
-      this.platform.debug(`StatusLowBattery: ${this.StatusLowBattery}`);
+      this.platform.debug(`Meter ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
     } else {
       this.service.updateCharacteristic(this.platform.Characteristic.StatusLowBattery, this.StatusLowBattery);
-      this.platform.device(`updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
+      this.platform.device(`Meter ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
     }
     if (this.BatteryLevel === undefined) {
-      this.platform.debug(`BatteryLevel: ${this.BatteryLevel}`);
+      this.platform.debug(`Meter ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
     } else {
       this.service.updateCharacteristic(this.platform.Characteristic.BatteryLevel, this.BatteryLevel);
-      this.platform.device(`updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
+      this.platform.device(`Meter ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
     }
     if (this.platform.config.options?.meter?.hide_humidity && this.CurrentRelativeHumidity === undefined) {
-      this.platform.debug(`CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
+      this.platform.debug(`Meter ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
     } else {
       this.humidityservice?.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, this.CurrentRelativeHumidity);
-      this.platform.device(`updateCharacteristic CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
+      this.platform.device(`Meter ${this.accessory.displayName} updateCharacteristic CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
     }
     if (this.platform.config.options?.meter?.hide_temperature && this.CurrentTemperature === undefined) {
-      this.platform.debug(`CurrentTemperature: ${this.CurrentTemperature}`);
+      this.platform.debug(`Meter ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
     } else {
       this.temperatureservice?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.CurrentTemperature);
-      this.platform.device(`updateCharacteristic CurrentTemperature: ${this.CurrentTemperature}`);
+      this.platform.device(`Meter ${this.accessory.displayName} updateCharacteristic CurrentTemperature: ${this.CurrentTemperature}`);
     }
   }
 

package/src/devices/motion.ts

@@ -75,7 +75,7 @@ export class Motion {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.MotionSensor) ||
-      accessory.addService(this.platform.Service.MotionSensor)), `${device.deviceName} ${device.deviceType}`;
+      accessory.addService(this.platform.Service.MotionSensor)), `${accessory.displayName} Motion Sensor`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
@@ -203,10 +203,10 @@ export class Motion {
    */
   updateHomeKitCharacteristics() {
     if (this.MotionDetected === undefined) {
-      this.platform.debug(`MotionDetected: ${this.MotionDetected}`);
+      this.platform.debug(`Motion ${this.accessory.displayName} MotionDetected: ${this.MotionDetected}`);
     } else {
       this.service.updateCharacteristic(this.platform.Characteristic.MotionDetected, this.MotionDetected);
-      this.platform.device(`updateCharacteristic MotionDetected: ${this.MotionDetected}`);
+      this.platform.device(`Motion ${this.accessory.displayName} updateCharacteristic MotionDetected: ${this.MotionDetected}`);
     }
   }
 

package/src/devices/plugs.ts

@@ -241,16 +241,16 @@ export class Plug {
 
   updateHomeKitCharacteristics() {
     if (this.On === undefined) {
-      this.platform.debug(`On: ${this.On}`);
+      this.platform.debug(`Plug ${this.accessory.displayName} On: ${this.On}`);
     } else {
       this.service.updateCharacteristic(this.platform.Characteristic.On, this.On);
-      this.platform.device(`updateCharacteristic On: ${this.On}`);
+      this.platform.device(`Plug ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
     }
     if (this.OutletInUse === undefined) {
-      this.platform.debug(`OutletInUse: ${this.OutletInUse}`);
+      this.platform.debug(`Plug ${this.accessory.displayName} OutletInUse: ${this.OutletInUse}`);
     } else {
       this.service.updateCharacteristic(this.platform.Characteristic.OutletInUse, this.OutletInUse);
-      this.platform.device(`updateCharacteristic OutletInUse: ${this.OutletInUse}`);
+      this.platform.device(`Plug ${this.accessory.displayName} updateCharacteristic OutletInUse: ${this.OutletInUse}`);
     }
   }
 

package/src/irdevices/airconditioners.ts

@@ -45,7 +45,7 @@ export class AirConditioner {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.HeaterCooler) ||
-      accessory.addService(this.platform.Service.HeaterCooler)), `${device.deviceName} ${device.remoteType}`;
+      accessory.addService(this.platform.Service.HeaterCooler)), `${accessory.displayName} Air Conditioner`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
@@ -159,14 +159,14 @@ export class AirConditioner {
   private CurrentTemperatureGet(value: CharacteristicValue) {
     this.platform.debug('Trigger Get CurrentTemperture');
 
-    if (this.CurrentTemperature === NaN) {
+    if (Number.isNaN(this.CurrentTemperature)) {
       this.CurrentTemperature = 24;
     } else {
-    this.service
-      .getCharacteristic(this.platform.Characteristic.CurrentTemperature)
-      .updateValue(Number(this.CurrentTemperature) || 24);
+      this.service
+        .getCharacteristic(this.platform.Characteristic.CurrentTemperature)
+        .updateValue(Number(this.CurrentTemperature) || 24);
     }
-    return (this.CurrentTemperature = Number(value));
+    return (this.CurrentTemperature === Number(value));
   }
 
   private TargetHeaterCoolerStateSet(value: CharacteristicValue) {

package/src/irdevices/airpurifiers.ts

@@ -44,7 +44,7 @@ export class AirPurifier {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.AirPurifier) ||
-      accessory.addService(this.platform.Service.AirPurifier)), `${device.deviceName} ${device.remoteType}`;
+      accessory.addService(this.platform.Service.AirPurifier)), `${accessory.displayName} Air Purifier`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:

package/src/irdevices/cameras.ts

@@ -29,7 +29,7 @@ export class Camera {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.Switch) ||
-      accessory.addService(this.platform.Service.Switch)), `${device.deviceName} ${device.remoteType}`;
+      accessory.addService(this.platform.Service.Switch)), `${accessory.displayName} Camera`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:

package/src/irdevices/fans.ts

@@ -37,7 +37,7 @@ export class Fan {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.Fanv2) ||
-      accessory.addService(this.platform.Service.Fanv2)), `${device.deviceName} ${device.remoteType}`;
+      accessory.addService(this.platform.Service.Fanv2)), `${accessory.displayName} Fan`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:

package/src/irdevices/lights.ts

@@ -29,7 +29,7 @@ export class Light {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.Lightbulb) ||
-      accessory.addService(this.platform.Service.Lightbulb)), `${device.deviceName} ${device.remoteType}`;
+      accessory.addService(this.platform.Service.Lightbulb)), `${accessory.displayName} Light Bulb`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:

package/src/irdevices/others.ts

@@ -29,10 +29,8 @@ export class Others {
     // you can create multiple services for each accessory
     this.service = accessory.getService(this.platform.Service.Fanv2);
     if (!this.service && this.platform.config.options?.other?.deviceType === 'Fan') {
-      this.service = accessory.addService(
-        this.platform.Service.Fanv2,
-        `${device.deviceName} ${device.remoteType} Fan`,
-      );
+      this.service = accessory.addService(this.platform.Service.Fanv2, `${accessory.displayName} Fan`);
+
       this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
 
       this.service.getCharacteristic(this.platform.Characteristic.Active).onSet(this.ActiveSet.bind(this));

package/src/irdevices/tvs.ts

@@ -53,7 +53,7 @@ export class TV {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.Television) ||
-      accessory.addService(this.platform.Service.Television)), `${device.deviceName} ${device.remoteType}`;
+      accessory.addService(this.platform.Service.Television)), `${accessory.displayName} TV`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
@@ -86,7 +86,9 @@ export class TV {
     // create a new Television Speaker service
     (this.speakerService =
       accessory.getService(this.platform.Service.TelevisionSpeaker) ||
-      accessory.addService(this.platform.Service.TelevisionSpeaker)), `${device.deviceName} ${device.remoteType} Speaker`;
+      accessory.addService(this.platform.Service.TelevisionSpeaker)), `${accessory.displayName} Speaker`;
+
+    this.speakerService.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Speaker`);
 
     this.speakerService
       .setCharacteristic(this.platform.Characteristic.Active, this.platform.Characteristic.Active.ACTIVE)

package/src/irdevices/vacuumcleaners.ts

@@ -29,8 +29,7 @@ export class VacuumCleaner {
     // you can create multiple services for each accessory
     (this.service =
       accessory.getService(this.platform.Service.Switch) ||
-      accessory.addService(this.platform.Service.Switch)),
-    `${device.deviceName} ${device.remoteType}`;
+      accessory.addService(this.platform.Service.Switch)), `${accessory.displayName} Vacuum`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
@@ -38,10 +37,7 @@ export class VacuumCleaner {
 
     // set the service name, this is what is displayed as the default name on the Home app
     // in this example we are using the name we stored in the `accessory.context` in the `discoverDevices` method.
-    this.service.setCharacteristic(
-      this.platform.Characteristic.Name,
-      `${device.deviceName} ${device.remoteType}`,
-    );
+    this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
 
     // handle on / off events using the On characteristic
     this.service.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));

package/src/irdevices/waterheaters.ts

@@ -28,8 +28,8 @@ export class WaterHeater {
     // get the Television service if it exists, otherwise create a new Television service
     // you can create multiple services for each accessory
     (this.service =
-      accessory.getService(this.platform.Service.Valve) || accessory.addService(this.platform.Service.Valve)),
-    `${device.deviceName} ${device.remoteType}`;
+      accessory.getService(this.platform.Service.Valve) ||
+      accessory.addService(this.platform.Service.Valve)), `${accessory.displayName} Water Heater`;
 
     // To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
     // when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:

package/src/platform.ts

@@ -347,6 +347,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         //existingAccessory.context.firmwareRevision = firmware;
         existingAccessory.context.model = device.deviceType;
         existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
         await this.connectionTypeExistingAccessory(device, existingAccessory);
         this.api.updatePlatformAccessories([existingAccessory]);
@@ -362,7 +363,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.deviceType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -399,6 +400,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
         existingAccessory.context.model = device.deviceType;
         existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
         await this.connectionTypeExistingAccessory(device, existingAccessory);
         this.api.updatePlatformAccessories([existingAccessory]);
@@ -417,7 +419,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         this.log.error('You must set your Bot to Press or Switch Mode');
       }
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.deviceType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -455,6 +457,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
         existingAccessory.context.model = device.deviceType;
         existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
         await this.connectionTypeExistingAccessory(device, existingAccessory);
         this.api.updatePlatformAccessories([existingAccessory]);
@@ -470,7 +473,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.deviceType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -507,6 +510,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
         existingAccessory.context.model = device.deviceType;
         existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
         this.api.updatePlatformAccessories([existingAccessory]);
         // create the accessory handler for the restored accessory
@@ -521,7 +525,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.deviceType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -557,6 +561,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
         existingAccessory.context.model = device.deviceType;
         existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
         this.api.updatePlatformAccessories([existingAccessory]);
         // create the accessory handler for the restored accessory
@@ -571,7 +576,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.deviceType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -607,6 +612,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
         existingAccessory.context.model = device.deviceType;
         existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
         await this.connectionTypeExistingAccessory(device, existingAccessory);
         this.api.updatePlatformAccessories([existingAccessory]);
@@ -632,7 +638,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       }
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.deviceType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -677,6 +683,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
         existingAccessory.context.model = device.deviceType;
         existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
         await this.connectionTypeExistingAccessory(device, existingAccessory);
         this.api.updatePlatformAccessories([existingAccessory]);
@@ -692,7 +699,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.deviceType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -729,6 +736,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
         existingAccessory.context.model = device.deviceType;
         existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
         await this.connectionTypeExistingAccessory(device, existingAccessory);
         this.api.updatePlatformAccessories([existingAccessory]);
@@ -744,7 +752,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.deviceType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.deviceType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -779,6 +787,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
       existingAccessory.context.model = device.remoteType;
       existingAccessory.context.deviceID = device.deviceId;
+      existingAccessory.displayName = device.deviceName;
       existingAccessory.context.firmwareRevision = this.version;
       await this.connectionTypeExistingAccessory(device, existingAccessory);
       this.api.updatePlatformAccessories([existingAccessory]);
@@ -791,7 +800,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -833,6 +842,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
 
         existingAccessory.context.model = device.remoteType;
         existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
         await this.connectionTypeExistingAccessory(device, existingAccessory);
         this.api.updatePlatformAccessories([existingAccessory]);
@@ -848,7 +858,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -885,6 +895,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
         existingAccessory.context.model = device.remoteType;
         existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
         await this.connectionTypeExistingAccessory(device, existingAccessory);
         this.api.updatePlatformAccessories([existingAccessory]);
@@ -900,7 +911,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -937,6 +948,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
         existingAccessory.context.model = device.remoteType;
         existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
         await this.connectionTypeExistingAccessory(device, existingAccessory);
         this.api.updatePlatformAccessories([existingAccessory]);
@@ -952,7 +964,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -989,6 +1001,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
         existingAccessory.context.model = device.remoteType;
         existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
         await this.connectionTypeExistingAccessory(device, existingAccessory);
         this.api.updatePlatformAccessories([existingAccessory]);
@@ -1004,7 +1017,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -1041,6 +1054,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
         existingAccessory.context.model = device.remoteType;
         existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
         await this.connectionTypeExistingAccessory(device, existingAccessory);
         this.api.updatePlatformAccessories([existingAccessory]);
@@ -1056,7 +1070,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -1093,6 +1107,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
         existingAccessory.context.model = device.remoteType;
         existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
         await this.connectionTypeExistingAccessory(device, existingAccessory);
         this.api.updatePlatformAccessories([existingAccessory]);
@@ -1108,7 +1123,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -1145,6 +1160,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
         existingAccessory.context.model = device.remoteType;
         existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
         await this.connectionTypeExistingAccessory(device, existingAccessory);
         this.api.updatePlatformAccessories([existingAccessory]);
@@ -1160,7 +1176,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -1197,6 +1213,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
         // if you need to update the accessory.context then you should run `api.updatePlatformAccessories`. eg.:
         existingAccessory.context.model = device.remoteType;
         existingAccessory.context.deviceID = device.deviceId;
+        existingAccessory.displayName = device.deviceName;
         existingAccessory.context.firmwareRevision = this.version;
         await this.connectionTypeExistingAccessory(device, existingAccessory);
         this.api.updatePlatformAccessories([existingAccessory]);
@@ -1212,7 +1229,7 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
       this.log.info(`Adding new accessory: ${device.deviceName} ${device.remoteType} DeviceID: ${device.deviceId}`);
 
       // create a new accessory
-      const accessory = new this.api.platformAccessory(`${device.deviceName} ${device.remoteType}`, uuid);
+      const accessory = new this.api.platformAccessory(device.deviceName, uuid);
 
       // store a copy of the device object in the `accessory.context`
       // the `context` property can be used to store any data about the accessory you may need
@@ -1262,7 +1279,9 @@ export class SwitchBotPlatform implements DynamicPlatformPlugin {
   }
 
   public deviceListInfo(devices: deviceResponses) {
-    this.device(`deviceListInfoStatus: ${JSON.stringify(devices)}`);
+    if (this.config.options?.debug === 'device') {
+      this.device(`deviceListInfoStatus: ${JSON.stringify(devices)}`);
+    }
   }
 
   public async deviceInfo(device: irdevice | device) {