Move the weight to the requested_setpoint

Alexwijn · Jan 21, 2025 · 824038e · 824038e
1 parent 7b396da
commit 824038e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/custom_components/sat/area.py b/custom_components/sat/area.py
@@ -139,7 +139,7 @@ def update(self, current_outside_temperature: float) -> None:
                 if area.target_temperature is None:
                     continue
 
-                area.heating_curve.update(area.target_temperature * area.weight, current_outside_temperature)
+                area.heating_curve.update(area.target_temperature, current_outside_temperature)
 
     class _PIDs:
         def __init__(self, areas: list[Area]):
@@ -148,12 +148,12 @@ def __init__(self, areas: list[Area]):
         def update(self, boiler_temperature: float) -> None:
             for area in self.areas:
                 if area.error is not None:
-                    area.pid.update(area.error * area.weight, area.heating_curve.value, boiler_temperature)
+                    area.pid.update(area.error, area.heating_curve.value, boiler_temperature)
 
         def update_reset(self) -> None:
             for area in self.areas:
                 if area.error is not None:
-                    area.pid.update_reset(area.error * area.weight, area.heating_curve.value)
+                    area.pid.update_reset(area.error, area.heating_curve.value)
 
         def reset(self) -> None:
             """Reset PID controllers for all areas."""

diff --git a/custom_components/sat/climate.py b/custom_components/sat/climate.py
@@ -507,16 +507,18 @@ def requested_setpoint(self) -> float:
 
         The setpoint is determined primarily by the global heating curve and PID output.
         If the system is in 'comfort mode' and a focus area is defined with higher priority (based on its error),
-        the setpoint will be overridden by the focus area's heating curve and PID output.
+        the setpoint will be overridden by the focus area's heating curve and PID output multiplied by its weight.
 
         The setpoint is always constrained to be above the minimum allowable setpoint.
         """
         # Default to global heating curve and PID output
+        weight = 1.0
         pid_output = self.pid.output
         heating_curve = self.heating_curve.value
 
         # Override with focus area values in comfort mode
         if self._heating_mode == HEATING_MODE_COMFORT and self.areas.focus is not None and self.areas.focus.error > self.error:
+            weight = self.areas.focus.weight
             pid_output = self.areas.focus.pid.output
             heating_curve = self.areas.focus.heating_curve.value
 
@@ -525,7 +527,7 @@ def requested_setpoint(self) -> float:
             return MINIMUM_SETPOINT
 
         # Calculate and constrain the setpoint to be no less than the minimum allowed value
-        return round(max(heating_curve + pid_output, MINIMUM_SETPOINT), 1)
+        return round(max((heating_curve + pid_output) * weight, MINIMUM_SETPOINT), 1)
 
     @property
     def valves_open(self) -> bool: