trcc-linux 5.2.0__tar.gz → 5.2.2__tar.gz

{trcc_linux-5.2.0 → trcc_linux-5.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trcc-linux
-Version: 5.2.0
+Version: 5.2.2
 Summary: Linux implementation of Thermalright LCD Control Center
 Project-URL: Homepage, https://github.com/Lexonight1/thermalright-trcc-linux
 Project-URL: Documentation, https://github.com/Lexonight1/thermalright-trcc-linux#readme

{trcc_linux-5.2.0 → trcc_linux-5.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "trcc-linux"
-version = "5.2.0"
+version = "5.2.2"
 description = "Linux implementation of Thermalright LCD Control Center"
 readme = "README.md"
 license = "GPL-3.0-or-later"

{trcc_linux-5.2.0 → trcc_linux-5.2.2}/src/trcc/__version__.py

@@ -1,6 +1,6 @@
 """TRCC Linux version information."""
 
-__version__ = "5.2.0"
+__version__ = "5.2.2"
 __version_info__ = tuple(int(x) for x in __version__.split("."))
 
 # Version history:
@@ -277,3 +277,13 @@ __version_info__ = tuple(int(x) for x in __version__.split("."))
 #          ImageTo565() (mode 3) for these FBLs — header byte[6]=0x00 with
 #          actual width/height instead of hardcoded 240x320. Auto-detects
 #          JPEG by FF D8 magic bytes. Addresses #34/#35. 2286 tests.
+# 5.2.1  - Fix LED zone_count for 3 styles: AX120 Digital (1→4), LC1 (1→3),
+#          LF11 (1→4) matching C# FormLED button visibility. Enables zone
+#          carousel (circulate) feature for these devices — zone buttons and
+#          interval input were already wired but hidden by wrong count. 2286 tests.
+# 5.2.2  - Scale HID frame timeout for large-resolution devices (1280x480+):
+#          100ms→dynamic based on packet size, prevents truncated transfers.
+#          Verify all bytes sent (total == len vs total > 0). Add --test-frame
+#          to trcc hid-debug: sends solid red frame + reports encoding, header,
+#          packet size, transfer result. Add SCSI raw poll bytes to trcc report
+#          (was missing vs HID/LED/Bulk). Addresses #36. 2286 tests.

{trcc_linux-5.2.0 → trcc_linux-5.2.2}/src/trcc/adapters/device/hid.py

@@ -86,9 +86,20 @@ TYPE3_ACK_SIZE = 16
 # Alignment
 USB_BULK_ALIGNMENT = 512
 
-# Default timeout (ms) — for frame send / normal I/O
+# Default timeout (ms) — for frame send / normal I/O.
+# Small displays (240x320 ~150 KB) fit within 100ms easily.
 DEFAULT_TIMEOUT_MS = 100
 
+
+def _frame_timeout_ms(packet_size: int) -> int:
+    """Scale frame send timeout based on packet size.
+
+    USB 2.0 Hi-Speed interrupt endpoint: ~4 KB/ms theoretical max.
+    Add 100ms margin for OS scheduling / USB controller overhead.
+    Large displays (1280x480 JPEG ~450 KB) need ~200ms+ at full speed.
+    """
+    return max(DEFAULT_TIMEOUT_MS, packet_size // 4 + 100)
+
 # Handshake timeout (ms) — much longer than frame-send.
 # Windows uses async HID API with no explicit timeout; our synchronous read
 # needs a generous window.  UCDevice.cs retries at 200ms then 3s intervals.
@@ -420,12 +431,13 @@ class HidDeviceType2(HidDevice):
         packet = self.build_frame_packet(image_data, w, h)
 
         # C# USBLCDNEW ThreadSendDeviceDataH: single Transfer() call
-        total = self.transport.write(EP_WRITE_02, packet, DEFAULT_TIMEOUT_MS)
+        timeout = _frame_timeout_ms(len(packet))
+        total = self.transport.write(EP_WRITE_02, packet, timeout)
 
         # C#: Thread.Sleep(1) after frame transfer
         time.sleep(DELAY_FRAME_TYPE2_S)
 
-        return total > 0
+        return total == len(packet)
 
 
 # =========================================================================
@@ -547,7 +559,8 @@ class HidDeviceType3(HidDevice):
             raise RuntimeError("Type 3 device not initialized — call handshake() first")
 
         packet = self.build_frame_packet(image_data)
-        transferred = self.transport.write(EP_WRITE_02, packet, DEFAULT_TIMEOUT_MS)
+        timeout = _frame_timeout_ms(len(packet))
+        transferred = self.transport.write(EP_WRITE_02, packet, timeout)
         if transferred == 0:
             return False
 

{trcc_linux-5.2.0 → trcc_linux-5.2.2}/src/trcc/adapters/device/scsi.py

@@ -297,7 +297,7 @@ class ScsiDevice(FrameDevice):
             return result.returncode == 0
 
     @staticmethod
-    def _init_device(dev: str) -> int:
+    def _init_device(dev: str) -> tuple[int, bytes]:
         """Poll + init handshake (must be called before first frame send).
 
         Matches USBLCD.exe initialization sequence:
@@ -307,8 +307,7 @@ class ScsiDevice(FrameDevice):
         4. Brief delay to let display controller settle before first frame
 
         Returns:
-            FBL byte (poll response byte[0]).  This IS the FBL directly --
-            the ASCII value maps to a resolution via fbl_to_resolution().
+            (FBL byte, raw poll response first 64 bytes).
         """
         poll_header = ScsiDevice._build_header(0xF5, 0xE100)
 
@@ -334,7 +333,7 @@ class ScsiDevice(FrameDevice):
         # Step 3: Brief delay to let display controller settle
         time.sleep(_POST_INIT_DELAY)
 
-        return fbl
+        return fbl, response[:64]
 
     @staticmethod
     def _send_frame(dev: str, rgb565_data: bytes, width: int = 320, height: int = 320):
@@ -427,12 +426,12 @@ class ScsiDevice(FrameDevice):
         Reads FBL from poll response byte[0] and resolves
         the actual LCD resolution via fbl_to_resolution().
         """
-        fbl = ScsiDevice._init_device(self.device_path)
+        fbl, raw = ScsiDevice._init_device(self.device_path)
         resolution = fbl_to_resolution(fbl)
         self.width, self.height = resolution
         self._initialized = True
         log.info("SCSI handshake OK: FBL=%d, resolution=%s", fbl, resolution)
-        return HandshakeResult(resolution=resolution, model_id=fbl)
+        return HandshakeResult(resolution=resolution, model_id=fbl, raw_response=raw)
 
     def send_frame(self, rgb565_data: bytes) -> bool:
         """Send one RGB565 frame."""
@@ -597,7 +596,7 @@ def send_image_to_device(
     """
     try:
         if device_path not in ScsiDevice._initialized_devices:
-            ScsiDevice._init_device(device_path)
+            ScsiDevice._init_device(device_path)  # return value unused here
             ScsiDevice._initialized_devices.add(device_path)
 
         ScsiDevice._send_frame(device_path, rgb565_data, width, height)

{trcc_linux-5.2.0 → trcc_linux-5.2.2}/src/trcc/adapters/infra/debug_report.py

@@ -332,6 +332,8 @@ class DebugReport:
             sec.lines.append(
                 f"    FBL={fbl} ({known}), "
                 f"resolution={res[0]}x{res[1]}")
+            if result.raw_response:
+                sec.lines.append(f"    raw[0:64]={result.raw_response[:64].hex()}")
         finally:
             protocol.close()
 

{trcc_linux-5.2.0 → trcc_linux-5.2.2}/src/trcc/cli/__init__.py

@@ -457,9 +457,13 @@ def _cmd_uninstall(
 
 
 @app.command("hid-debug")
-def _cmd_hid_debug() -> int:
+def _cmd_hid_debug(
+    test_frame: Annotated[bool, typer.Option(
+        "--test-frame", "-t", help="Send solid red test frame after handshake",
+    )] = False,
+) -> int:
     """HID handshake diagnostic (hex dump for bug reports)."""
-    return _diag.hid_debug()
+    return _diag.hid_debug(test_frame=test_frame)
 
 
 @app.command("led-debug")

{trcc_linux-5.2.0 → trcc_linux-5.2.2}/src/trcc/cli/_diag.py

@@ -13,14 +13,14 @@ def _hex_dump(data: bytes, max_bytes: int = 64) -> None:
         print(f"  {row:04x}: {hex_str:<48s} {ascii_str}")
 
 
-def _hid_debug_lcd(dev) -> None:
+def _hid_debug_lcd(dev, *, test_frame: bool = False) -> None:
     """HID handshake diagnostic for LCD devices (Type 2/3)."""
     from trcc.adapters.device.factory import HidProtocol
     from trcc.adapters.device.hid import (
         HidHandshakeInfo,
         get_button_image,
     )
-    from trcc.core.models import FBL_TO_RESOLUTION, fbl_to_resolution, pm_to_fbl
+    from trcc.core.models import FBL_TO_RESOLUTION, JPEG_MODE_FBLS, fbl_to_resolution, pm_to_fbl
 
     protocol = HidProtocol(
         vid=dev.vid, pid=dev.pid,
@@ -50,6 +50,10 @@ def _hid_debug_lcd(dev) -> None:
     print(f"  Serial   = {info.serial}")
     print(f"  Resolution = {resolution[0]}x{resolution[1]}")
 
+    # Encoding mode
+    is_jpeg = fbl in JPEG_MODE_FBLS
+    print(f"  Encoding = {'JPEG' if is_jpeg else 'RGB565'}")
+
     # Button image from PM + SUB
     button = get_button_image(pm, sub)
     if button:
@@ -68,9 +72,48 @@ def _hid_debug_lcd(dev) -> None:
         print("\n  Raw handshake response (first 64 bytes):")
         _hex_dump(info.raw_response)
 
+    # Test frame send
+    if test_frame:
+        _send_test_frame(protocol, resolution, fbl)
+
     protocol.close()
 
 
+def _send_test_frame(protocol, resolution: tuple, fbl: int) -> None:
+    """Send a solid red test frame and report transfer details."""
+    from trcc.core.models import JPEG_MODE_FBLS
+
+    w, h = resolution
+    print(f"\n  Sending RED test frame ({w}x{h})...")
+
+    try:
+        from PIL import Image as PILImage
+
+        img = PILImage.new('RGB', (w, h), (255, 0, 0))
+
+        is_jpeg = fbl in JPEG_MODE_FBLS
+        if is_jpeg:
+            from trcc.services.image import ImageService
+            data = ImageService.to_jpeg(img)
+            print(f"    Encoding: JPEG ({len(data):,} bytes)")
+        else:
+            from trcc.services.image import ImageService
+            data = ImageService.to_rgb565(img, '<')
+            print(f"    Encoding: RGB565 LE ({len(data):,} bytes)")
+
+        # Show packet header
+        packet = protocol._device.build_frame_packet(data, w, h)
+        print(f"    Packet size: {len(packet):,} bytes")
+        print(f"    Header: {packet[:20].hex()}")
+
+        ok = protocol._device.send_frame(data)
+        print(f"    Send result: {'OK' if ok else 'FAILED'}")
+        print("    >>> Check your LCD — did it turn RED?")
+
+    except Exception as e:
+        print(f"    Test frame FAILED: {e}")
+
+
 def _hid_debug_led(dev) -> None:
     """HID handshake diagnostic for LED devices (Type 1)."""
     from trcc.adapters.device.factory import LedProtocol
@@ -116,11 +159,14 @@ def _hid_debug_led(dev) -> None:
     protocol.close()
 
 
-def hid_debug():
+def hid_debug(*, test_frame: bool = False):
     """HID handshake diagnostic — prints hex dump and resolved device info.
 
     Users can share this output in bug reports to help debug HID device issues.
     Routes LED devices (Type 1) through LedProtocol, LCD devices through HidProtocol.
+
+    Args:
+        test_frame: If True, send a solid red test frame after handshake.
     """
     try:
         from trcc.adapters.device.detector import detect_devices
@@ -151,7 +197,7 @@ def hid_debug():
                 if is_led:
                     _hid_debug_led(dev)
                 else:
-                    _hid_debug_lcd(dev)
+                    _hid_debug_lcd(dev, test_frame=test_frame)
             except ImportError as e:
                 print(f"  Missing dependency: {e}")
                 print("  Install: pip install pyusb  (or pip install hidapi)")

{trcc_linux-5.2.0 → trcc_linux-5.2.2}/src/trcc/core/models.py

@@ -469,16 +469,16 @@ class LedDeviceStyle:
 
 # All LED styles from FormLED.cs FormLEDInit and UCScreenLED.cs constants
 LED_STYLES: dict[int, LedDeviceStyle] = {
-    1: LedDeviceStyle(1, 30, 10, 1, "AX120_DIGITAL", "DAX120_DIGITAL", "D0数码屏"),
+    1: LedDeviceStyle(1, 30, 10, 4, "AX120_DIGITAL", "DAX120_DIGITAL", "D0数码屏"),
     2: LedDeviceStyle(2, 84, 18, 4, "PA120_DIGITAL", "DPA120_DIGITAL", "D0数码屏4区域"),
     3: LedDeviceStyle(3, 64, 10, 2, "AK120_DIGITAL", "DAK120_DIGITAL", "D0数码屏"),
-    4: LedDeviceStyle(4, 31, 14, 1, "LC1", "DLC1", "D0LC1"),
+    4: LedDeviceStyle(4, 31, 14, 3, "LC1", "DLC1", "D0LC1"),
     5: LedDeviceStyle(5, 93, 23, 2, "LF8", "DLF8", "D0LF8"),
     6: LedDeviceStyle(6, 124, 72, 2, "LF12", "DLF12", "D0LF12"),
     7: LedDeviceStyle(7, 116, 12, 3, "LF10", "DLF10", "D0LF10"),
     8: LedDeviceStyle(8, 18, 13, 4, "CZ1", "DCZ1", "D0CZ1"),
     9: LedDeviceStyle(9, 61, 31, 1, "LC2", "DLC2", "D0LC2"),
-    10: LedDeviceStyle(10, 38, 17, 1, "LF11", "DLF11", "D0LF11"),
+    10: LedDeviceStyle(10, 38, 17, 4, "LF11", "DLF11", "D0LF11"),
     11: LedDeviceStyle(11, 93, 72, 2, "LF15", "DLF15", "D0LF15"),
     12: LedDeviceStyle(12, 62, 62, 1, "LF13", "DLF13", "D0LF13"),
 }

{trcc_linux-5.2.0 → trcc_linux-5.2.2}/tests/hid_testing/test_device_led.py

@@ -141,10 +141,14 @@ class TestLedDeviceStyle:
 
     def test_known_zone_counts(self):
         """Verify specific zone counts from FormLED.cs."""
-        assert LED_STYLES[1].zone_count == 1   # single zone
-        assert LED_STYLES[2].zone_count == 4   # PA120 has 4 zones
-        assert LED_STYLES[3].zone_count == 2   # AK120 has 2 zones
-        assert LED_STYLES[8].zone_count == 4   # CZ1 has 4 zones
+        assert LED_STYLES[1].zone_count == 4   # AX120 Digital: 4 zones (buttons 1-4)
+        assert LED_STYLES[2].zone_count == 4   # PA120: 4 zones
+        assert LED_STYLES[3].zone_count == 2   # AK120: 2 zones
+        assert LED_STYLES[4].zone_count == 3   # LC1: 3 zones (buttonN1-N3)
+        assert LED_STYLES[8].zone_count == 4   # CZ1: 4 zones
+        assert LED_STYLES[9].zone_count == 1   # LC2: clock-only, no carousel
+        assert LED_STYLES[10].zone_count == 4  # LF11: 4 zones (buttonN1-N4)
+        assert LED_STYLES[12].zone_count == 1  # LF13: RGB-only, no carousel
 
     def test_dataclass_default_zone_count(self):
         """LedDeviceStyle defaults zone_count to 1."""