python-omnilogic-local 0.27.1__tar.gz → 0.28.1__tar.gz

{python_omnilogic_local-0.27.1 → python_omnilogic_local-0.28.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-omnilogic-local
-Version: 0.27.1
+Version: 0.28.1
 Summary: A library for local control of Hayward OmniHub/OmniLogic pool controllers using their local API
 Author: Chris Jowett, djtimca, garionphx
 Author-email: Chris Jowett <421501+cryptk@users.noreply.github.com>

{python_omnilogic_local-0.27.1 → python_omnilogic_local-0.28.1}/pyomnilogic_local/filter.py

@@ -6,11 +6,11 @@ from pyomnilogic_local._base import OmniEquipment
 from pyomnilogic_local.decorators import control_method
 from pyomnilogic_local.models.mspconfig import MSPFilter
 from pyomnilogic_local.models.telemetry import TelemetryFilter
-from pyomnilogic_local.omnitypes import FilterSpeedPresets, FilterState
+from pyomnilogic_local.omnitypes import FilterSpeedPresets, FilterState, FilterType
 from pyomnilogic_local.util import OmniEquipmentNotInitializedError
 
 if TYPE_CHECKING:
-    from pyomnilogic_local.omnitypes import FilterType, FilterValvePosition, FilterWhyOn
+    from pyomnilogic_local.omnitypes import FilterValvePosition, FilterWhyOn
 
 
 class Filter(OmniEquipment[MSPFilter, TelemetryFilter]):
@@ -219,10 +219,20 @@ class Filter(OmniEquipment[MSPFilter, TelemetryFilter]):
             msg = "Filter bow_id and system_id must be set"
             raise OmniEquipmentNotInitializedError(msg)
 
+        # If we are a Variable Speed filter, we want to try to turn on at the last speed setting
+        # This matches the behavior of the OmniLogic phone app
+        target_speed: int = 100
+        match self.equip_type:
+            case FilterType.VARIABLE_SPEED:
+                if self.last_speed >= self.min_percent and self.last_speed <= self.max_percent:
+                    target_speed = self.last_speed
+            case FilterType.SINGLE_SPEED:
+                target_speed = self.max_percent
+
         await self._api.async_set_equipment(
             pool_id=self.bow_id,
             equipment_id=self.system_id,
-            is_on=self.last_speed,
+            is_on=target_speed,
         )
 
     @control_method

{python_omnilogic_local-0.27.1 → python_omnilogic_local-0.28.1}/pyomnilogic_local/omnilogic.py

@@ -92,6 +92,8 @@ class OmniLogic:
         *,
         if_dirty: bool = True,
         if_older_than: float = 10.0,
+        force_telemetry: bool = False,
+        force_mspconfig: bool = False,
         force: bool = False,
     ) -> None:
         """Refresh the data from the OmniLogic controller.
@@ -101,14 +103,20 @@ class OmniLogic:
             telemetry: Whether to refresh Telemetry data (if conditions are met)
             if_dirty: Only refresh if the data has been marked dirty
             if_older_than: Only refresh if data is older than this many seconds
-            force: Force refresh regardless of dirty flag or age
+            force_telemetry: Force refresh of telemetry data regardless of dirty flag or age
+            force_mspconfig: Force refresh of MSPConfig data regardless of dirty flag or age
+            force: Force refresh of telemetry and MSPConfig (deprecated, use individual force flags instead)
         """
+        if force:
+            force_telemetry = True
+            force_mspconfig = True
+
         async with self._refresh_lock:
             current_time = time.time()
 
             # Determine if telemetry needs updating
             update_telemetry = False
-            if force or (if_dirty and self._telemetry_dirty) or ((current_time - self._telemetry_last_updated) > if_older_than):
+            if force_telemetry or (if_dirty and self._telemetry_dirty) or ((current_time - self._telemetry_last_updated) > if_older_than):
                 update_telemetry = True
 
             # Update telemetry if needed
@@ -119,7 +127,7 @@ class OmniLogic:
 
             # Determine if MSPConfig needs updating
             update_mspconfig = False
-            if force:
+            if force_mspconfig:
                 update_mspconfig = True
             if self.telemetry.backyard.config_checksum != self._mspconfig_checksum:
                 update_mspconfig = True

{python_omnilogic_local-0.27.1 → python_omnilogic_local-0.28.1}/pyomnilogic_local/pump.py

@@ -6,11 +6,11 @@ from pyomnilogic_local._base import OmniEquipment
 from pyomnilogic_local.decorators import control_method
 from pyomnilogic_local.models.mspconfig import MSPPump
 from pyomnilogic_local.models.telemetry import TelemetryPump
-from pyomnilogic_local.omnitypes import PumpSpeedPresets, PumpState
+from pyomnilogic_local.omnitypes import PumpSpeedPresets, PumpState, PumpType
 from pyomnilogic_local.util import OmniEquipmentNotInitializedError
 
 if TYPE_CHECKING:
-    from pyomnilogic_local.omnitypes import PumpFunction, PumpType
+    from pyomnilogic_local.omnitypes import PumpFunction
 
 
 class Pump(OmniEquipment[MSPPump, TelemetryPump]):
@@ -200,10 +200,20 @@ class Pump(OmniEquipment[MSPPump, TelemetryPump]):
             msg = "Pump bow_id and system_id must be set"
             raise OmniEquipmentNotInitializedError(msg)
 
+        # If we are a Variable Speed pump, we want to try to turn on at the last speed setting
+        # This matches the behavior of the OmniLogic phone app
+        target_speed: int = 100
+        match self.equip_type:
+            case PumpType.VARIABLE_SPEED:
+                if self.last_speed >= self.min_percent and self.last_speed <= self.max_percent:
+                    target_speed = self.last_speed
+            case PumpType.SINGLE_SPEED:
+                target_speed = self.max_percent
+
         await self._api.async_set_equipment(
             pool_id=self.bow_id,
             equipment_id=self.system_id,
-            is_on=True,
+            is_on=target_speed,
         )
 
     @control_method

{python_omnilogic_local-0.27.1 → python_omnilogic_local-0.28.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-omnilogic-local"
-version = "0.27.1"
+version = "0.28.1"
 description = "A library for local control of Hayward OmniHub/OmniLogic pool controllers using their local API"
 readme = "README.md"
 requires-python = ">=3.14.2"