fix(air purifier): improve particle filter service

tomekkleszcz · Apr 3, 2024 · 935e7fe · 935e7fe
1 parent f0a9dca
commit 935e7fe
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/src/accessories/devices/airPurifier/airPurifier.ts b/src/accessories/devices/airPurifier/airPurifier.ts
@@ -1,9 +1,10 @@
 import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
 
 import { ElectroluxDevicesPlatform } from '../../../platform';
-import { Appliance, FilterType } from '../../../definitions/appliance';
+import { Appliance } from '../../../definitions/appliance';
 import { ElectroluxAccessoryController } from '../../controller';
 import { Capabilities } from '../../../definitions/capabilities';
+import { isParticleFilter } from '../../../util/filters';
 
 export class AirPurifier extends ElectroluxAccessoryController {
     private airPurifierService: Service;
@@ -105,10 +106,8 @@ export class AirPurifier extends ElectroluxAccessoryController {
             );
 
         if (
-            this.appliance.properties.reported.FilterType_1 ===
-                FilterType.ParticleFilter ||
-            this.appliance.properties.reported.FilterType_2 ===
-                FilterType.ParticleFilter
+            isParticleFilter(this.appliance.properties.reported.FilterType_1) ||
+            isParticleFilter(this.appliance.properties.reported.FilterType_2)
         ) {
             this.particleFilterService =
                 this.accessory.getService(
@@ -302,20 +301,19 @@ export class AirPurifier extends ElectroluxAccessoryController {
     }
 
     async getParticleFilterChangeIndication(): Promise<CharacteristicValue> {
-        const filterLife =
-            this.appliance.properties.reported.FilterType_1 ===
-            FilterType.ParticleFilter
-                ? this.appliance.properties.reported.FilterLife_1
-                : this.appliance.properties.reported.FilterLife_2;
+        const filterLife = isParticleFilter(
+            this.appliance.properties.reported.FilterType_1
+        )
+            ? this.appliance.properties.reported.FilterLife_1
+            : this.appliance.properties.reported.FilterLife_2;
 
         return filterLife <= 10
             ? this.platform.Characteristic.FilterChangeIndication.CHANGE_FILTER
             : this.platform.Characteristic.FilterChangeIndication.FILTER_OK;
     }
 
     async getParticleFilterLifeLevel(): Promise<CharacteristicValue> {
-        return this.appliance.properties.reported.FilterType_1 ===
-            FilterType.ParticleFilter
+        return isParticleFilter(this.appliance.properties.reported.FilterType_1)
             ? this.appliance.properties.reported.FilterLife_1
             : this.appliance.properties.reported.FilterLife_2;
     }
@@ -384,11 +382,11 @@ export class AirPurifier extends ElectroluxAccessoryController {
             this.appliance.properties.reported.Fanspeed
         );
 
-        const filterLife =
-            this.appliance.properties.reported.FilterType_1 ===
-            FilterType.ParticleFilter
-                ? this.appliance.properties.reported.FilterLife_1
-                : this.appliance.properties.reported.FilterLife_2;
+        const filterLife = isParticleFilter(
+            this.appliance.properties.reported.FilterType_1
+        )
+            ? this.appliance.properties.reported.FilterLife_1
+            : this.appliance.properties.reported.FilterLife_2;
 
         this.particleFilterService?.updateCharacteristic(
             this.platform.Characteristic.FilterChangeIndication,

diff --git a/src/definitions/appliance.ts b/src/definitions/appliance.ts
@@ -73,6 +73,7 @@ type State = 'good';
 type WorkMode = 'Manual' | 'Auto' | 'PowerOff';
 
 export enum FilterType {
-    ParticleFilter = 49,
+    ParticleFilter1 = 48,
+    ParticleFilter2 = 49,
     OdorFilter = 192
 }
diff --git a/src/util/filters.ts b/src/util/filters.ts
@@ -0,0 +1,5 @@
+import { FilterType } from '../definitions/appliance';
+
+export const isParticleFilter = (filterType: FilterType) =>
+    filterType === FilterType.ParticleFilter1 ||
+    filterType === FilterType.ParticleFilter2;