Add ConfiguredName for Dimmer, Switch, Valve (#85)

* Fix iOS 16 service name appeared as accessory name. * Silence characteristic warning.
0x5e · Nov 16, 2022 · daab3fa · daab3fa
1 parent 6b3a48f
commit daab3fa
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/src/accessory/BaseAccessory.ts b/src/accessory/BaseAccessory.ts
@@ -46,6 +46,7 @@ export default class BaseAccessory {
       .setCharacteristic(this.Characteristic.Manufacturer, MANUFACTURER)
       .setCharacteristic(this.Characteristic.Model, this.device.product_id)
       .setCharacteristic(this.Characteristic.Name, this.device.name)
+      .setCharacteristic(this.Characteristic.ConfiguredName, this.device.name)
       .setCharacteristic(this.Characteristic.SerialNumber, this.device.uuid)
     ;
   }

diff --git a/src/accessory/DimmerAccessory.ts b/src/accessory/DimmerAccessory.ts
@@ -48,6 +48,13 @@ export default class DimmerAccessory extends BaseAccessory {
 
       const service = this.accessory.getService(schema.code)
         || this.accessory.addService(this.Service.Lightbulb, schema.code, schema.code);
+
+      service.setCharacteristic(this.Characteristic.Name, schema.code);
+      if (!service.testCharacteristic(this.Characteristic.ConfiguredName)) {
+        service.addOptionalCharacteristic(this.Characteristic.ConfiguredName); // silence warning
+        service.setCharacteristic(this.Characteristic.ConfiguredName, schema.code);
+      }
+
       this.configureOn(service, index);
       this.configureBrightness(service, index);
     }

diff --git a/src/accessory/SwitchAccessory.ts b/src/accessory/SwitchAccessory.ts
@@ -16,6 +16,10 @@ export default class SwitchAccessory extends BaseAccessory {
       || this.accessory.addService(this.mainService(), schema.code, schema.code);
 
     service.setCharacteristic(this.Characteristic.Name, schema.code);
+    if (!service.testCharacteristic(this.Characteristic.ConfiguredName)) {
+      service.addOptionalCharacteristic(this.Characteristic.ConfiguredName); // silence warning
+      service.setCharacteristic(this.Characteristic.ConfiguredName, schema.code);
+    }
 
     service.getCharacteristic(this.Characteristic.On)
       .onGet(async () => {

diff --git a/src/accessory/ValveAccessory.ts b/src/accessory/ValveAccessory.ts
@@ -13,6 +13,10 @@ export default class ValveAccessory extends BaseAccessory {
       || this.accessory.addService(this.Service.Valve, schema.code, schema.code);
 
     service.setCharacteristic(this.Characteristic.Name, schema.code);
+    if (!service.testCharacteristic(this.Characteristic.ConfiguredName)) {
+      service.addOptionalCharacteristic(this.Characteristic.ConfiguredName); // silence warning
+      service.setCharacteristic(this.Characteristic.ConfiguredName, schema.code);
+    }
     service.setCharacteristic(this.Characteristic.ValveType, this.Characteristic.ValveType.IRRIGATION);
 
     service.getCharacteristic(this.Characteristic.InUse)