Merge pull request #295 from dimabobrov/customization-options

Add option to disable energy save and air clean switches
nVuln · Jun 14, 2024 · a82d5ec · a82d5ec
2 parents f35e3f6 + 3cd09ad
commit a82d5ec
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 10 deletions.
diff --git a/config.schema.json b/config.schema.json
@@ -211,6 +211,16 @@
               }
             }
           },
+          "ac_energy_save": {
+            "title": "Energy save as switch",
+            "type": "boolean",
+            "default": true
+          },
+          "ac_air_clean": {
+            "title": "Air purify as switch",
+            "type": "boolean",
+            "default": true
+          },
           "ac_temperature_unit": {
             "title": "Temperature Unit",
             "type": "string",
@@ -328,6 +338,8 @@
                 "devices[].ac_temperature_sensor",
                 "devices[].ac_humidity_sensor",
                 "devices[].ac_fan_control",
+                "devices[].ac_energy_save",
+                "devices[].ac_air_clean",
                 "devices[].ac_temperature_unit",
                 {
                   "key": "devices[].ac_buttons",

diff --git a/src/devices/AirConditioner.ts b/src/devices/AirConditioner.ts
@@ -128,17 +128,37 @@ export default class AirConditioner extends baseDevice {
     }
 
     if (this.energySaveModeModels.includes(device.model)) {
-      this.serviceEnergySaveMode = accessory.getService('Energy save') || accessory.addService(Switch, 'Energy save', 'Energy save');
-      this.serviceEnergySaveMode.updateCharacteristic(platform.Characteristic.Name, 'Energy save');
-      this.serviceEnergySaveMode.getCharacteristic(platform.Characteristic.On)
-        .onSet(this.setEnergySaveActive.bind(this));
+      this.serviceEnergySaveMode = accessory.getService('Energy save');
+
+      if (this.config.ac_energy_save as boolean) {
+        if (!this.serviceEnergySaveMode) {
+          accessory.addService(Switch, 'Energy save', 'Energy save');
+        }
+
+        this.serviceEnergySaveMode.updateCharacteristic(platform.Characteristic.Name, 'Energy save');
+        this.serviceEnergySaveMode.getCharacteristic(platform.Characteristic.On)
+          .onSet(this.setEnergySaveActive.bind(this));
+      } else if (this.serviceEnergySaveMode) {
+        accessory.removeService(this.serviceEnergySaveMode);
+        this.serviceEnergySaveMode = null;
+      }
     }
 
     if (this.airCleanModels.includes(device.model)) {
-      this.serviceAirClean = accessory.getService('Air Purify') || accessory.addService(Switch, 'Air Purify', 'Air Purify');
-      this.serviceAirClean.updateCharacteristic(platform.Characteristic.Name, 'Air Purify');
-      this.serviceAirClean.getCharacteristic(platform.Characteristic.On)
-        .onSet(this.setAirCleanActive.bind(this));
+      this.serviceAirClean = accessory.getService('Air Purify');
+
+      if (this.config.ac_air_clean as boolean) {
+        if (!this.serviceAirClean) {
+          accessory.addService(Switch, 'Air Purify', 'Air Purify');
+        }
+
+        this.serviceAirClean.updateCharacteristic(platform.Characteristic.Name, 'Air Purify');
+        this.serviceAirClean.getCharacteristic(platform.Characteristic.On)
+          .onSet(this.setAirCleanActive.bind(this));
+      } else if (this.serviceAirClean) {
+        accessory.removeService(this.serviceAirClean);
+        this.serviceAirClean = null;
+      }
     }
 
     this.setupButton(device);
@@ -347,11 +367,11 @@ export default class AirConditioner extends baseDevice {
       this.serviceQuietMode.updateCharacteristic(Characteristic.On, !!device.snapshot['airState.miscFuncState.silentAWHP']);
     }
 
-    if (this.energySaveModeModels.includes(device.model)) {
+    if (this.energySaveModeModels.includes(device.model) && this.config.ac_energy_save as boolean) {
       this.serviceEnergySaveMode.updateCharacteristic(Characteristic.On, !!device.snapshot['airState.powerSave.basic']);
     }
 
-    if (this.airCleanModels.includes(device.model)) {
+    if (this.airCleanModels.includes(device.model) && this.config.ac_air_clean as boolean) {
       this.serviceAirClean.updateCharacteristic(Characteristic.On, !!device.snapshot['airState.wMode.airClean']);
     }
   }