fix: fix protocol determin for new protocol

Author: asxzy

flux_led/models_db.py

@@ -1334,8 +1334,9 @@ def protocol_for_version_num(self, version_num: int) -> str:
         # not work and will never work on this device.
         always_writes_white_and_colors=False,
         protocols=[MinVersionProtocol(0, PROTOCOL_LEDENET_EXTENDED_CUSTOM)],
-        mode_to_color_mode={0x01: COLOR_MODES_RGB_CCT, 0x17: COLOR_MODES_RGB_CCT},
-        color_modes=COLOR_MODES_RGB_CCT,
+        # Device has single white LED (not separate warm/cool), so use RGB_W not RGB_CCT
+        mode_to_color_mode={0x01: COLOR_MODES_RGB_W, 0x17: COLOR_MODES_RGB_W},
+        color_modes=COLOR_MODES_RGB_W,
         channel_map={},
         microphone=True,
         device_config=IMMUTABLE_DEVICE_CONFIG,

flux_led/protocol.py

@@ -1032,14 +1032,35 @@ def _is_start_of_power_state_response(self, data: bytes) -> bool:
         """Check if a message is the start of a state response."""
         return _message_type_from_start_of_msg(data) == MSG_POWER_STATE
 
+    def is_valid_extended_state_response(self, raw_state: bytes) -> bool:
+        """Check if this is an extended state response (0xEA 0x81 format).
+
+        Some devices (like 0xB6) only respond with extended state format.
+        This allows probing to recognize these responses.
+        """
+        return len(raw_state) >= 20 and raw_state[0] == 0xEA and raw_state[1] == 0x81
+
     def is_valid_state_response(self, raw_state: bytes) -> bool:
         """Check if a state response is valid."""
+        # Check for extended state format (0xEA 0x81) first
+        if self.is_valid_extended_state_response(raw_state):
+            return True
+        # Check for standard state format (0x81)
         if len(raw_state) != self.state_response_length:
             return False
         if raw_state[0] != 129:
             return False
         return self.is_checksum_correct(raw_state)
 
