trcc-linux 2.0.0__tar.gz → 2.0.1__tar.gz

{trcc_linux-2.0.0 → trcc_linux-2.0.1}/.gitignore

@@ -92,8 +92,6 @@ trcc_setup.h
 /probe_*.py
 /core.py
 /src/core.py
-/src/gif_animator.py
-/gif_animator.py
 /*.sh
 !install.sh
 

{trcc_linux-2.0.0 → trcc_linux-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trcc-linux
-Version: 2.0.0
+Version: 2.0.1
 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
@@ -148,6 +148,8 @@ sudo dnf install sg3_utils python3-pyqt6 ffmpeg && pip install --break-system-pa
 sudo apt install sg3-utils python3-pyqt6 ffmpeg python3-pip && pip install --break-system-packages trcc-linux && sudo trcc setup-udev && trcc install-desktop
 ```
 
+> **Segfault on `trcc gui`?** Install the missing Qt6 dependency: `sudo apt install libxcb-cursor0`. If that doesn't help, see [Troubleshooting](doc/TROUBLESHOOTING.md#segmentation-fault-core-dumped).
+
 ### Arch / Manjaro / EndeavourOS / CachyOS / Garuda
 
 ```bash
@@ -233,7 +235,7 @@ trcc setup-udev           # Install udev rules
 trcc install-desktop      # Install app menu entry and icon
 ```
 
-See the **[CLI Reference](doc/CLI_REFERENCE.md)** for all 15 commands, options, and troubleshooting.
+See the **[CLI Reference](doc/CLI_REFERENCE.md)** for all 17 commands, options, and troubleshooting.
 
 ## Documentation
 

{trcc_linux-2.0.0 → trcc_linux-2.0.1}/README.md

@@ -96,6 +96,8 @@ sudo dnf install sg3_utils python3-pyqt6 ffmpeg && pip install --break-system-pa
 sudo apt install sg3-utils python3-pyqt6 ffmpeg python3-pip && pip install --break-system-packages trcc-linux && sudo trcc setup-udev && trcc install-desktop
 ```
 
+> **Segfault on `trcc gui`?** Install the missing Qt6 dependency: `sudo apt install libxcb-cursor0`. If that doesn't help, see [Troubleshooting](doc/TROUBLESHOOTING.md#segmentation-fault-core-dumped).
+
 ### Arch / Manjaro / EndeavourOS / CachyOS / Garuda
 
 ```bash
@@ -181,7 +183,7 @@ trcc setup-udev           # Install udev rules
 trcc install-desktop      # Install app menu entry and icon
 ```
 
-See the **[CLI Reference](doc/CLI_REFERENCE.md)** for all 15 commands, options, and troubleshooting.
+See the **[CLI Reference](doc/CLI_REFERENCE.md)** for all 17 commands, options, and troubleshooting.
 
 ## Documentation
 

{trcc_linux-2.0.0 → trcc_linux-2.0.1}/pyproject.toml

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

{trcc_linux-2.0.0 → trcc_linux-2.0.1}/src/trcc/__version__.py

@@ -1,6 +1,6 @@
 """TRCC Linux version information."""
 
-__version__ = "2.0.0"
+__version__ = "2.0.1"
 __version_info__ = tuple(int(x) for x in __version__.split("."))
 
 # Version history:
@@ -62,3 +62,7 @@ __version_info__ = tuple(int(x) for x in __version__.split("."))
 # 2.0.0  - Major refactor: rename modules to consistent device_* / driver_*
 #          naming, extract constants.py, add debug_report.py diagnostic tool,
 #          HR10 LED backend (device_led_hr10.py), gif_animator→media_player rename
+# 2.0.1  - Fix PM=36 (240x240) wrong resolution: unify FBL/PM tables into
+#          constants.py (single source of truth), PM=FBL default instead of
+#          hardcoded 320x320. Fix PyQt6 version in trcc report. CI: add ffmpeg,
+#          auto-publish to PyPI on tag push. Delete dead shim files.

{trcc_linux-2.0.0 → trcc_linux-2.0.1}/src/trcc/constants.py

@@ -1,6 +1,7 @@
 """Shared constants for TRCC Linux.
 
 Format modes matching Windows TRCC (UCXiTongXianShiSub.cs).
+FBL/PM resolution mapping from FormCZTV.cs.
 """
 
 # Time formats:
@@ -34,3 +35,35 @@ WEEKDAYS = ["MON", "TUE", "WED", "THU", "FRI", "SAT", "SUN"]
 
 # Chinese weekday names (for Language == 1)
 WEEKDAYS_CN = ["星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"]
+
+# =========================================================================
+# FBL → Resolution mapping (from FormCZTV.cs lines 811-821)
+# =========================================================================
+# FBL (Frame Buffer Layout) byte determines LCD resolution.
+# For SCSI devices, the poll byte IS the FBL (PM=FBL).
+# For HID Type 3, FBL = resp[0]-1.
+# For HID Type 2, FBL is derived from PM via pm_to_fbl() in device_hid.py.
+FBL_TO_RESOLUTION: dict[int, tuple[int, int]] = {
+    36:  (240, 240),
+    37:  (240, 240),
+    50:  (240, 320),
+    51:  (320, 240),
+    54:  (360, 360),
+    64:  (640, 480),
+    72:  (480, 480),
+    100: (320, 320),
+    101: (320, 320),
+    102: (320, 320),
+    114: (1600, 720),
+    128: (1280, 480),
+    192: (1920, 462),
+    # FBL 224 is overloaded — depends on PM, defaults to 854x480
+    224: (854, 480),
+}
+
+# Reverse lookup: resolution → PM/FBL (first match wins).
+# Used by SCSI to resolve button images from detected resolution.
+RESOLUTION_TO_PM: dict[tuple[int, int], int] = {
+    res: fbl for fbl, res in FBL_TO_RESOLUTION.items()
+    if fbl not in (37, 101, 102, 224)  # skip duplicates/overloaded
+}

{trcc_linux-2.0.0 → trcc_linux-2.0.1}/src/trcc/debug_report.py

@@ -145,7 +145,6 @@ class DebugReport:
         for mod_name, pkg_name in [
             ("usb.core", "pyusb"),
             ("hid", "hidapi"),
-            ("PyQt6.QtWidgets", "PyQt6"),
         ]:
             try:
                 mod = __import__(mod_name)
@@ -153,6 +152,12 @@ class DebugReport:
                 sec.lines.append(f"  {pkg_name}: {ver}")
             except ImportError:
                 sec.lines.append(f"  {pkg_name}: not installed")
+        # PyQt6 stores version in QtCore, not on the top-level module
+        try:
+            from PyQt6.QtCore import PYQT_VERSION_STR
+            sec.lines.append(f"  PyQt6: {PYQT_VERSION_STR}")
+        except ImportError:
+            sec.lines.append("  PyQt6: not installed")
 
     def _devices(self) -> None:
         sec = self._add("Detected devices")

{trcc_linux-2.0.0 → trcc_linux-2.0.1}/src/trcc/device_hid.py

@@ -28,6 +28,7 @@ from typing import Any, Optional, Set
 import usb.core
 import usb.util
 
+from .constants import FBL_TO_RESOLUTION
 from .device_base import HandshakeResult
 
 # hidapi is optional ([hid] extra)
@@ -101,32 +102,10 @@ USB_CONFIGURATION = 1
 USB_INTERFACE = 0
 
 
-# =========================================================================
-# FBL → Resolution mapping (from FormCZTV.cs lines 811-821)
-# =========================================================================
-# FBL byte determines LCD resolution.  For Type 3, FBL = resp[0]-1.
-# For Type 2, FBL is derived from the PM byte via pm_to_fbl().
-
-FBL_TO_RESOLUTION: dict = {
-    36:  (240, 240),
-    37:  (240, 240),
-    50:  (240, 320),
-    54:  (360, 360),
-    64:  (640, 480),
-    72:  (480, 480),
-    100: (320, 320),
-    101: (320, 320),
-    102: (320, 320),
-    114: (1600, 720),
-    128: (1280, 480),
-    192: (1920, 462),
-    # FBL 224 is overloaded — depends on PM, defaults to 854x480
-    224: (854, 480),
-}
-
-# PM byte → FBL byte for Type 2 / mode-2 devices (FormCZTV.cs lines 682-821)
-# Format: PM value → FBL value
-_PM_TO_FBL_TYPE2: dict = {
+# PM byte → FBL byte for Type 2 devices where PM ≠ FBL.
+# (FormCZTV.cs lines 682-821)
+# For all other PM values, PM=FBL (same convention as SCSI poll bytes).
+_PM_TO_FBL_OVERRIDES: dict = {
     5:   50,    # 240x320
     7:   64,    # 640x480
     9:   224,   # 854x480
@@ -217,14 +196,15 @@ def fbl_to_resolution(fbl: int, pm: int = 0) -> tuple:
 def pm_to_fbl(pm: int, sub: int = 0) -> int:
     """Map PM byte to FBL byte for Type 2 devices.
 
-    Uses the mode-2 mapping from FormCZTV.cs.
+    Default: PM=FBL (same convention as SCSI poll bytes).
+    Only overrides for the few PM values where PM ≠ FBL.
     Special case: PM=1 + SUB=48 → FBL=114, PM=1 + SUB=49 → FBL=192.
     """
     if pm == 1 and sub == 48:
         return 114
     if pm == 1 and sub == 49:
         return 192
-    return _PM_TO_FBL_TYPE2.get(pm, 100)  # Default to FBL=100 (320x320)
+    return _PM_TO_FBL_OVERRIDES.get(pm, pm)
 
 
 # =========================================================================

{trcc_linux-2.0.0 → trcc_linux-2.0.1}/src/trcc/device_scsi.py

@@ -18,6 +18,7 @@ import tempfile
 import time
 from typing import Dict, List, Set
 
+from .constants import RESOLUTION_TO_PM as _RESOLUTION_TO_PM
 from .device_base import HandshakeResult
 from .paths import require_sg_raw
 
@@ -33,21 +34,6 @@ _BOOT_MAX_RETRIES = 5
 # Brief pause after init before first frame (lets controller settle)
 _POST_INIT_DELAY = 0.1
 
-# SCSI poll byte[0] = resolution code, which USBLCD.exe writes to shared
-# memory as the PM value.  Resolution → PM mapping (from USBLCD.exe):
-#   '$' = 0x24 = 36  → 240×240 (FW SE 2.0")
-#   '2' = 0x32 = 50  → 240×320 (FW standard 2.4")
-#   '3' = 0x33 = 51  → 320×240 (FW standard 2.4", rotated)
-#   'd' = 0x64 = 100 → 320×320 (FW Pro 2.73")
-#   'e' = 0x65 = 101 → 480×480
-_RESOLUTION_TO_PM: dict[tuple[int, int], int] = {
-    (240, 240): 36,
-    (240, 320): 50,
-    (320, 240): 51,
-    (320, 320): 100,
-    (480, 480): 101,
-}
-
 # =========================================================================
 # Low-level SCSI helpers (Mode 3 protocol, from USBLCD.exe 20480-20540)
 # =========================================================================

{trcc_linux-2.0.0 → trcc_linux-2.0.1}/src/trcc/overlay_renderer.py

@@ -140,6 +140,9 @@ class OverlayRenderer:
         if image is None:
             self.background = None
             return
+        if not self.width or not self.height:
+            self.background = image
+            return
         # Skip resize if already correct size (video frames are pre-sized)
         if image.size == (self.width, self.height):
             self.background = image  # Use directly, no copy needed for video

{trcc_linux-2.0.0 → trcc_linux-2.0.1}/src/trcc/qt_components/qt_app_mvc.py

@@ -655,15 +655,9 @@ class TRCCMainWindowMVC(QMainWindow):
         close_btn.clicked.connect(self.close)
 
     def _on_help_clicked(self):
-        """Open User Guide PDF. Windows opens LCDHelp.pdf; we open Thermalright User Guide."""
+        """Open project README on GitHub."""
         import webbrowser
-        from pathlib import Path
-
-        doc = Path(__file__).resolve().parents[3] / 'doc' / 'User Guide.pdf'
-        if doc.exists():
-            webbrowser.open(doc.as_uri())
-        else:
-            webbrowser.open('https://github.com/thermalright/trcc-linux#readme')
+        webbrowser.open('https://github.com/Lexonight1/thermalright-trcc-linux#readme')
 
     def _apply_settings_backgrounds(self):
         """Apply localized P01 backgrounds to display mode panels in UCThemeSetting.

{trcc_linux-2.0.0 → trcc_linux-2.0.1}/tests/hid_testing/test_device_hid.py

@@ -235,8 +235,8 @@ class TestType2DeviceInfo:
         """Type 2 resolves FBL from PM byte via pm_to_fbl()."""
         resp = _make_type2_valid_response()
         info = HidDeviceType2.parse_device_info(resp)
-        # PM=resp[5]=0x03 is not in _PM_TO_FBL_TYPE2, so defaults to FBL=100
-        assert info.fbl == 100
+        # PM=resp[5]=0x03, default PM=FBL, FBL=3 not in table → (320, 320)
+        assert info.fbl == 3
         assert info.resolution == (320, 320)
 
 

{trcc_linux-2.0.0 → trcc_linux-2.0.1}/tests/test_media_player.py

@@ -237,6 +237,7 @@ class TestExtractFrames(unittest.TestCase):
         self.assertEqual(result, 0)
 
     @patch('subprocess.run')
+    @patch('trcc.media_player.FFMPEG_AVAILABLE', True)
     def test_success_counts_frames(self, mock_run):
         mock_run.return_value = MagicMock(returncode=0)
 
@@ -250,6 +251,7 @@ class TestExtractFrames(unittest.TestCase):
             self.assertEqual(result, 5)
 
     @patch('subprocess.run')
+    @patch('trcc.media_player.FFMPEG_AVAILABLE', True)
     def test_with_max_frames(self, mock_run):
         mock_run.return_value = MagicMock(returncode=0)
 
@@ -261,6 +263,7 @@ class TestExtractFrames(unittest.TestCase):
             self.assertIn('10', cmd)
 
     @patch('subprocess.run')
+    @patch('trcc.media_player.FFMPEG_AVAILABLE', True)
     def test_ffmpeg_error_returns_zero(self, mock_run):
         mock_run.return_value = MagicMock(returncode=1, stderr=b'error')
 
@@ -270,6 +273,7 @@ class TestExtractFrames(unittest.TestCase):
             self.assertEqual(result, 0)
 
     @patch('subprocess.run', side_effect=Exception("ffmpeg crashed"))
+    @patch('trcc.media_player.FFMPEG_AVAILABLE', True)
     def test_ffmpeg_exception_returns_zero(self, _):
         with tempfile.TemporaryDirectory() as outdir:
             result = VideoPlayer.extract_frames(
@@ -277,6 +281,7 @@ class TestExtractFrames(unittest.TestCase):
             self.assertEqual(result, 0)
 
     @patch('subprocess.run')
+    @patch('trcc.media_player.FFMPEG_AVAILABLE', True)
     def test_ffmpeg_timeout_returns_zero(self, mock_run):
         import subprocess as sp
         mock_run.side_effect = sp.TimeoutExpired('ffmpeg', 600)

trcc_linux-2.0.0/src/trcc/gif_animator.py

@@ -1,19 +0,0 @@
-"""Backward-compat re-exports — moved to media_player.py."""
-
-from trcc.media_player import (
-    FFMPEG_AVAILABLE,
-    AbstractMediaPlayer,
-    GIFAnimator,
-    GIFThemeLoader,
-    ThemeZtPlayer,
-    VideoPlayer,
-)
-
-__all__ = [
-    "FFMPEG_AVAILABLE",
-    "AbstractMediaPlayer",
-    "GIFAnimator",
-    "GIFThemeLoader",
-    "ThemeZtPlayer",
-    "VideoPlayer",
-]

trcc_linux-2.0.0/src/trcc/hr10_display.py

@@ -1,15 +0,0 @@
-"""Backward-compat — merged into device_led_hr10.py."""
-from .device_led_hr10 import (  # noqa: F401
-    CHAR_SEGMENTS,
-    DIGIT_LEDS,
-    IND_DEG,
-    IND_MBS,
-    IND_PCT,
-    LED_COUNT,
-    WIRE_ORDER,
-    Hr10Display,
-    apply_animation_colors,
-    get_digit_mask,
-    render_display,
-    render_metric,
-)

trcc_linux-2.0.0/src/trcc/hr10_tempd.py

@@ -1,13 +0,0 @@
-"""Backward-compat — merged into device_led_hr10.py."""
-from .device_led_hr10 import (  # noqa: F401
-    SSD_PROFILES,
-    breathe_brightness,
-    celsius_to_f,
-    find_nvme_hwmon,
-    read_temp_celsius,
-    select_profile,
-    temp_to_color,
-)
-from .device_led_hr10 import (
-    run_hr10_daemon as run_daemon,  # noqa: F401
-)