python-omnilogic-local 0.20.8__tar.gz → 0.20.10__tar.gz

{python_omnilogic_local-0.20.8 → python_omnilogic_local-0.20.10}/PKG-INFO

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

@@ -550,7 +550,7 @@ class OmniLogicAPI:
         sc_timeout: int,
         bow_type: int,
         orp_timeout: int,
-        cfg_state: int = 3,
+        cfg_state: int = 3,  # 3 == on, 2 == off
     ) -> None:
         body_element = ET.Element("Request", {"xmlns": XML_NAMESPACE})
 

{python_omnilogic_local-0.20.8 → python_omnilogic_local-0.20.10}/pyomnilogic_local/chlorinator.py

@@ -14,7 +14,7 @@ from pyomnilogic_local.util import OmniEquipmentNotInitializedError
 if TYPE_CHECKING:
     from pyomnilogic_local.models.telemetry import Telemetry
     from pyomnilogic_local.omnilogic import OmniLogic
-    from pyomnilogic_local.omnitypes import ChlorinatorCellType, ChlorinatorOperatingMode
+    from pyomnilogic_local.omnitypes import ChlorinatorCellType, ChlorinatorDispenserType, ChlorinatorOperatingMode
 
 
 class Chlorinator(OmniEquipment[MSPChlorinator, TelemetryChlorinator]):
@@ -83,7 +83,7 @@ class Chlorinator(OmniEquipment[MSPChlorinator, TelemetryChlorinator]):
         return self.mspconfig.orp_timeout
 
     @property
-    def dispenser_type(self) -> str:
+    def dispenser_type(self) -> ChlorinatorDispenserType:
         """Type of chlorine dispenser (SALT, LIQUID, or TABLET)."""
         return self.mspconfig.dispenser_type
 
@@ -99,7 +99,7 @@ class Chlorinator(OmniEquipment[MSPChlorinator, TelemetryChlorinator]):
         return self.telemetry.operating_state
 
     @property