+    def extended_state_to_state(self, raw_state: bytes) -> bytes:
+        """Convert an extended state response to a standard state response.
+
+        This is overridden by ProtocolLEDENET25Byte with the actual conversion logic.
+        Default implementation returns raw_state unchanged for protocols that don't
+        use extended state.
+        """
+        return raw_state
+
     def construct_state_change(self, turn_on: int) -> bytearray:
         """
         The bytes to send for a state change request.

tests/test_aio.py

@@ -23,6 +23,7 @@
 from flux_led.aioscanner import AIOBulbScanner, LEDENETDiscovery
 from flux_led.const import (
     COLOR_MODE_CCT,
+    COLOR_MODE_DIM,
     COLOR_MODE_RGB,
     COLOR_MODE_RGBW,
     COLOR_MODE_RGBWW,
@@ -4358,7 +4359,7 @@ def _updated_callback(*args, **kwargs):
     assert light.version_num == 1
     assert light.protocol == PROTOCOL_LEDENET_EXTENDED_CUSTOM
     assert "Surplife" in light.model
-    assert light.color_modes == {COLOR_MODE_RGB, COLOR_MODE_CCT}
+    assert light.color_modes == {COLOR_MODE_RGB, COLOR_MODE_DIM}
     assert light.supports_extended_custom_effects is True
     assert light.microphone is True
 
@@ -4466,7 +4467,7 @@ def test_extended_custom_effect_option_enum_values():
 
 def test_construct_extended_custom_effect_single_color():
     """Test constructing an extended custom effect with single color."""
-    proto = ProtocolLEDENET25Byte()
+    proto = ProtocolLEDENETExtendedCustom()
 
     # Single red color, pattern Wave, default settings
     result = proto.construct_extended_custom_effect(
@@ -4491,7 +4492,7 @@ def test_construct_extended_custom_effect_single_color():
 
 def test_construct_extended_custom_effect_multiple_colors():
     """Test constructing an extended custom effect with multiple colors."""
-    proto = ProtocolLEDENET25Byte()
+    proto = ProtocolLEDENETExtendedCustom()
 
     # Three colors: red, green, blue
     colors = [(255, 0, 0), (0, 255, 0), (0, 0, 255)]
@@ -4510,7 +4511,7 @@ def test_construct_extended_custom_effect_multiple_colors():
 
 def test_construct_extended_custom_effect_color_order():
     """Test that colors are stored in input order."""
-    proto = ProtocolLEDENET25Byte()
+    proto = ProtocolLEDENETExtendedCustom()
 
     # Two distinct colors
     colors = [(255, 0, 0), (0, 0, 255)]  # Red, Blue
@@ -4535,7 +4536,7 @@ def test_construct_extended_custom_effect_color_order():
 
 def test_construct_extended_custom_effect_hsv_conversion():
     """Test RGB to HSV conversion accuracy."""
-    proto = ProtocolLEDENET25Byte()
+    proto = ProtocolLEDENETExtendedCustom()
 
     # Test with a known color: pure green
     colors = [(0, 255, 0)]
@@ -4553,7 +4554,7 @@ def test_construct_extended_custom_effect_hsv_conversion():
 
 def test_construct_extended_custom_effect_speed_clamping():
     """Test that speed is clamped to 0-100."""
-    proto = ProtocolLEDENET25Byte()
+    proto = ProtocolLEDENETExtendedCustom()
 
     # Speed > 100 should be clamped
     result = proto.construct_extended_custom_effect(
@@ -4574,7 +4575,7 @@ def test_construct_extended_custom_effect_speed_clamping():
 
 def test_construct_extended_custom_effect_density_clamping():
     """Test that density is clamped to 0-100."""
-    proto = ProtocolLEDENET25Byte()
+    proto = ProtocolLEDENETExtendedCustom()
 
     # Density > 100 should be clamped
     result = proto.construct_extended_custom_effect(
@@ -4587,7 +4588,7 @@ def test_construct_extended_custom_effect_density_clamping():
 
 def test_construct_extended_custom_effect_max_colors():
     """Test constructing an effect with maximum 8 colors."""
-    proto = ProtocolLEDENET25Byte()
+    proto = ProtocolLEDENETExtendedCustom()
 
     # 8 colors (maximum)
     colors = [
@@ -4613,7 +4614,7 @@ def test_construct_extended_custom_effect_max_colors():
 
 def test_construct_extended_custom_effect_with_enums():
     """Test using enum values for parameters."""
-    proto = ProtocolLEDENET25Byte()
+    proto = ProtocolLEDENETExtendedCustom()
 
     result = proto.construct_extended_custom_effect(
         pattern_id=ExtendedCustomEffectPattern.WAVE,
@@ -4629,7 +4630,7 @@ def test_construct_extended_custom_effect_with_enums():
 
 def test_construct_extended_custom_effect_with_variant_2():
     """Test using VARIANT_2 option (e.g., breathe mode for rainbow patterns)."""
-    proto = ProtocolLEDENET25Byte()
+    proto = ProtocolLEDENETExtendedCustom()
 
     # Rainbow colors with VARIANT_2 option
     colors = [

tests/test_sync.py

@@ -1448,7 +1448,7 @@ def read_data(expected):
         mock_read.side_effect = read_data
         light = flux_led.WifiLedBulb("192.168.1.164")
 
-        assert light.color_modes == {COLOR_MODE_RGB, COLOR_MODE_CCT}
+        assert light.color_modes == {COLOR_MODE_RGB, COLOR_MODE_DIM}
         self.assertEqual(light.protocol, PROTOCOL_LEDENET_EXTENDED_CUSTOM)
         self.assertEqual(light.model_num, 0xB6)
         self.assertEqual(light.version_num, 1)