fix(thermostat): set thermostatRunningState more explicit

related to #241
t0bst4r · Dec 5, 2024 · 8617c88 · 8617c88
1 parent 3dd52e9
commit 8617c88
Showing 1 changed file with 25 additions and 12 deletions.
diff --git a/packages/backend/src/matter/behaviors/thermostat-server.ts b/packages/backend/src/matter/behaviors/thermostat-server.ts
@@ -210,36 +210,45 @@ export class ThermostatServerBase extends FeaturedBase {
     currentTemperature: number | undefined,
     targetTemperature: number | undefined,
   ): ThermostatRunningState {
+    const allOff: ThermostatRunningState = {
+      cool: false,
+      fan: false,
+      heat: false,
+      heatStage2: false,
+      coolStage2: false,
+      fanStage2: false,
+      fanStage3: false,
+    };
     switch (hvacAction ?? state) {
       case ClimateHvacAction.preheating:
       case ClimateHvacAction.defrosting:
       case ClimateHvacAction.heating:
       case ClimateHvacMode.heat:
-        return { heat: true };
+        return { ...allOff, heat: true };
       case ClimateHvacAction.cooling:
       case ClimateHvacMode.cool:
-        return { cool: true };
+        return { ...allOff, cool: true };
       case ClimateHvacAction.drying:
       case ClimateHvacMode.dry:
-        return { heat: true, fan: true };
+        return { ...allOff, heat: true, fan: true };
       case ClimateHvacMode.fan_only:
       case ClimateHvacAction.fan:
-        return { fan: true };
+        return { ...allOff, fan: true };
       case ClimateHvacAction.idle:
       case ClimateHvacAction.off:
       case ClimateHvacMode.off:
-        return {};
+        return allOff;
       case ClimateHvacMode.heat_cool:
       case ClimateHvacMode.auto:
         return currentTemperature == undefined ||
           targetTemperature == undefined ||
           currentTemperature === targetTemperature
-          ? {}
+          ? allOff
           : currentTemperature < targetTemperature
-            ? { heat: true }
-            : { cool: true };
+            ? { ...allOff, heat: true }
+            : { ...allOff, cool: true };
     }
-    return {};
+    return allOff;
   }
 
   private getHvacMode(systemMode: Thermostat.SystemMode): ClimateHvacMode {
@@ -283,7 +292,11 @@ export class ThermostatServer extends ThermostatServerBase.for(
 ) {}
 
 interface ThermostatRunningState {
-  heat?: boolean;
-  cool?: boolean;
-  fan?: boolean;
+  heat: boolean;
+  cool: boolean;
+  fan: boolean;
+  heatStage2: false;
+  coolStage2: false;
+  fanStage2: false;
+  fanStage3: false;
 }