-    def operating_mode(self) -> ChlorinatorOperatingMode | int:
+    def operating_mode(self) -> ChlorinatorOperatingMode:
         """Current operating mode (DISABLED, TIMED, ORP_AUTO, or ORP_TIMED_RW).
 
         Returns:

{python_omnilogic_local-0.20.8 → python_omnilogic_local-0.20.10}/pyomnilogic_local/cli/debug/commands.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 
 import asyncio
 from pathlib import Path
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, cast
 
 import click
 
@@ -15,6 +15,7 @@ from pyomnilogic_local.cli.utils import async_get_filter_diagnostics
 
 if TYPE_CHECKING:
     from pyomnilogic_local.api.api import OmniLogicAPI
+    from pyomnilogic_local.models.telemetry import TelemetryChlorinator
 
 
 @click.group()
@@ -209,3 +210,122 @@ def set_equipment(ctx: click.Context, bow_id: int, equip_id: int, is_on: str) ->
     except Exception as e:
         click.echo(f"Error setting equipment: {e}", err=True)
         raise click.Abort from e
+
+
+@debug.command()
+@click.argument("bow_id", type=int)
+@click.argument("equip_id", type=int)
+@click.argument("timed_percent", type=int)
+@click.argument("op_mode", type=int)
+@click.pass_context
+def set_chlor_params(ctx: click.Context, bow_id: int, equip_id: int, timed_percent: int, op_mode: int) -> None:
+    """Set chlorinator parameters with explicit control over configuration.
+
+    This command sets chlorinator parameters using the current chlorinator's
+    configuration for cell_type, sc_timeout, bow_type, and orp_timeout, while
+    allowing you to specify timed_percent and op_mode. The cfg_state is derived
+    from the chlorinator's current on/off state.
+
+    BOW_ID: The Body of Water (pool/spa) system ID
+    EQUIP_ID: The chlorinator equipment system ID
+    TIMED_PERCENT: Chlorine generation percentage (0-100)
+    OP_MODE: Operating mode (0=DISABLED, 1=TIMED, 2=ORP_AUTO, 3=ORP_TIMED_RW)
+
+    Examples:
+        # Set chlorinator to 75% in TIMED mode
+        omnilogic --host 192.168.1.100 debug set-chlor-params 7 12 75 1
+
+        # Disable chlorinator
+        omnilogic --host 192.168.1.100 debug set-chlor-params 7 12 0 0
+
+        # Set to ORP AUTO mode with 50% generation
+        omnilogic --host 192.168.1.100 debug set-chlor-params 7 12 50 2
+
+    """
+    ensure_connection(ctx)
+    omni: OmniLogicAPI = ctx.obj["OMNI"]
+
+    # Validate timed_percent
+    if not 0 <= timed_percent <= 100:
+        click.echo(f"Error: timed_percent must be between 0-100, got {timed_percent}", err=True)
+        raise click.Abort
+
+    # Validate op_mode
+    if not 0 <= op_mode <= 2:
+        click.echo(f"Error: op_mode must be between 0-3, got {op_mode}", err=True)
+        raise click.Abort
+
+    # Get MSPConfig and Telemetry to find the chlorinator
+    try:
+        mspconfig_raw = asyncio.run(omni.async_get_mspconfig(raw=False))
+        telemetry_raw = asyncio.run(omni.async_get_telemetry(raw=False))
+    except Exception as e:
+        click.echo(f"Error retrieving configuration: {e}", err=True)
+        raise click.Abort from e
+
+    # Find the BOW
+    bow = None
+    if mspconfig_raw.backyard.bow:
+        for candidate_bow in mspconfig_raw.backyard.bow:
+            if candidate_bow.system_id == bow_id:
+                bow = candidate_bow
+                break
+
+    if bow is None:
+        click.echo(f"Error: Body of Water with ID {bow_id} not found", err=True)
+        raise click.Abort
+
+    # Find the chlorinator
+    if bow.chlorinator is None or bow.chlorinator.system_id != equip_id:
+        click.echo(f"Error: Chlorinator with ID {equip_id} not found in BOW {bow_id}", err=True)
+        raise click.Abort
+
+    chlorinator = bow.chlorinator
+
+    # Get telemetry for the chlorinator to determine is_on state
+    chlorinator_telemetry = telemetry_raw.get_telem_by_systemid(equip_id)
+    if chlorinator_telemetry is None:
+        click.echo(f"Warning: No telemetry found for chlorinator {equip_id}, defaulting cfg_state to 3 (on)", err=True)
+        cfg_state = 3
+    else:
+        # Cast to TelemetryChlorinator to access enable attribute
+        chlorinator_telem = cast("TelemetryChlorinator", chlorinator_telemetry)
+        # Determine cfg_state from enable flag in telemetry
+        cfg_state = 3 if chlorinator_telem.enable else 2
+
+    # Determine bow_type from equipment type (0=pool, 1=spa)
+    bow_type = 0 if bow.equip_type == "BOW_POOL" else 1
+
+    # Get parameters from chlorinator config
+    cell_type = chlorinator.cell_type.value
+    sc_timeout = chlorinator.superchlor_timeout
+    orp_timeout = chlorinator.orp_timeout
+
+    # Execute the command
+    try:
+        asyncio.run(
+            omni.async_set_chlorinator_params(
+                pool_id=bow_id,
+                equipment_id=equip_id,
+                timed_percent=timed_percent,
+                cell_type=cell_type,
+                op_mode=op_mode,
+                sc_timeout=sc_timeout,
+                bow_type=bow_type,
+                orp_timeout=orp_timeout,
+                cfg_state=cfg_state,
+            )
+        )
+        click.echo(
+            f"Sent command to chlorinator {equip_id} in BOW {bow_id}:\n"
+            f"  Timed Percent: {timed_percent}%\n"
+            f"  Operating Mode: {op_mode}\n"
+            f"  Config State: {cfg_state} ({'on' if cfg_state == 3 else 'off'})\n"
+            f"  Cell Type: {cell_type}\n"
+            f"  SC Timeout: {sc_timeout}\n"
+            f"  BOW Type: {bow_type}\n"
+            f"  ORP Timeout: {orp_timeout}"
+        )
+    except Exception as e:
+        click.echo(f"Error setting chlorinator parameters: {e}", err=True)
+        raise click.Abort from e

{python_omnilogic_local-0.20.8 → python_omnilogic_local-0.20.10}/pyomnilogic_local/colorlogiclight.py

@@ -117,7 +117,7 @@ class ColorLogicLight(OmniEquipment[MSPColorLogicLight, TelemetryColorLogicLight
         super().__init__(omni, mspconfig, telemetry)
 
     @property
-    def model(self) -> ColorLogicLightType:
+    def equip_type(self) -> ColorLogicLightType:
         """Returns the model of the light."""
         return self.mspconfig.equip_type
 
@@ -168,12 +168,17 @@ class ColorLogicLight(OmniEquipment[MSPColorLogicLight, TelemetryColorLogicLight
     @property
     def show(self) -> LightShows:
         """Returns the current light show."""
-        return self.telemetry.show_name(self.model, self.v2_active)
+        return self.telemetry.show_name(self.equip_type, self.v2_active)
 
     @property
     def speed(self) -> ColorLogicSpeed:
         """Returns the current speed."""
-        if self.model in [ColorLogicLightType.SAM, ColorLogicLightType.TWO_FIVE, ColorLogicLightType.FOUR_ZERO, ColorLogicLightType.UCL]:
+        if self.equip_type in [
+            ColorLogicLightType.SAM,
+            ColorLogicLightType.TWO_FIVE,
+            ColorLogicLightType.FOUR_ZERO,
+            ColorLogicLightType.UCL,
+        ]:
             return self.telemetry.speed
         # Non color-logic lights only support 1x speed
         return ColorLogicSpeed.ONE_TIMES
@@ -181,7 +186,12 @@ class ColorLogicLight(OmniEquipment[MSPColorLogicLight, TelemetryColorLogicLight
     @property
     def brightness(self) -> ColorLogicBrightness:
         """Returns the current brightness."""
-        if self.model in [ColorLogicLightType.SAM, ColorLogicLightType.TWO_FIVE, ColorLogicLightType.FOUR_ZERO, ColorLogicLightType.UCL]:
+        if self.equip_type in [
+            ColorLogicLightType.SAM,
+            ColorLogicLightType.TWO_FIVE,
+            ColorLogicLightType.FOUR_ZERO,
+            ColorLogicLightType.UCL,
+        ]:
             return self.telemetry.brightness
         # Non color-logic lights only support 100% brightness
         return ColorLogicBrightness.ONE_HUNDRED_PERCENT
@@ -262,17 +272,17 @@ class ColorLogicLight(OmniEquipment[MSPColorLogicLight, TelemetryColorLogicLight
             and a warning will be logged.
         """
         # Non color-logic lights do not support speed or brightness control
