python-omnilogic-local 0.28.0__tar.gz → 0.28.2__tar.gz

{python_omnilogic_local-0.28.0 → python_omnilogic_local-0.28.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-omnilogic-local
-Version: 0.28.0
+Version: 0.28.2
 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.28.0 → python_omnilogic_local-0.28.2}/pyomnilogic_local/api/protocol.py

@@ -43,7 +43,7 @@ class OmniLogicMessage:
     payload: bytes
     client_type: ClientType = ClientType.SIMPLE
     version: str = PROTOCOL_VERSION
-    timestamp: int | None = int(time.time())
+    timestamp: int
     reserved_1: int = 0
     compressed: bool = False
     reserved_2: int = 0
@@ -54,6 +54,7 @@ class OmniLogicMessage:
         msg_type: MessageType,
         payload: str | None = None,
         version: str = PROTOCOL_VERSION,
+        timestamp: int | None = None,
     ) -> None:
         """Initialize a new OmniLogicMessage.
 
@@ -62,6 +63,7 @@ class OmniLogicMessage:
             msg_type: Type of message being sent.
             payload: Optional string payload (XML or command body).
             version: Protocol version string.
+            timestamp: Optional timestamp for the message.
         """
         self.id = msg_id
         self.type = msg_type
@@ -72,6 +74,7 @@ class OmniLogicMessage:
         self.payload = bytes(payload, "utf-8")
 
         self.version = version
+        self.timestamp = timestamp if timestamp is not None else int(time.time())
 
     def __bytes__(self) -> bytes:
         """Serialize the message to bytes for UDP transmission.

{python_omnilogic_local-0.28.0 → python_omnilogic_local-0.28.2}/pyomnilogic_local/cli/utils.py

@@ -7,29 +7,10 @@ accessing controller data within the Click context.
 from __future__ import annotations
 
 import inspect
-import os
 from typing import Any
 
 import click
 
-from pyomnilogic_local.api.api import OmniLogicAPI
-from pyomnilogic_local.api.mock_api import OmniLogicMockAPI
-
-
-async def get_omni(host: str) -> OmniLogicAPI:
-    """Create an OmniLogicAPI instance for the specified controller.
-
-    Args:
-        host: Hostname or IP address of the OmniLogic controller
-
-    Returns:
-        Configured OmniLogicAPI instance ready for communication
-    """
-    sim_data_path = os.environ.get("PYOMNILOGIC_SIMULATION_DATA")
-    if sim_data_path:
-        return OmniLogicMockAPI(sim_data_path)  # type: ignore[return-value]
-    return OmniLogicAPI(host, 10444, 5.0)
-
 
 def echo_properties(obj: Any) -> None:
     """Echo all properties of an object in a formatted way."""

{python_omnilogic_local-0.28.0 → python_omnilogic_local-0.28.2}/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.28.0 → python_omnilogic_local-0.28.2}/pyomnilogic_local/omnitypes.py

@@ -120,7 +120,7 @@ class ChlorinatorAlert(Flag):
     LOW_VOLTAGE = 1 << 3  # Low voltage alert
     CELL_TEMP_LOW = 1 << 4  # Cell water temperature low
     CELL_TEMP_SCALEBACK = 1 << 5  # Cell water temperature scaleback
-    # CELL_TEMP_LOW and CELL_TEMP_SCALEBACK = CELL_TEMP_HIGH
+    # NOTE: if both CELL_TEMP_LOW and CELL_TEMP_SCALEBACK are set, it indicates CELL_TEMP_HIGH
     BOARD_TEMP_HIGH = 1 << 6  # Board temperature high
     BOARD_TEMP_CLEARING = 1 << 7  # Board temperature clearing
     CELL_CLEAN = 1 << 11  # Cell cleaning runtime alert

{python_omnilogic_local-0.28.0 → python_omnilogic_local-0.28.2}/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.28.0 → python_omnilogic_local-0.28.2}/pyproject.toml

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