refactor(zeo): replace raw integer fields with enum types

Update ZeoStartParams, ZeoCustomMode, and ZeoDryerCustomMode to use typed enum fields (ZeoMode, ZeoProgram, ZeoTemperature, etc.) instead of raw int, aligning with the V1 container pattern in v1_containers.py. Rename shorthand fields (rinse_times→rinse, spin_level→spin) for consistency across all three classes. Unify drying-mode field naming.

Author: NOisi-X

roborock/data/zeo/zeo_containers.py

@@ -3,6 +3,18 @@
 from dataclasses import dataclass
 
 from ..containers import RoborockBase
+from .zeo_code_mappings import (
+    ZeoDryAndCare,
+    ZeoDryingMethod,
+    ZeoDryingMode,
+    ZeoMode,
+    ZeoProgram,
+    ZeoRinse,
+    ZeoSoak,
+    ZeoSpin,
+    ZeoSteamVolume,
+    ZeoTemperature,
+)
 
 
 @dataclass
@@ -14,23 +26,12 @@ class ZeoStartParams(RoborockBase):
     included when the device reports a non-None value.
     """
 
-    mode: int
-    """Wash mode (e.g. wash, wash-and-dry, dry, treatment)."""
-
-    program: int
-    """Wash program (e.g. standard, quick, wool)."""
-
-    temp: int | None = None
-    """Water temperature (always ``None`` for dryers)."""
-
-    rinse_times: int | None = None
-    """Number of rinse cycles (always ``None`` for dryers)."""
-
-    spin_level: int | None = None
-    """Spin speed in RPM (always ``None`` for dryers)."""
-
-    drying_mode: int | None = None
-    """Drying mode (e.g. quick, iron, store)."""
+    mode: ZeoMode
+    program: ZeoProgram
+    temperature: ZeoTemperature | None = None
+    rinse: ZeoRinse | None = None
+    spin: ZeoSpin | None = None
+    drying_mode: ZeoDryingMode | None = None
 
 
 # ── DP 222 (LoadCloudProgram) bitfield decoder ──────────────────────────
@@ -48,31 +49,31 @@ class ZeoCustomMode(RoborockBase):
     always non-negative).
     """
 
-    program: int
+    program: ZeoProgram
     """Wash program (bits 0-7)."""
 
-    mode: int
+    mode: ZeoMode
     """Wash mode (bits 8-9)."""
 
-    temperature: int
+    temperature: ZeoTemperature
     """Temperature (bits 10-12)."""
 
-    rinse: int
+    rinse: ZeoRinse
     """Rinse cycle (bits 13-15)."""
 
-    spin: int
+    spin: ZeoSpin
     """Spin speed (bits 16-18)."""
 
-    dry: int
+    drying_mode: ZeoDryingMode
     """Drying mode (bits 19-21)."""
 
-    soak: int
+    soak: ZeoSoak
     """Soak (bits 22-24)."""
 
-    dry_care_mode: int
+    dry_and_care: ZeoDryAndCare
     """Dry-care mode (bits 25-27)."""
 
-    steam_volume: int
+    steam_volume: ZeoSteamVolume
     """Steam volume (bits 28-30)."""
 
     total_time_min: int = 0
@@ -82,15 +83,15 @@ class ZeoCustomMode(RoborockBase):
     def from_raw(cls, raw: int, total_time_min: int | None = None) -> "ZeoCustomMode":
         """Decode a raw 32-bit custom-programme value."""
         return cls(
-            program=(raw & 0xFF),
-            mode=(raw >> 8) & 0x3,
-            temperature=(raw >> 10) & 0x7,
-            rinse=(raw >> 13) & 0x7,
-            spin=(raw >> 16) & 0x7,
-            dry=(raw >> 19) & 0x7,
-            soak=(raw >> 22) & 0x7,
-            dry_care_mode=(raw >> 25) & 0x7,
-            steam_volume=(raw >> 28) & 0x7,
+            program=ZeoProgram(raw & 0xFF),
+            mode=ZeoMode((raw >> 8) & 0x3),
+            temperature=ZeoTemperature((raw >> 10) & 0x7),
+            rinse=ZeoRinse((raw >> 13) & 0x7),
+            spin=ZeoSpin((raw >> 16) & 0x7),
+            drying_mode=ZeoDryingMode((raw >> 19) & 0x7),
+            soak=ZeoSoak((raw >> 22) & 0x7),
+            dry_and_care=ZeoDryAndCare((raw >> 25) & 0x7),
+            steam_volume=ZeoSteamVolume((raw >> 28) & 0x7),
             total_time_min=total_time_min or 0,
         )
 
@@ -104,19 +105,19 @@ class ZeoDryerCustomMode(RoborockBase):
     in module 725 of the plugin bundle.
     """
 
-    program: int
+    program: ZeoProgram
     """Drying program (bits 0-7)."""
 
-    mode: int
+    mode: ZeoMode
     """Drying mode (bits 8-10)."""
 
-    dry: int
+    drying_mode: ZeoDryingMode
     """Drying level (bits 11-13)."""
 
-    dry_method: int
+    drying_method: ZeoDryingMethod
     """Drying method (bits 14-16)."""
 
-    steam_volume: int
+    steam_volume: ZeoSteamVolume
     """Steam volume (bits 17-19)."""
 
     total_time_min: int = 0
@@ -126,14 +127,14 @@ class ZeoDryerCustomMode(RoborockBase):
     def from_raw(cls, raw: int, total_time_min: int | None = None) -> "ZeoDryerCustomMode":
         """Decode a raw 32-bit dryer custom-programme value."""
         return cls(
-            program=(raw & 0xFF),
+            program=ZeoProgram(raw & 0xFF),
             # Dryer mode spans bits 8-10 (0x700, 3 bits) because the
             # temperature field is absent from the dryer bitfield and
             # bit 10 is re-allocated to mode.  Washer uses 2 bits
             # (0x300, bits 8-9) to make room for temperature at 10-12.
-            mode=(raw >> 8) & 0x7,
-            dry=(raw >> 11) & 0x7,
-            dry_method=(raw >> 14) & 0x7,
-            steam_volume=(raw >> 17) & 0x7,
+            mode=ZeoMode((raw >> 8) & 0x7),
+            drying_mode=ZeoDryingMode((raw >> 11) & 0x7),
+            drying_method=ZeoDryingMethod((raw >> 14) & 0x7),
+            steam_volume=ZeoSteamVolume((raw >> 17) & 0x7),
             total_time_min=total_time_min or 0,
         )