lifx-emulator 2.1.0__py3-none-any.whl → 2.2.1__py3-none-any.whl

lifx_emulator/factories/builder.py

@@ -211,7 +211,9 @@ class DeviceBuilder:
 
         # 3. Determine firmware version
         version_major, version_minor = self._firmware_config.get_firmware_version(
-            extended_multizone=self._extended_multizone, override=self._firmware_version
+            product_id=self._product_info.pid,
+            extended_multizone=self._extended_multizone,
+            override=self._firmware_version,
         )
 
         # 4. Get default color

lifx_emulator/factories/firmware_config.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from lifx_emulator.products.specs import get_default_firmware_version
+
 
 class FirmwareConfig:
     """Determines firmware versions for devices.
@@ -25,12 +27,19 @@ class FirmwareConfig:
 
     def get_firmware_version(
         self,
+        product_id: int | None = None,
         extended_multizone: bool | None = None,
         override: tuple[int, int] | None = None,
     ) -> tuple[int, int]:
-        """Get firmware version based on extended multizone support.
+        """Get firmware version based on product specs or extended multizone support.
+
+        Precedence order:
+        1. Explicit override parameter
+        2. Product-specific default from specs.yml
+        3. Extended multizone flag (3.70 for True/None, 2.60 for False)
 
         Args:
+            product_id: Optional product ID to check specs for defaults
             extended_multizone: Whether device supports extended multizone.
                                None or True defaults to 3.70, False gives 2.60
             override: Optional explicit firmware version to use
@@ -46,11 +55,20 @@ class FirmwareConfig:
             (2, 60)
             >>> config.get_firmware_version(override=(4, 0))
             (4, 0)
+            >>> # With product_id, uses specs if defined
+            >>> config.get_firmware_version(product_id=27)  # doctest: +SKIP
+            (3, 70)
         """
         # Explicit override takes precedence
         if override is not None:
             return override
 
+        # Check product-specific defaults from specs
+        if product_id is not None:
+            specs_version = get_default_firmware_version(product_id)
+            if specs_version is not None:
+                return specs_version
+
         # None or True defaults to extended (3.70)
         # Only explicit False gives legacy (2.60)
         if extended_multizone is False:

lifx_emulator/handlers/tile_handlers.py

@@ -240,12 +240,25 @@ class GetEffectHandler(PacketHandler):
         # Create effect settings with Sky parameters
         from lifx_emulator.protocol.protocol_types import TileEffectSkyType
 
-        # Use defaults for SKY effect (type=5), otherwise use stored values
-        effect_type = device_state.tile_effect_type
-        if effect_type == 5:  # SKY effect
-            sky_type = device_state.tile_effect_sky_type or 2  # Default to CLOUDS
-            cloud_sat_min = device_state.tile_effect_cloud_sat_min or 50
-            cloud_sat_max = device_state.tile_effect_cloud_sat_max or 180
+        # Use defaults for SKY effect when values are None, otherwise use stored values
+        # NOTE: Must check for None explicitly, not use 'or', because SUNRISE=0 is falsy
+        effect_type = TileEffectType(device_state.tile_effect_type)
+        if effect_type == TileEffectType.SKY:
+            sky_type = (
+                device_state.tile_effect_sky_type
+                if device_state.tile_effect_sky_type is not None
+                else TileEffectSkyType.CLOUDS
+            )
+            cloud_sat_min = (
+                device_state.tile_effect_cloud_sat_min
+                if device_state.tile_effect_cloud_sat_min is not None
+                else 50
+            )
+            cloud_sat_max = (
+                device_state.tile_effect_cloud_sat_max
+                if device_state.tile_effect_cloud_sat_max is not None
+                else 180
+            )
         else:
             sky_type = device_state.tile_effect_sky_type
             cloud_sat_min = device_state.tile_effect_cloud_sat_min
@@ -284,6 +297,27 @@ class SetEffectHandler(PacketHandler):
             return []
 
         if packet:
