homebridge-midea-platform 1.2.6-beta.8 → 1.2.6

package/CHANGELOG.md

@@ -1,8 +1,13 @@
 # Changelog
 
 # v1.2.6
-- feat: added support for `Fresh Air Appliance` (fixes #118)
+- feat: added partial support for `Fresh Air Appliance` (issue #118)
 - feat: added sleep mode switch for `Air Conditioner` (fixes #128)
+- feat: added comfort mode switch for `Air Conditioner` (fixes #132)
+- feat: added support for `Heat Pump Water Heater` (fixes #125)
+- fix: store and display name of sub-service if it's changed from the Home app (fixed #120)
+  - you might have duplicated accessories because of this, please delete the cached accessories for this plugin to remove them
+  - you can do this from the Homebridge UI: three dots in the top right side -> Settings -> scroll down to the bottom and there will be a `Remove Single Accessory` button -> use that and remove everything which is connected to the plugin `homebridge-midea-platform`
 
 # v1.2.5
 - fix: getting tokens/key for devices

package/README.md

@@ -8,7 +8,7 @@
 [![npm](https://badgen.net/npm/v/homebridge-midea-platform)](https://www.npmjs.com/package/homebridge-midea-platform)
 [![npm](https://badgen.net/npm/dt/homebridge-midea-platform?label=downloads)](https://www.npmjs.com/package/homebridge-midea-platform)
 
-*Verified* plugin for Midea devices. This is implemented by building on the Homebridge platform plugin template and the work done by [@georgezhao2010](https://github.com/georgezhao2010) in the [midea_ac_lan](https://github.com/georgezhao2010/midea_ac_lan) project for Home Assistant. Also thanks to the work done by [@mill1000](https://github.com/mill1000) in the [midea-msmart (msmart-ng)](https://github.com/mill1000/midea-msmart) project.
+*Verified* plugin for Midea devices. This is implemented by building on the Homebridge platform plugin template and the work done by [@georgezhao2010](https://github.com/georgezhao2010) in the [midea_ac_lan](https://github.com/georgezhao2010/midea_ac_lan) project for Home Assistant and the project [midea-local](https://github.com/midea-lan/midea-local). Also thanks to the work done by [@mill1000](https://github.com/mill1000) in the [midea-msmart (msmart-ng)](https://github.com/mill1000/midea-msmart) project.
 
 Pull requests and/or other offers of development assistance gratefully received.
 

package/config.schema.json

@@ -45,6 +45,7 @@
                 "Fresh Air Appliance",
                 "Front Load Washer",
                 "Gas Water Heater",
+                "Heat Pump Water Heater",
                 "Heat Pump WiFi Controller",
                 "Humidifier"
               ],
@@ -300,6 +301,11 @@
                   "title": "Sleep Mode Switch",
                   "description": "Toggles if the sleep mode switch is created with the accessory.",
                   "type": "boolean"
+                },
+                "comfortModeSwitch": {
+                  "title": "Comfort Mode Switch",
+                  "description": "Toggles if the comfort mode switch is created with the accessory.",
+                  "type": "boolean"
                 }
               }
             },
@@ -347,11 +353,59 @@
                 }
               }
             },
+            "CD_options": {
+              "title": "Heat Pump Water Heater Options",
+              "type": "object",
+              "condition": {
+                "functionBody": "return model.devices && model.devices[arrayIndices].type === 'Heat Pump Water Heater';"
+              },
+              "properties": {
+                "minTemp": {
+                  "title": "Minimum Temperature (°C)",
+                  "type": "number"
+                },
+                "maxTemp": {
+                  "title": "Maximum Temperature (°C)",
+                  "type": "number"
+                },
+                "tempStep": {
+                  "title": "Temperature Step (°C)",
+                  "type": "number",
+                  "required": true,
+                  "enum": [0.5, 1]
+                },
+                "energySaveModeSwitch": {
+                  "title": "Energy Save Mode Switch",
+                  "description": "Toggles if the energy save mode switch is created with the accessory.",
+                  "type": "boolean"
+                },
+                "standardModeSwitch": {
+                  "title": "Standard Mode Switch",
+                  "description": "Toggles if the standard mode switch is created with the accessory.",
+                  "type": "boolean"
+                },
+                "eHeaterModeSwitch": {
+                  "title": "E-Heater Mode Switch",
+                  "description": "Toggles if the e-heater mode switch is created with the accessory.",
+                  "type": "boolean"
+                },
+                "smartModeSwitch": {
+                  "title": "Smart Mode Switch",
+                  "description": "Toggles if the smart mode switch is created with the accessory.",
+                  "type": "boolean"
+                },
+                "disinfectionSwitch": {
+                  "title": "Disinfection Mode Switch",
+                  "description": "Toggles if the disinfection mode switch is created with the accessory.",
+                  "type": "boolean"
+                }
+              }
+            },
             "CE_options": {
-              "title": "Top Load Washer Options",
+              "title": "Fresh Air Appliance Options",
               "type": "object",
               "condition": {
-                "functionBody": "return model.devices && model.devices[arrayIndices].type === 'Top Load Washer';"
+                "functionBody": "return model.devices && model.devices[arrayIndices].type === 'Fresh Air Appliance';"
               },
               "properties": {
                 "silentMode": {
@@ -566,7 +620,11 @@
               "items": [
                 {
                   "key": "devices[].AC_options.swing",
-                  "items": ["devices[].AC_options.swing.mode", "devices[].AC_options.swing.angleAccessory", "devices[].AC_options.swing.angleMainControl"]
+                  "items": [
+                    "devices[].AC_options.swing.mode",
+                    "devices[].AC_options.swing.angleAccessory",
+                    "devices[].AC_options.swing.angleMainControl"
+                  ]
                 },
                 "devices[].AC_options.heatingCapable",
                 "devices[].AC_options.outDoorTemp",
@@ -582,7 +640,10 @@
                 "devices[].AC_options.rateSelector",
                 {
                   "key": "devices[].AC_options.displaySwitch",
-                  "items": ["devices[].AC_options.displaySwitch.flag", "devices[].AC_options.displaySwitch.command"]
+                  "items": [
+                    "devices[].AC_options.displaySwitch.flag",
+                    "devices[].AC_options.displaySwitch.command"
+                  ]
                 },
                 "devices[].AC_options.minTemp",
                 "devices[].AC_options.maxTemp",
@@ -590,7 +651,8 @@
                 "devices[].AC_options.fahrenheit",
                 "devices[].AC_options.fanOnlyModeSwitch",
                 "devices[].AC_options.fanAccessory",
-                "devices[].AC_options.sleepModeSwitch"
+                "devices[].AC_options.sleepModeSwitch",
+                "devices[].AC_options.comfortModeSwitch"
               ]
             },
             {
@@ -607,6 +669,21 @@
                 "devices[].C3_options.disinfectSwitch"
               ]
             },
+            {
+              "key": "devices[].CD_options",
+              "expandable": true,
+              "expanded": false,
+              "items": [
+                "devices[].CD_options.minTemp",
+                "devices[].CD_options.maxTemp",
+                "devices[].CD_options.tempStep",
+                "devices[].CD_options.energySaveModeSwitch",
+                "devices[].CD_options.standardModeSwitch",
+                "devices[].CD_options.eHeaterModeSwitch",
+                "devices[].CD_options.smartModeSwitch",
+                "devices[].CD_options.disinfectionSwitch"
+              ]
+            },
             {
               "key": "devices[].CE_options",
               "expandable": true,

package/dist/accessory/AccessoryFactory.d.ts

@@ -1,4 +1,6 @@
+import type MideaDevice from '../core/MideaDevice.js';
 import type { MideaAccessory, MideaPlatform } from '../platform.js';
+import type { DeviceConfig } from '../platformUtils.js';
 import AirConditionerAccessory from './AirConditionerAccessory.js';
 import DehumidifierAccessory from './DehumidifierAccessory.js';
 import FrontLoadWasherAccessory from './FrontLoadWasherAccessory.js';
@@ -9,8 +11,7 @@ import DishwasherAccessory from './DishwasherAccessory.js';
 import HeatPumpWiFiControllerAccessory from './HeatPumpWiFiControllerAccessory.js';
 import HumidifierAccessory from './HumidifierAccessory.js';
 import FreshAirApplianceAccessory from './FreshAirApplianceAccessory.js';
-import type MideaDevice from '../core/MideaDevice.js';
-import type { DeviceConfig } from '../platformUtils.js';
+import HeatPumpWaterHeaterAccessory from './HeatPumpWaterHeaterAccessory.js';
 export default class AccessoryFactory {
-    static createAccessory<T extends MideaDevice>(platform: MideaPlatform, accessory: MideaAccessory, device: T, configDev: DeviceConfig): AirConditionerAccessory | DehumidifierAccessory | FrontLoadWasherAccessory | ElectricWaterHeaterAccessory | GasWaterHeaterAccessory | FanAccessory | DishwasherAccessory | HeatPumpWiFiControllerAccessory | HumidifierAccessory | FreshAirApplianceAccessory;
+    static createAccessory<T extends MideaDevice>(platform: MideaPlatform, accessory: MideaAccessory, device: T, configDev: DeviceConfig): AirConditionerAccessory | DehumidifierAccessory | FrontLoadWasherAccessory | ElectricWaterHeaterAccessory | GasWaterHeaterAccessory | FanAccessory | DishwasherAccessory | HeatPumpWiFiControllerAccessory | HumidifierAccessory | FreshAirApplianceAccessory | HeatPumpWaterHeaterAccessory;
 }

package/dist/accessory/AccessoryFactory.js

@@ -9,6 +9,7 @@ import DishwasherAccessory from './DishwasherAccessory.js';
 import HeatPumpWiFiControllerAccessory from './HeatPumpWiFiControllerAccessory.js';
 import HumidifierAccessory from './HumidifierAccessory.js';
 import FreshAirApplianceAccessory from './FreshAirApplianceAccessory.js';
+import HeatPumpWaterHeaterAccessory from './HeatPumpWaterHeaterAccessory.js';
 // biome-ignore lint/complexity/noStaticOnlyClass: static class is used for factory
 export default class AccessoryFactory {
     static createAccessory(platform, accessory, device, configDev) {
@@ -33,6 +34,8 @@ export default class AccessoryFactory {
                 return new HumidifierAccessory(platform, accessory, device, configDev);
             case DeviceType.FRESH_AIR_APPLIANCE:
                 return new FreshAirApplianceAccessory(platform, accessory, device, configDev);
+            case DeviceType.HEAT_PUMP_WATER_HEATER:
+                return new HeatPumpWaterHeaterAccessory(platform, accessory, device, configDev);
             default:
                 throw new Error(`Unsupported device type: ${device.type}`);
         }

package/dist/accessory/AccessoryFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"AccessoryFactory.js","sourceRoot":"","sources":["../../src/accessory/AccessoryFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAIvD,OAAO,uBAAuB,MAAM,8BAA8B,CAAC;AAGnE,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAG/D,OAAO,wBAAwB,MAAM,+BAA+B,CAAC;AAGrE,OAAO,4BAA4B,MAAM,mCAAmC,CAAC;AAG7E,OAAO,uBAAuB,MAAM,8BAA8B,CAAC;AAGnE,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAG7C,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAG3D,OAAO,+BAA+B,MAAM,sCAAsC,CAAC;AAGnF,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAG3D,OAAO,0BAA0B,MAAM,iCAAiC,CAAC;AAKzE,mFAAmF;AACnF,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAC5B,MAAM,CAAC,eAAe,CAAwB,QAAuB,EAAE,SAAyB,EAAE,MAAS,EAAE,SAAuB;QACzI,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,UAAU,CAAC,YAAY;gBAC1B,OAAO,IAAI,qBAAqB,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YACvG,KAAK,UAAU,CAAC,eAAe;gBAC7B,OAAO,IAAI,uBAAuB,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YACzG,KAAK,UAAU,CAAC,yBAAyB;gBACvC,OAAO,IAAI,+BAA+B,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YACjH,KAAK,UAAU,CAAC,iBAAiB;gBAC/B,OAAO,IAAI,wBAAwB,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YAC1G,KAAK,UAAU,CAAC,UAAU;gBACxB,OAAO,IAAI,mBAAmB,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YACrG,KAAK,UAAU,CAAC,qBAAqB;gBACnC,OAAO,IAAI,4BAA4B,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YAC9G,KAAK,UAAU,CAAC,gBAAgB;gBAC9B,OAAO,IAAI,uBAAuB,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YACzG,KAAK,UAAU,CAAC,GAAG;gBACjB,OAAO,IAAI,YAAY,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YAC9F,KAAK,UAAU,CAAC,UAAU;gBACxB,OAAO,IAAI,mBAAmB,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YACrG,KAAK,UAAU,CAAC,mBAAmB;gBACjC,OAAO,IAAI,0BAA0B,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YAC5G;gBACE,MAAM,IAAI,KAAK,CAAC,4BAA4B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"AccessoryFactory.js","sourceRoot":"","sources":["../../src/accessory/AccessoryFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAMvD,OAAO,uBAAuB,MAAM,8BAA8B,CAAC;AAGnE,OAAO,qBAAqB,MAAM,4BAA4B,CAAC;AAG/D,OAAO,wBAAwB,MAAM,+BAA+B,CAAC;AAGrE,OAAO,4BAA4B,MAAM,mCAAmC,CAAC;AAG7E,OAAO,uBAAuB,MAAM,8BAA8B,CAAC;AAGnE,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAG7C,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAG3D,OAAO,+BAA+B,MAAM,sCAAsC,CAAC;AAGnF,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAG3D,OAAO,0BAA0B,MAAM,iCAAiC,CAAC;AAGzE,OAAO,4BAA4B,MAAM,mCAAmC,CAAC;AAE7E,mFAAmF;AACnF,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAC5B,MAAM,CAAC,eAAe,CAAwB,QAAuB,EAAE,SAAyB,EAAE,MAAS,EAAE,SAAuB;QACzI,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,UAAU,CAAC,YAAY;gBAC1B,OAAO,IAAI,qBAAqB,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YACvG,KAAK,UAAU,CAAC,eAAe;gBAC7B,OAAO,IAAI,uBAAuB,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YACzG,KAAK,UAAU,CAAC,yBAAyB;gBACvC,OAAO,IAAI,+BAA+B,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YACjH,KAAK,UAAU,CAAC,iBAAiB;gBAC/B,OAAO,IAAI,wBAAwB,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YAC1G,KAAK,UAAU,CAAC,UAAU;gBACxB,OAAO,IAAI,mBAAmB,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YACrG,KAAK,UAAU,CAAC,qBAAqB;gBACnC,OAAO,IAAI,4BAA4B,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YAC9G,KAAK,UAAU,CAAC,gBAAgB;gBAC9B,OAAO,IAAI,uBAAuB,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YACzG,KAAK,UAAU,CAAC,GAAG;gBACjB,OAAO,IAAI,YAAY,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YAC9F,KAAK,UAAU,CAAC,UAAU;gBACxB,OAAO,IAAI,mBAAmB,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YACrG,KAAK,UAAU,CAAC,mBAAmB;gBACjC,OAAO,IAAI,0BAA0B,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YAC5G,KAAK,UAAU,CAAC,sBAAsB;gBACpC,OAAO,IAAI,4BAA4B,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAkC,EAAE,SAAS,CAAC,CAAC;YAC9G;gBACE,MAAM,IAAI,KAAK,CAAC,4BAA4B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;CACF"}

package/dist/accessory/AirConditionerAccessory.d.ts

@@ -33,6 +33,7 @@ export default class AirConditionerAccessory extends BaseAccessory<MideaACDevice
     private rateSelectService?;
     private sleepModeService?;
     private swingAngleService?;
+    private comfortModeService?;
     private swingAngleMainControl;
     /*********************************************************************
      * Constructor registers all the service types with Homebridge, registers
@@ -99,4 +100,6 @@ export default class AirConditionerAccessory extends BaseAccessory<MideaACDevice
     setSwingAngleTargetVerticalTiltAngle(value: CharacteristicValue): Promise<void>;
     getSleepMode(): CharacteristicValue;
     setSleepMode(value: CharacteristicValue): Promise<void>;
+    getComfortMode(): CharacteristicValue;
+    setComfortMode(value: CharacteristicValue): Promise<void>;
 }

package/dist/accessory/AirConditionerAccessory.js

@@ -1,5 +1,21 @@
 import { SwingAngle, SwingMode } from '../platformUtils.js';
-import BaseAccessory from './BaseAccessory.js';
+import BaseAccessory, { limitValue } from './BaseAccessory.js';
+const outDoorTemperatureSubtype = 'outdoor';
+const displaySubtype = 'display';
+const fanOnlySubtype = 'fanOnly';
+const fanSubtype = 'fan';
+const ecoModeSubtype = 'ecoMode';
+const breezeAwaySubtype = 'breezeAway';
+const dryModeSubtype = 'dryMode';
+const boostModeSubtype = 'boostMode';
+const auxSubtype = 'aux';
+const auxHeatingSubtype = 'auxHeating';
+const selfCleanSubtype = 'selfClean';
+const ionSubtype = 'ion';
+const rateSelectSubtype = 'rateSelect';
+const sleepModeSubtype = 'sleepMode';
+const swingAngleSubtype = 'swingAngle';
+const comfortModeSubtype = 'comfortMode';
 export default class AirConditionerAccessory extends BaseAccessory {
     device;
     configDev;
@@ -19,6 +35,7 @@ export default class AirConditionerAccessory extends BaseAccessory {
     rateSelectService;
     sleepModeService;
     swingAngleService;
+    comfortModeService;
     swingAngleMainControl;
     /*********************************************************************
      * Constructor registers all the service types with Homebridge, registers
@@ -74,11 +91,10 @@ export default class AirConditionerAccessory extends BaseAccessory {
             this.service.getCharacteristic(this.platform.Characteristic.SwingMode).onGet(this.getSwingMode.bind(this)).onSet(this.setSwingMode.bind(this));
         }
         // Outdoor temperature sensor
-        this.outDoorTemperatureService = this.accessory.getServiceById(this.platform.Service.TemperatureSensor, 'Outdoor');
+        this.outDoorTemperatureService = this.accessory.getServiceById(this.platform.Service.TemperatureSensor, outDoorTemperatureSubtype);
         if (this.configDev.AC_options.outDoorTemp) {
-            this.outDoorTemperatureService ??= this.accessory.addService(this.platform.Service.TemperatureSensor, `${this.device.name} Outdoor`, 'Outdoor');
-            this.outDoorTemperatureService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Outdoor`);
-            this.outDoorTemperatureService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${this.device.name} Outdoor`);
+            this.outDoorTemperatureService ??= this.accessory.addService(this.platform.Service.TemperatureSensor, undefined, outDoorTemperatureSubtype);
+            this.handleConfiguredName(this.outDoorTemperatureService, outDoorTemperatureSubtype, 'Outdoor');
             this.outDoorTemperatureService.getCharacteristic(this.platform.Characteristic.CurrentTemperature).onGet(this.getOutdoorTemperature.bind(this));
             this.outDoorTemperatureService
                 .getCharacteristic(this.platform.Characteristic.StatusFault)
@@ -90,22 +106,20 @@ export default class AirConditionerAccessory extends BaseAccessory {
             this.accessory.removeService(this.outDoorTemperatureService);
         }
         // Fan-only mode switch
-        this.fanOnlyService = this.accessory.getServiceById(this.platform.Service.Switch, 'FanOnly');
+        this.fanOnlyService = this.accessory.getServiceById(this.platform.Service.Switch, fanOnlySubtype);
         if (this.configDev.AC_options.fanOnlyModeSwitch) {
-            this.fanOnlyService ??= this.accessory.addService(this.platform.Service.Switch, `${this.device.name} FanOnly`, 'FanOnly');
-            this.fanOnlyService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Fan-only Mode`);
-            this.fanOnlyService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${this.device.name} Fan-only Mode`);
+            this.fanOnlyService ??= this.accessory.addService(this.platform.Service.Switch, undefined, fanOnlySubtype);
+            this.handleConfiguredName(this.fanOnlyService, fanOnlySubtype, 'Fan-only Mode');
             this.fanOnlyService.getCharacteristic(this.platform.Characteristic.On).onGet(this.getFanOnlyMode.bind(this)).onSet(this.setFanOnlyMode.bind(this));
         }
         else if (this.fanOnlyService) {
             this.accessory.removeService(this.fanOnlyService);
         }
         // Fan accessory
-        this.fanService = this.accessory.getServiceById(this.platform.Service.Fanv2, 'Fan');
+        this.fanService = this.accessory.getServiceById(this.platform.Service.Fanv2, fanSubtype);
         if (this.configDev.AC_options.fanAccessory) {
-            this.fanService ??= this.accessory.addService(this.platform.Service.Fanv2, `${this.device.name} Fan`, 'Fan');
-            this.fanService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Fan`);
-            this.fanService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${this.device.name} Fan`);
+            this.fanService ??= this.accessory.addService(this.platform.Service.Fanv2, undefined, fanSubtype);
+            this.handleConfiguredName(this.fanService, fanSubtype, 'Fan');
             this.fanService.getCharacteristic(this.platform.Characteristic.Active).onGet(this.getActive.bind(this)).onSet(this.setActive.bind(this));
             this.fanService
                 .getCharacteristic(this.platform.Characteristic.RotationSpeed)
@@ -118,88 +132,81 @@ export default class AirConditionerAccessory extends BaseAccessory {
             this.accessory.removeService(this.fanService);
         }
         // Display switch
-        this.displayService = this.accessory.getServiceById(this.platform.Service.Switch, 'Display');
+        this.displayService = this.accessory.getServiceById(this.platform.Service.Switch, displaySubtype);
         if (this.configDev.AC_options.displaySwitch.flag) {
             this.device.set_alternate_switch_display(this.configDev.AC_options.displaySwitch.command);
-            this.displayService ??= this.accessory.addService(this.platform.Service.Switch, `${this.device.name} Display`, 'Display');
-            this.displayService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Display`);
-            this.displayService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${this.device.name} Display`);
+            this.displayService ??= this.accessory.addService(this.platform.Service.Switch, undefined, displaySubtype);
+            this.handleConfiguredName(this.displayService, displaySubtype, 'Display');
             this.displayService.getCharacteristic(this.platform.Characteristic.On).onGet(this.getDisplayActive.bind(this)).onSet(this.setDisplayActive.bind(this));
         }
         else if (this.displayService) {
             this.accessory.removeService(this.displayService);
         }
         // Eco mode switch
-        this.ecoModeService = this.accessory.getServiceById(this.platform.Service.Switch, 'EcoMode');
+        this.ecoModeService = this.accessory.getServiceById(this.platform.Service.Switch, ecoModeSubtype);
         if (this.configDev.AC_options.ecoSwitch) {
-            this.ecoModeService ??= this.accessory.addService(this.platform.Service.Switch, `${this.device.name} Eco`, 'EcoMode');
-            this.ecoModeService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Eco`);
-            this.ecoModeService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${this.device.name} Eco`);
+            this.ecoModeService ??= this.accessory.addService(this.platform.Service.Switch, undefined, ecoModeSubtype);
+            this.handleConfiguredName(this.ecoModeService, ecoModeSubtype, 'Eco');
             this.ecoModeService.getCharacteristic(this.platform.Characteristic.On).onGet(this.getEcoMode.bind(this)).onSet(this.setEcoMode.bind(this));
         }
         else if (this.ecoModeService) {
             this.accessory.removeService(this.ecoModeService);
         }
         // Breeze away switch
-        this.breezeAwayService = this.accessory.getServiceById(this.platform.Service.Switch, 'BreezeAway');
+        this.breezeAwayService = this.accessory.getServiceById(this.platform.Service.Switch, breezeAwaySubtype);
         if (this.configDev.AC_options.breezeAwaySwitch) {
-            this.breezeAwayService ??= this.accessory.addService(this.platform.Service.Switch, `${this.device.name} Breeze`, 'BreezeAway');
-            this.breezeAwayService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Breeze`);
-            this.breezeAwayService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${this.device.name} Breeze`);
+            this.breezeAwayService ??= this.accessory.addService(this.platform.Service.Switch, undefined, breezeAwaySubtype);
+            this.handleConfiguredName(this.breezeAwayService, breezeAwaySubtype, 'Breeze');
             this.breezeAwayService.getCharacteristic(this.platform.Characteristic.On).onGet(this.getBreezeAway.bind(this)).onSet(this.setBreezeAway.bind(this));
         }
         else if (this.breezeAwayService) {
             this.accessory.removeService(this.breezeAwayService);
         }
         // Dry mode switch
-        this.dryModeService = this.accessory.getServiceById(this.platform.Service.Switch, 'DryMode');
+        this.dryModeService = this.accessory.getServiceById(this.platform.Service.Switch, dryModeSubtype);
         if (this.configDev.AC_options.dryModeSwitch) {
-            this.dryModeService ??= this.accessory.addService(this.platform.Service.Switch, `${this.device.name} Dry`, 'DryMode');
-            this.dryModeService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Dry`);
-            this.dryModeService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${this.device.name} Dry`);
+            this.dryModeService ??= this.accessory.addService(this.platform.Service.Switch, undefined, dryModeSubtype);
+            this.handleConfiguredName(this.dryModeService, dryModeSubtype, 'Dry');
             this.dryModeService.getCharacteristic(this.platform.Characteristic.On).onGet(this.getDryMode.bind(this)).onSet(this.setDryMode.bind(this));
         }
         else if (this.dryModeService) {
             this.accessory.removeService(this.dryModeService);
         }
-        this.boostModeService = this.accessory.getServiceById(this.platform.Service.Switch, 'BoostMode');
+        // Boost mode switch
+        this.boostModeService = this.accessory.getServiceById(this.platform.Service.Switch, boostModeSubtype);
         if (this.configDev.AC_options.boostModeSwitch) {
-            this.boostModeService ??= this.accessory.addService(this.platform.Service.Switch, `${this.device.name} Boost`, 'BoostMode');
-            this.boostModeService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Boost`);
-            this.boostModeService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${this.device.name} Boost`);
+            this.boostModeService ??= this.accessory.addService(this.platform.Service.Switch, undefined, boostModeSubtype);
+            this.handleConfiguredName(this.boostModeService, boostModeSubtype, 'Boost');
             this.boostModeService.getCharacteristic(this.platform.Characteristic.On).onGet(this.getBoostMode.bind(this)).onSet(this.setBoostMode.bind(this));
         }
         else if (this.boostModeService) {
             this.accessory.removeService(this.boostModeService);
         }
         // Aux switch
-        this.auxService = this.accessory.getServiceById(this.platform.Service.Switch, 'Aux');
+        this.auxService = this.accessory.getServiceById(this.platform.Service.Switch, auxSubtype);
         if (this.configDev.AC_options.auxHeatingSwitches) {
-            this.auxService ??= this.accessory.addService(this.platform.Service.Switch, `${this.device.name} Aux`, 'Aux');
-            this.auxService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Aux`);
-            this.auxService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${this.device.name} Aux`);
+            this.auxService ??= this.accessory.addService(this.platform.Service.Switch, undefined, auxSubtype);
+            this.handleConfiguredName(this.auxService, auxSubtype, 'Aux');
             this.auxService.getCharacteristic(this.platform.Characteristic.On).onGet(this.getAux.bind(this)).onSet(this.setAux.bind(this));
         }
         else if (this.auxService) {
             this.accessory.removeService(this.auxService);
         }
         // Aux+Heat switch
-        this.auxHeatingService = this.accessory.getServiceById(this.platform.Service.Switch, 'AuxHeating');
+        this.auxHeatingService = this.accessory.getServiceById(this.platform.Service.Switch, auxHeatingSubtype);
         if (this.configDev.AC_options.auxHeatingSwitches) {
-            this.auxHeatingService ??= this.accessory.addService(this.platform.Service.Switch, `${this.device.name} Aux+Heat`, 'AuxHeating');
-            this.auxHeatingService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Aux+Heat`);
-            this.auxHeatingService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${this.device.name} Aux+Heat`);
+            this.auxHeatingService ??= this.accessory.addService(this.platform.Service.Switch, undefined, auxHeatingSubtype);
+            this.handleConfiguredName(this.auxHeatingService, auxHeatingSubtype, 'Aux+Heat');
             this.auxHeatingService.getCharacteristic(this.platform.Characteristic.On).onGet(this.getAuxHeating.bind(this)).onSet(this.setAuxHeating.bind(this));
         }
         else if (this.auxHeatingService) {
             this.accessory.removeService(this.auxHeatingService);
         }
         // Self-cleaning switch
-        this.selfCleanService = this.accessory.getServiceById(this.platform.Service.Switch, 'SelfClean');
+        this.selfCleanService = this.accessory.getServiceById(this.platform.Service.Switch, selfCleanSubtype);
         if (this.configDev.AC_options.selfCleanSwitch) {
-            this.selfCleanService ??= this.accessory.addService(this.platform.Service.Switch, `${this.device.name} Self-cleaning`, 'SelfClean');
-            this.selfCleanService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Self-cleaning`);
-            this.selfCleanService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${this.device.name} Self-cleaning`);
+            this.selfCleanService ??= this.accessory.addService(this.platform.Service.Switch, undefined, selfCleanSubtype);
+            this.handleConfiguredName(this.selfCleanService, selfCleanSubtype, 'Self-cleaning');
             this.selfCleanService
                 .getCharacteristic(this.platform.Characteristic.On)
                 .onGet(this.getSelfCleanState.bind(this))
@@ -209,22 +216,20 @@ export default class AirConditionerAccessory extends BaseAccessory {
             this.accessory.removeService(this.selfCleanService);
         }
         // ION switch
-        this.ionService = this.accessory.getServiceById(this.platform.Service.Switch, 'ION');
+        this.ionService = this.accessory.getServiceById(this.platform.Service.Switch, ionSubtype);
         if (this.configDev.AC_options.ionSwitch) {
-            this.ionService ??= this.accessory.addService(this.platform.Service.Switch, `${this.device.name} ION`, 'ION');
-            this.ionService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} ION`);
-            this.ionService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${this.device.name} ION`);
+            this.ionService ??= this.accessory.addService(this.platform.Service.Switch, undefined, ionSubtype);
+            this.handleConfiguredName(this.ionService, ionSubtype, 'ION');
             this.ionService.getCharacteristic(this.platform.Characteristic.On).onGet(this.getIonState.bind(this)).onSet(this.setIonState.bind(this));
         }
         else if (this.ionService) {
             this.accessory.removeService(this.ionService);
         }
         // Rate select slider
-        this.rateSelectService = this.accessory.getServiceById(this.platform.Service.Lightbulb, 'Gear');
+        this.rateSelectService = this.accessory.getServiceById(this.platform.Service.Lightbulb, rateSelectSubtype);
         if (this.configDev.AC_options.rateSelector) {
-            this.rateSelectService ??= this.accessory.addService(this.platform.Service.Lightbulb, `${this.device.name} Gear`, 'Gear');
-            this.rateSelectService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Gear`);
-            this.rateSelectService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${this.device.name} Gear`);
+            this.rateSelectService ??= this.accessory.addService(this.platform.Service.Lightbulb, undefined, rateSelectSubtype);
+            this.handleConfiguredName(this.rateSelectService, rateSelectSubtype, 'Gear');
             this.rateSelectService.getCharacteristic(this.platform.Characteristic.On).onGet(this.getActive.bind(this)).onSet(this.setActive.bind(this));
             this.rateSelectService
                 .getCharacteristic(this.platform.Characteristic.Brightness)
@@ -238,26 +243,34 @@ export default class AirConditionerAccessory extends BaseAccessory {
             this.accessory.removeService(this.rateSelectService);
         }
         // Sleep mode accessory
-        this.sleepModeService = this.accessory.getServiceById(this.platform.Service.Switch, 'SleepMode');
+        this.sleepModeService = this.accessory.getServiceById(this.platform.Service.Switch, sleepModeSubtype);
         if (this.configDev.AC_options.sleepModeSwitch) {
-            this.sleepModeService ??= this.accessory.addService(this.platform.Service.Switch, `${this.device.name} Sleep`, 'SleepMode');
-            this.sleepModeService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Sleep`);
+            this.sleepModeService ??= this.accessory.addService(this.platform.Service.Switch, undefined, sleepModeSubtype);
+            this.handleConfiguredName(this.sleepModeService, sleepModeSubtype, 'Sleep');
             this.sleepModeService.getCharacteristic(this.platform.Characteristic.On).onGet(this.getSleepMode.bind(this)).onSet(this.setSleepMode.bind(this));
         }
         else if (this.sleepModeService) {
             this.accessory.removeService(this.sleepModeService);
         }
+        this.comfortModeService = this.accessory.getServiceById(this.platform.Service.Switch, comfortModeSubtype);
+        if (this.configDev.AC_options.comfortModeSwitch) {
+            this.comfortModeService ??= this.accessory.addService(this.platform.Service.Switch, undefined, comfortModeSubtype);
+            this.handleConfiguredName(this.comfortModeService, comfortModeSubtype, 'Comfort');
+            this.comfortModeService.getCharacteristic(this.platform.Characteristic.On).onGet(this.getComfortMode.bind(this)).onSet(this.setComfortMode.bind(this));
+        }
+        else if (this.comfortModeService) {
+            this.accessory.removeService(this.comfortModeService);
+        }
         const swingProps = this.configDev.AC_options.swing;
         this.swingAngleMainControl =
             swingProps.mode === SwingMode.VERTICAL || (swingProps.mode === SwingMode.BOTH && swingProps.angleMainControl === SwingAngle.VERTICAL)
                 ? SwingAngle.VERTICAL
                 : SwingAngle.HORIZONTAL;
         // Swing angle accessory
-        this.swingAngleService = this.accessory.getServiceById(this.platform.Service.WindowCovering, 'SwingAngle');
+        this.swingAngleService = this.accessory.getServiceById(this.platform.Service.WindowCovering, swingAngleSubtype);
         if (swingProps.mode !== SwingMode.NONE && swingProps.angleAccessory) {
-            this.swingAngleService ??= this.accessory.addService(this.platform.Service.WindowCovering, `${this.device.name} Swing`, 'SwingAngle');
-            this.swingAngleService.setCharacteristic(this.platform.Characteristic.Name, `${this.device.name} Swing`);
-            this.swingAngleService.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${this.device.name} Swing`);
+            this.swingAngleService ??= this.accessory.addService(this.platform.Service.WindowCovering, undefined, swingAngleSubtype);
+            this.handleConfiguredName(this.swingAngleService, swingAngleSubtype, 'Swing');
             this.swingAngleService.getCharacteristic(this.platform.Characteristic.CurrentPosition).onGet(this.getSwingAngleCurrentPosition.bind(this));
             this.swingAngleService
                 .getCharacteristic(this.platform.Characteristic.TargetPosition)
@@ -405,7 +418,9 @@ export default class AirConditionerAccessory extends BaseAccessory {
             : this.platform.Characteristic.TemperatureDisplayUnits.CELSIUS;
     }
     async setTemperatureDisplayUnits(value) {
-        await this.device.set_attribute({ TEMP_FAHRENHEIT: value === this.platform.Characteristic.TemperatureDisplayUnits.FAHRENHEIT });
+        await this.device.set_attribute({
+            TEMP_FAHRENHEIT: value === this.platform.Characteristic.TemperatureDisplayUnits.FAHRENHEIT,
+        });
     }
     getCurrentHeaterCoolerState() {
         if (this.device.attributes.POWER && this.device.attributes.MODE > 0 && this.device.attributes.MODE < 5) {
@@ -451,7 +466,7 @@ export default class AirConditionerAccessory extends BaseAccessory {
         return this.device.attributes.INDOOR_TEMPERATURE ?? this.configDev.AC_options.minTemp;
     }
     getTargetTemperature() {
-        return Math.max(this.configDev.AC_options.minTemp, Math.min(this.configDev.AC_options.maxTemp, this.device.attributes.TARGET_TEMPERATURE));
+        return limitValue(this.device.attributes.TARGET_TEMPERATURE, this.configDev.AC_options.minTemp, this.configDev.AC_options.maxTemp);
     }
     getFanOnlyMode() {
         return this.device.attributes.POWER === true && this.device.attributes.MODE === 5;
@@ -471,8 +486,7 @@ export default class AirConditionerAccessory extends BaseAccessory {
         await this.device.set_fan_auto(value === this.platform.Characteristic.TargetFanState.AUTO);
     }
     async setTargetTemperature(value) {
-        const limitedValue = Math.max(this.configDev.AC_options.minTemp, Math.min(this.configDev.AC_options.maxTemp, value));
-        await this.device.set_target_temperature(limitedValue);
+        await this.device.set_target_temperature(limitValue(value, this.configDev.AC_options.minTemp, this.configDev.AC_options.maxTemp));
     }
     getSwingMode() {
         return this.device.attributes.SWING_HORIZONTAL || this.device.attributes.SWING_VERTICAL
@@ -624,5 +638,18 @@ export default class AirConditionerAccessory extends BaseAccessory {
             await this.device.set_attribute({ SLEEP_MODE: false });
         }
     }
+    getComfortMode() {
+        return this.device.attributes.POWER === true && this.device.attributes.COMFORT_MODE
+            ? this.platform.Characteristic.Active.ACTIVE
+            : this.platform.Characteristic.Active.INACTIVE;
+    }
+    async setComfortMode(value) {
+        if (value === this.platform.Characteristic.Active.ACTIVE) {
+            await this.device.set_attribute({ POWER: true, COMFORT_MODE: true });
+        }
+        else {
+            await this.device.set_attribute({ COMFORT_MODE: false });
+        }
+    }
 }
 //# sourceMappingURL=AirConditionerAccessory.js.map