-        if self.model not in [
+        if self.equip_type not in [
             ColorLogicLightType.SAM,
             ColorLogicLightType.TWO_FIVE,
             ColorLogicLightType.FOUR_ZERO,
             ColorLogicLightType.UCL,
         ]:
             if speed is not None:
-                _LOGGER.warning("Non colorlogic lights do not support speed control %s", self.model.name)
+                _LOGGER.warning("Non colorlogic lights do not support speed control %s", self.equip_type.name)
                 speed = ColorLogicSpeed.ONE_TIMES
             if brightness is not None:
-                _LOGGER.warning("Non colorlogic lights do not support brightness control %s", self.model.name)
+                _LOGGER.warning("Non colorlogic lights do not support brightness control %s", self.equip_type.name)
                 brightness = ColorLogicBrightness.ONE_HUNDRED_PERCENT
 
         if self.bow_id is None or self.system_id is None:

{python_omnilogic_local-0.20.8 → python_omnilogic_local-0.20.10}/pyomnilogic_local/omnitypes.py

@@ -150,7 +150,7 @@ class ChlorinatorOperatingMode(IntEnum, PrettyEnum):
     DISABLED = 0
     TIMED = 1
     ORP_AUTO = 2
-    ORP_TIMED_RW = 3  # Chlorinator in ORP mode experienced condition that prevents ORP operation
+    ORP_TIMED_RW = 3  # Chlorinator in ORP mode experienced CSAD condition that prevents ORP operation
 
 
 class ChlorinatorType(StrEnum, PrettyEnum):

{python_omnilogic_local-0.20.8 → python_omnilogic_local-0.20.10}/pyomnilogic_local/sensor.py

@@ -86,7 +86,7 @@ class Sensor(OmniEquipment[MSPSensor, None]):
         super().__init__(omni, mspconfig, telemetry)
 
     @property
-    def sensor_type(self) -> SensorType | str:
+    def equip_type(self) -> SensorType | str:
         """Returns the type of sensor.
 
         Can be AIR_TEMP, SOLAR_TEMP, WATER_TEMP, FLOW, ORP, or EXT_INPUT.

{python_omnilogic_local-0.20.8 → python_omnilogic_local-0.20.10}/pyproject.toml

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