+            # Sky effect is only supported on LIFX Ceiling devices (176, 177, 201, 202)
+            # running firmware 4.4 or higher
+            if packet.settings.type == TileEffectType.SKY:
+                ceiling_product_ids = {176, 177, 201, 202}
+                is_ceiling = device_state.product in ceiling_product_ids
+
+                # Check firmware version >= 4.4
+                firmware_supported = device_state.version_major > 4 or (
+                    device_state.version_major == 4 and device_state.version_minor >= 4
+                )
+
+                if not (is_ceiling and firmware_supported):
+                    logger.debug(
+                        f"Ignoring SKY effect request: "
+                        f"product={device_state.product}, "
+                        f"firmware={device_state.version_major}."
+                        f"{device_state.version_minor} "
+                        f"(requires Ceiling product and firmware >= 4.4)"
+                    )
+                    return []
+
             device_state.tile_effect_type = int(packet.settings.type)
             device_state.tile_effect_speed = (
                 packet.settings.speed // 1000

lifx_emulator/products/generator.py

@@ -788,7 +788,7 @@ def _generate_yaml_header() -> list[str]:
         "#",
         "# This file contains product-specific details that are not available in the",
         "# upstream LIFX products.json catalog, such as default zone counts, tile",
-        "# configurations, and other device-specific defaults.",
+        "# configurations, firmware versions, and other device-specific defaults.",
         "#",
         "# These values are used by the emulator to create realistic device",
         "# configurations when specific parameters are not provided by the user.",
@@ -809,8 +809,25 @@ def _generate_yaml_header() -> list[str]:
         "#     tile_width: <number>              # Width of each tile in pixels",
         "#     tile_height: <number>             # Height of each tile in pixels",
         "#",
+        "#     # Host firmware version (optional, overrides auto firmware selection)",
+        "#     default_firmware_major: <number>  # Firmware major version (e.g., 3)",
+        "#     default_firmware_minor: <number>  # Firmware minor version (e.g., 70)",
+        "#",
         "#     # Other device-specific defaults",
         '#     notes: "<string>"                 # Notes about product',
+        "#",
+        "# Firmware Version Notes:",
+        "# ----------------------",
+        "# If default_firmware_major and default_firmware_minor are both specified ",
+        "# they will be used as the default firmware version when creating devices",
+        "# of that type. This overrides the automatic firmware version selection",
+        "# based on extended_multizone capability (which defaults to 3.70 for extended",
+        "# multizone or 2.60 for non-extended).",
+        "#",
+        "# Precedence order for firmware version:",
+        "# 1. Explicit firmware_version parameter to create_device()",
+        "# 2. Product-specific default from this specs.yml file",
+        "# 3. Automatic selection based on extended_multizone flag",
         "",
         "products:",
     ]
@@ -847,6 +864,15 @@ def _generate_multizone_section(
         lines.append(f"    min_zone_count: {specs['min_zone_count']}")
         lines.append(f"    max_zone_count: {specs['max_zone_count']}")
 
+        # Add firmware version if present
+        if "default_firmware_major" in specs and "default_firmware_minor" in specs:
+            lines.append(
+                f"    default_firmware_major: {specs['default_firmware_major']}"
+            )
+            lines.append(
+                f"    default_firmware_minor: {specs['default_firmware_minor']}"
+            )
+
         notes = specs.get("notes", "")
         if notes:
             notes_escaped = notes.replace('"', '\\"')
@@ -889,6 +915,15 @@ def _generate_matrix_section(
         lines.append(f"    tile_width: {specs['tile_width']}")
         lines.append(f"    tile_height: {specs['tile_height']}")
 
+        # Add firmware version if present
+        if "default_firmware_major" in specs and "default_firmware_minor" in specs:
+            lines.append(
+                f"    default_firmware_major: {specs['default_firmware_major']}"
+            )
+            lines.append(
+                f"    default_firmware_minor: {specs['default_firmware_minor']}"
+            )
+
         notes = specs.get("notes", "")
         if notes:
             notes_escaped = notes.replace('"', '\\"')

lifx_emulator/products/specs.py

@@ -27,6 +27,8 @@ class ProductSpecs:
         max_tile_count: Maximum tiles supported
         tile_width: Width of each tile in pixels
         tile_height: Height of each tile in pixels
+        default_firmware_major: Default firmware major version
+        default_firmware_minor: Default firmware minor version
         notes: Human-readable notes about this product
     """
 
@@ -39,6 +41,8 @@ class ProductSpecs:
     max_tile_count: int | None = None
     tile_width: int | None = None
     tile_height: int | None = None
+    default_firmware_major: int | None = None
+    default_firmware_minor: int | None = None
     notes: str | None = None
 
     @property
@@ -51,6 +55,14 @@ class ProductSpecs:
         """Check if this product has matrix-specific specs."""
         return self.tile_width is not None or self.tile_height is not None
 
+    @property
+    def has_firmware_specs(self) -> bool:
+        """Check if this product has firmware version specs."""
+        return (
+            self.default_firmware_major is not None
+            and self.default_firmware_minor is not None
+        )
+
 
 class SpecsRegistry:
     """Registry of product specs loaded from specs.yml."""
@@ -93,6 +105,8 @@ class SpecsRegistry:
                 max_tile_count=specs_data.get("max_tile_count"),
                 tile_width=specs_data.get("tile_width"),
                 tile_height=specs_data.get("tile_height"),
+                default_firmware_major=specs_data.get("default_firmware_major"),
+                default_firmware_minor=specs_data.get("default_firmware_minor"),
                 notes=specs_data.get("notes"),
             )
 
@@ -169,6 +183,23 @@ class SpecsRegistry:
             return (specs.tile_width, specs.tile_height)
         return None
 
+    def get_default_firmware_version(self, product_id: int) -> tuple[int, int] | None:
+        """Get default firmware version for a product.
+
+        Args:
+            product_id: Product ID
+
+        Returns:
+            Tuple of (major, minor) if defined, None otherwise
+        """
+        specs = self.get_specs(product_id)
+        if specs and specs.has_firmware_specs:
+            # has_firmware_specs ensures both values are not None
+            assert specs.default_firmware_major is not None  # nosec
+            assert specs.default_firmware_minor is not None  # nosec
+            return (specs.default_firmware_major, specs.default_firmware_minor)
+        return None
+
     def __len__(self) -> int:
         """Get number of products with specs."""
         if not self._loaded:
@@ -239,3 +270,15 @@ def get_tile_dimensions(product_id: int) -> tuple[int, int] | None:
         Tuple of (width, height) if defined, None otherwise
     """
     return _specs_registry.get_tile_dimensions(product_id)
+
+
+def get_default_firmware_version(product_id: int) -> tuple[int, int] | None:
+    """Get default firmware version for a product.
+
+    Args:
+        product_id: Product ID
+
+    Returns:
+        Tuple of (major, minor) if defined, None otherwise
+    """
+    return _specs_registry.get_default_firmware_version(product_id)

lifx_emulator/products/specs.yml

@@ -3,7 +3,7 @@
 #
 # This file contains product-specific details that are not available in the
 # upstream LIFX products.json catalog, such as default zone counts, tile
-# configurations, and other device-specific defaults.
+# configurations, firmware versions, and other device-specific defaults.
 #
 # These values are used by the emulator to create realistic device
 # configurations when specific parameters are not provided by the user.
@@ -24,8 +24,25 @@
 #     tile_width: <number>              # Width of each tile in pixels
 #     tile_height: <number>             # Height of each tile in pixels
 #
+#     # Host firmware version (optional, overrides automatic firmware selection)
+#     default_firmware_major: <number>  # Firmware major version (e.g., 3)
+#     default_firmware_minor: <number>  # Firmware minor version (e.g., 70)
+#
 #     # Other device-specific defaults
 #     notes: "<string>"                 # Notes about product
+#
+# Firmware Version Notes:
+# ----------------------
+# If default_firmware_major and default_firmware_minor are both specified for a
+# product, they will be used as the default firmware version when creating devices
+# of that product type. This overrides the automatic firmware version selection
+# based on extended_multizone capability (which defaults to 3.70 for extended
+# multizone or 2.60 for non-extended).
+#
+# Precedence order for firmware version:
+# 1. Explicit firmware_version parameter to create_device()
+# 2. Product-specific default from this specs.yml file
+# 3. Automatic selection based on extended_multizone flag
 
 products:
   # ========================================
@@ -220,15 +237,19 @@ products:
     max_tile_count: 1
     tile_width: 8
     tile_height: 8
+    default_firmware_major: 4
+    default_firmware_minor: 10
     notes: 'LIFX Ceiling, 8x8 matrix, zones 1-63: downlight, zone 64: uplight'
 
-  177:  # LIFX Tube Intl
+  177:  # LIFX Ceiling Intl
     default_tile_count: 1
     min_tile_count: 1
     max_tile_count: 1
-    tile_width: 5
-    tile_height: 11
-    notes: LIFX Tube Intl
+    tile_width: 8
+    tile_height: 8
+    default_firmware_major: 4
+    default_firmware_minor: 10
+    notes: LIFX Ceiling Intl
 
   185:  # LIFX Candle Color US
     default_tile_count: 1
@@ -252,6 +273,8 @@ products:
     max_tile_count: 1
     tile_width: 16
     tile_height: 8
+    default_firmware_major: 4
+    default_firmware_minor: 10
     notes: LIFX Ceiling 13x26" US
 
   202:  # LIFX Ceiling 13x26" Intl
@@ -260,6 +283,8 @@ products:
     max_tile_count: 1
     tile_width: 16
     tile_height: 8
+    default_firmware_major: 4
+    default_firmware_minor: 10
     notes: LIFX Ceiling 13x26" Intl
 
   215:  # LIFX Candle Color US

{lifx_emulator-2.1.0.dist-info → lifx_emulator-2.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lifx-emulator
-Version: 2.1.0
+Version: 2.2.1
 Summary: LIFX Emulator for testing LIFX LAN protocol libraries
 Author-email: Avi Miller <me@dje.li>
 Maintainer-email: Avi Miller <me@dje.li>

{lifx_emulator-2.1.0.dist-info → lifx_emulator-2.2.1.dist-info}/RECORD

@@ -23,10 +23,10 @@ lifx_emulator/devices/state_restorer.py,sha256=eDsRSW-2RviP_0Qlk2DHqMaB-zhV0X1cN
 lifx_emulator/devices/state_serializer.py,sha256=O4Cp3bbGkd4eZf5jzb0MKzWDTgiNhrSGgypmMWaB4dg,5097
 lifx_emulator/devices/states.py,sha256=mVZz7FQeIHLpv2SokmhlQlSBIyVj3GuhGMHBVoFlJqk,10836
 lifx_emulator/factories/__init__.py,sha256=yN8i_Hu_cFEryWZmh0TiOQvWEYFVIApQSs4xeb0EfBk,1170
-lifx_emulator/factories/builder.py,sha256=ZSz5apcorsKpuPsdjFE4VLC1p41jVY8MWs1-nRBOLMk,11996
+lifx_emulator/factories/builder.py,sha256=OaDqQDGkAyZCSO-4HAsFSd5UzsHpHvRyBk-Fotl1mAY,12056
 lifx_emulator/factories/default_config.py,sha256=FTcxKDfeTmO49GTSki8nxnEIZQzR0Lg0hL_PwHUrkVQ,4828
 lifx_emulator/factories/factory.py,sha256=VQfU5M8zrpFyNHjpGP1q-3bpek9MltBdoAUSvIvt7Bs,7583
-lifx_emulator/factories/firmware_config.py,sha256=AzvPvR4pfwjK1yNsaua1L9V1gLVItUVySjcGrXIWnEw,1932
+lifx_emulator/factories/firmware_config.py,sha256=tPN5Hq-uNb1xzW9Q0A9jD-G0-NaGfINcD0i1XZRUMoE,2711
 lifx_emulator/factories/serial_generator.py,sha256=MbaXoommsj76ho8_ZoKuUDnffDf98YvwQiXZSWsUsEs,2507
 lifx_emulator/handlers/__init__.py,sha256=3Hj1hRo3yL3E7GKwG9TaYh33ymk_N3bRiQ8nvqSQULA,1306
 lifx_emulator/handlers/base.py,sha256=0avCLXY_rNlw16PpJ5JrRCwXNE4uMpBqF3PfSfNJ0b8,1654
@@ -34,12 +34,12 @@ lifx_emulator/handlers/device_handlers.py,sha256=1AmslA4Ut6L7b3SfduDdvnQizTpzUB3
 lifx_emulator/handlers/light_handlers.py,sha256=Ryz-_fzoVCT6DBkXhW9YCOYJYaMRcBOIguL3HrQXhAw,11471
 lifx_emulator/handlers/multizone_handlers.py,sha256=2dYsitq0KzEaxEAJmz7ixtir1tvFMOAnfkBQqslqbPM,7914
 lifx_emulator/handlers/registry.py,sha256=s1ht4PmPhXhAcwu1hoY4yW39wy3SPJBMY-9Uxd0FWuE,3292
-lifx_emulator/handlers/tile_handlers.py,sha256=-DU4PufPgE7vfvKsZfxP_7vBtI3EtAeBF3-U2-1zyaQ,11294
+lifx_emulator/handlers/tile_handlers.py,sha256=Ci_SrOldf2I8djEd2JJZZ5iR5b4_HvzlWTkaBiCTx7c,12785
 lifx_emulator/products/__init__.py,sha256=qcNop_kRYFF3zSjNemzQEgu3jPrIxfyQyLv9GsnaLEI,627
-lifx_emulator/products/generator.py,sha256=NYInVSGyYIxAYMpTihqBtXP06lAYVfbSYe0Wv5Hg9vQ,31758
+lifx_emulator/products/generator.py,sha256=5zcq0iKgwjtg0gePnBEOdIkumesvfzEcKRdBZFPyGtk,33538
 lifx_emulator/products/registry.py,sha256=qkm2xgGZo_ds3wAbYplLu4gb0cxhjZXjnCc1V8etpHw,46517
-lifx_emulator/products/specs.py,sha256=pfmQMrQxlCGqORs3MbsH_vmCvxdaDwjVzXUCVZCjFCI,7093
-lifx_emulator/products/specs.yml,sha256=uxzdKFREAHphk8XSPiCHvQE2vwoPfT2m1xy-zC4ZIl4,8552
+lifx_emulator/products/specs.py,sha256=RxToCvu-iwF6QMcmYgI5CblLOr8hpDZ3k3WT1fZcKe8,8730
+lifx_emulator/products/specs.yml,sha256=eM_r1lTRQHii4dyvnsZWx1P7NzDSZzJl03aR86TY564,9683
 lifx_emulator/protocol/__init__.py,sha256=-wjC-wBcb7fxi5I-mJr2Ad8K2YRflJFdLLdobfD-W1Q,56
 lifx_emulator/protocol/base.py,sha256=V6t0baSgIXjrsz2dBuUn_V9xwradSqMxBFJHAUtnfCs,15368
 lifx_emulator/protocol/const.py,sha256=ilhv-KcQpHtKh2MDCaIbMLQAsxKO_uTaxyR63v1W8cc,226
@@ -55,8 +55,8 @@ lifx_emulator/scenarios/__init__.py,sha256=CGjudoWvyysvFj2xej11N2cr3mYROGtRb9zVH
 lifx_emulator/scenarios/manager.py,sha256=1esxRdz74UynNk1wb86MGZ2ZFAuMzByuu74nRe3D-Og,11163
 lifx_emulator/scenarios/models.py,sha256=BKS_fGvrbkGe-vK3arZ0w2f9adS1UZhiOoKpu7GENnc,4099
 lifx_emulator/scenarios/persistence.py,sha256=3vjtPNFYfag38tUxuqxkGpWhQ7uBitc1rLroSAuw9N8,8881
-lifx_emulator-2.1.0.dist-info/METADATA,sha256=cen3ovCv4G8WJyDQpy46bpFndEZ1OZH09NFuaoE0-mw,4549
-lifx_emulator-2.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-lifx_emulator-2.1.0.dist-info/entry_points.txt,sha256=R9C_K_tTgt6yXEmhzH4r2Yx2Tu1rLlnYzeG4RFUVzSc,62
-lifx_emulator-2.1.0.dist-info/licenses/LICENSE,sha256=eBz48GRA3gSiWn3rYZAz2Ewp35snnhV9cSqkVBq7g3k,1832
-lifx_emulator-2.1.0.dist-info/RECORD,,
+lifx_emulator-2.2.1.dist-info/METADATA,sha256=AWoxTE55eL8Ga1ORQaXG0gammepJigzKqTrxDj-1UqA,4549
+lifx_emulator-2.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+lifx_emulator-2.2.1.dist-info/entry_points.txt,sha256=R9C_K_tTgt6yXEmhzH4r2Yx2Tu1rLlnYzeG4RFUVzSc,62
+lifx_emulator-2.2.1.dist-info/licenses/LICENSE,sha256=eBz48GRA3gSiWn3rYZAz2Ewp35snnhV9cSqkVBq7g3k,1832
+lifx_emulator-2.2.1.dist-info/RECORD,,