trcc-linux 3.0.8__tar.gz → 3.0.9__tar.gz

{trcc_linux-3.0.8 → trcc_linux-3.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trcc-linux
-Version: 3.0.8
+Version: 3.0.9
 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-3.0.8 → trcc_linux-3.0.9}/pyproject.toml

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

{trcc_linux-3.0.8 → trcc_linux-3.0.9}/src/trcc/__version__.py

@@ -1,6 +1,6 @@
 """TRCC Linux version information."""
 
-__version__ = "3.0.8"
+__version__ = "3.0.9"
 __version_info__ = tuple(int(x) for x in __version__.split("."))
 
 # Version history:
@@ -104,3 +104,7 @@ __version_info__ = tuple(int(x) for x in __version__.split("."))
 #          (show only CPU or GPU instead of always both). OOP refactor: move
 #          loose functions into classes across 5 files (conf.py, device_scsi.py,
 #          device_led_hr10.py, device_factory.py, device_hid.py). 2290 tests.
+# 3.0.9  - Fix PA120 LED remap table (misplaced SSD/HSD/C11/B11 block shifted
+#          zones 4+ by 4 wire positions). Fix HID Type 2 frame send: chunk at
+#          512 bytes matching C# UCDevice.cs, skip redundant SetConfiguration
+#          to prevent USB bus reset on Linux. 2290 tests.

{trcc_linux-3.0.8 → trcc_linux-3.0.9}/src/trcc/device_hid.py

@@ -441,8 +441,9 @@ class HidDeviceType2(HidDevice):
     def send_frame(self, image_data: bytes) -> bool:
         """Send one image frame to the device.
 
-        Matches C# frame loop: synchronous Transfer() to Ep02,
-        then Thread.Sleep(1).
+        TRCC (UCDevice.cs ThreadSendDeviceData2) sends frames in 512-byte
+        chunks via UsbHidDevice.SendMessage().  We mirror that: build the
+        padded packet, then write it in 512-byte pieces.
 
         Args:
             image_data: Raw image bytes (JPEG or other format the
@@ -458,12 +459,17 @@ class HidDeviceType2(HidDevice):
             raise RuntimeError("Type 2 device not initialized — call handshake() first")
 
         packet = self.build_frame_packet(image_data)
-        transferred = self.transport.write(EP_WRITE_02, packet, DEFAULT_TIMEOUT_MS)
+
+        # C# UCDevice.cs ThreadSendDeviceData2: sends 512-byte chunks
+        total = 0
+        for offset in range(0, len(packet), USB_BULK_ALIGNMENT):
+            chunk = packet[offset:offset + USB_BULK_ALIGNMENT]
+            total += self.transport.write(EP_WRITE_02, chunk, DEFAULT_TIMEOUT_MS)
 
         # C#: Thread.Sleep(1) after frame transfer
         time.sleep(DELAY_FRAME_TYPE2_S)
 
-        return transferred > 0
+        return total > 0
 
 
 # =========================================================================
@@ -715,7 +721,16 @@ class PyUsbTransport(UsbTransport):
             log.debug("Kernel driver detach: %s", e)
 
         # C#: SetConfiguration(1), ClaimInterface(0)
-        self._device.set_configuration(USB_CONFIGURATION)  # type: ignore[union-attr]
+        # On Linux, set_configuration() sends a real SET_CONFIGURATION control
+        # transfer which can reset the USB bus if the device is already configured.
+        # Windows LibUsbDotNet makes it a no-op when already at that config.
+        # Skip if the device is already at the right configuration.
+        try:
+            cfg: Any = self._device.get_active_configuration()  # type: ignore[union-attr]
+            if cfg.bConfigurationValue != USB_CONFIGURATION:
+                self._device.set_configuration(USB_CONFIGURATION)  # type: ignore[union-attr]
+        except usb.core.USBError:
+            self._device.set_configuration(USB_CONFIGURATION)  # type: ignore[union-attr]
         usb.util.claim_interface(self._device, USB_INTERFACE)  # type: ignore[union-attr]
         self._is_open = True
 

{trcc_linux-3.0.8 → trcc_linux-3.0.9}/src/trcc/device_led.py

@@ -229,8 +229,6 @@ _REMAP_STYLE_2: tuple[int, ...] = (
     21, 16, 17, 22, 20, 19, 18,
     # Zone 3: F A B G E D C
     28, 23, 24, 29, 27, 26, 25,
-    # SSD HSD C11 B11
-    6, 7, 81, 80,
     # Zone 4: F A B G E D C
     36, 31, 32, 37, 35, 34, 33,
     # Zone 5: F A B G E D C
@@ -249,8 +247,8 @@ _REMAP_STYLE_2: tuple[int, ...] = (
     54, 55, 56, 58, 53, 52, 57,
     # Zone 6 (reversed): C D E G B A F
     47, 48, 49, 51, 46, 45, 50,
-    # Gpu1 Gpu2
-    4, 5,
+    # Gpu1 Gpu2 SSD HSD C11 B11
+    4, 5, 6, 7, 81, 80,
 )
 
 # Style 3: AK120_DIGITAL (64 LEDs, 2 zones)

{trcc_linux-3.0.8 → trcc_linux-3.0.9}/src/trcc/device_led_segment.py

@@ -126,6 +126,16 @@ class SegmentDisplay(ABC):
             return "gpu"
         return "other"
 
+    # ── Temperature conversion ────────────────────────────────────
+
+    @staticmethod
+    def _to_display_temp(celsius: float, temp_unit: str) -> int:
+        """Convert temperature for display. C#: value * 9 / 5 + 32."""
+        v = int(celsius)
+        if temp_unit == "F":
+            v = v * 9 // 5 + 32
+        return v
+
     # ── Shared encoding logic ──────────────────────────────────────
 
     def _encode_3digit(
@@ -302,7 +312,10 @@ class AX120Display(SegmentDisplay):
         else:
             mask[self.PERCENT] = True
 
-        self._encode_3digit(int(metrics.get(metric_key, 0)), self.DIGITS, mask)
+        value = int(metrics.get(metric_key, 0))
+        if is_temp:
+            value = self._to_display_temp(value, temp_unit)
+        self._encode_3digit(value, self.DIGITS, mask)
         return mask
 
 
@@ -375,14 +388,16 @@ class PA120Display(SegmentDisplay):
 
         # All 4 metrics simultaneously
         self._encode_3digit(
-            int(metrics.get('cpu_temp', 0)), self.CPU_TEMP_DIGITS, mask,
+            self._to_display_temp(metrics.get('cpu_temp', 0), temp_unit),
+            self.CPU_TEMP_DIGITS, mask,
         )
         self._encode_2digit_partial(
             int(metrics.get('cpu_percent', 0)),
             self.CPU_USE_DIGITS, self.CPU_USE_PARTIAL, mask,
         )
         self._encode_3digit(
-            int(metrics.get('gpu_temp', 0)), self.GPU_TEMP_DIGITS, mask,
+            self._to_display_temp(metrics.get('gpu_temp', 0), temp_unit),
+            self.GPU_TEMP_DIGITS, mask,
         )
 
         # GPU usage: tens (full) + ones (B,C only) + hundreds (partial)
@@ -468,7 +483,7 @@ class AK120Display(SegmentDisplay):
         mask[self.SSD if temp_unit == "C" else self.HSD] = True
 
         self._encode_3digit(int(metrics.get(watt_key, 0)), self.WATT_DIGITS, mask)
-        self._encode_3digit(int(metrics.get(temp_key, 0)), self.TEMP_DIGITS, mask)
+        self._encode_3digit(self._to_display_temp(metrics.get(temp_key, 0), temp_unit), self.TEMP_DIGITS, mask)
         self._encode_2digit_partial(
             int(metrics.get(use_key, 0)), self.USE_DIGITS, self.USE_PARTIAL, mask,
         )
@@ -527,7 +542,7 @@ class LC1Display(SegmentDisplay):
 
         value = int(metrics.get(metric_key, 0))
         if actual_mode == -1:
-            value = value * 9 // 5 + 32
+            value = self._to_display_temp(value, "F")
         self._encode_3digit(value, self.DIGITS, mask)
         self._encode_unit(actual_mode, self.UNIT_DIGIT, mask)
         return mask
@@ -601,7 +616,7 @@ class LF8Display(SegmentDisplay):
         mask[src] = True
         mask[self.SSD if temp_unit == "C" else self.HSD] = True
 
-        self._encode_3digit(int(metrics.get(temp_key, 0)), self.TEMP_DIGITS, mask)
+        self._encode_3digit(self._to_display_temp(metrics.get(temp_key, 0), temp_unit), self.TEMP_DIGITS, mask)
         self._encode_3digit(int(metrics.get(watt_key, 0)), self.WATT_DIGITS, mask)
         self._encode_3digit(int(metrics.get(mhz_key, 0)), self.MHZ_DIGITS, mask)
         self._encode_2digit_partial(
@@ -637,7 +652,7 @@ class LF12Display(LF8Display):
         mask[src] = True
         mask[self.SSD if temp_unit == "C" else self.HSD] = True
 
-        self._encode_3digit(int(metrics.get(temp_key, 0)), self.TEMP_DIGITS, mask)
+        self._encode_3digit(self._to_display_temp(metrics.get(temp_key, 0), temp_unit), self.TEMP_DIGITS, mask)
         self._encode_3digit(int(metrics.get(watt_key, 0)), self.WATT_DIGITS, mask)
         self._encode_3digit(int(metrics.get(mhz_key, 0)), self.MHZ_DIGITS, mask)
         self._encode_2digit_partial(
@@ -706,11 +721,13 @@ class LF10Display(SegmentDisplay):
 
         # CPU temp (digits 1-3)
         self._encode_3digit_13seg(
-            int(metrics.get('cpu_temp', 0)), self.DIGIT_LEDS_13[0:3], mask,
+            self._to_display_temp(metrics.get('cpu_temp', 0), temp_unit),
+            self.DIGIT_LEDS_13[0:3], mask,
         )
         # GPU temp (digits 4-6)
         self._encode_3digit_13seg(
-            int(metrics.get('gpu_temp', 0)), self.DIGIT_LEDS_13[3:6], mask,
+            self._to_display_temp(metrics.get('gpu_temp', 0), temp_unit),
+            self.DIGIT_LEDS_13[3:6], mask,
         )
 
         for idx in self.DECORATION:
@@ -764,7 +781,10 @@ class CZ1Display(SegmentDisplay):
         for idx in indicator_on:
             mask[idx] = True
 
-        self._encode_2digit(int(metrics.get(metric_key, 0)), self.DIGITS, mask)
+        value = int(metrics.get(metric_key, 0))
+        if 'temp' in metric_key:
+            value = self._to_display_temp(value, temp_unit)
+        self._encode_2digit(value, self.DIGITS, mask)
         return mask
 
 
@@ -891,6 +911,8 @@ class LF11Display(SegmentDisplay):
             mask[self.BFB] = True
 
         value = int(metrics.get(metric_key, 0))
+        if is_temp:
+            value = self._to_display_temp(value, temp_unit)
         self._encode_3digit(value, self.DIGITS[0:3], mask)
 
         if is_temp:

{trcc_linux-3.0.8 → trcc_linux-3.0.9}/src/trcc/qt_components/constants.py

@@ -289,16 +289,29 @@ class Layout:
         # (x, y, lang_suffix)
         (297, 373, 'en'),   # English
         (387, 373, 'd'),    # Deutsch
-        (477, 373, 'r'),    # Россия
+        (477, 373, 'e'),    # Россия
         (567, 373, 'f'),    # Français
         (657, 373, 'p'),    # Português
-        (297, 403, 'x'),    # 日本語
-        (387, 403, 'e'),    # Español
+        (297, 403, 'r'),    # 日本語
+        (387, 403, 'x'),    # Español
         (477, 403, ''),     # 中文简体
         (567, 403, 'tc'),   # 中文繁體
     ]
     ABOUT_CHECKBOX_SIZE = 14
 
+    # System locale → Windows asset suffix (for auto-detect on startup)
+    LOCALE_TO_LANG = {
+        'zh_CN': '',     # Chinese Simplified = default (no suffix)
+        'zh_TW': 'tc',   # Traditional Chinese
+        'en': 'en',       # English
+        'de': 'd',        # German
+        'es': 'x',        # Spanish
+        'fr': 'f',        # French
+        'pt': 'p',        # Portuguese
+        'ru': 'e',        # Russian
+        'ja': 'r',        # Japanese
+    }
+
 
 class Styles:
     """Reusable stylesheet fragments."""

{trcc_linux-3.0.8 → trcc_linux-3.0.9}/src/trcc/qt_components/qt_app_mvc.py

@@ -64,18 +64,7 @@ from .uc_video_cut import UCVideoCut
 
 log = logging.getLogger(__name__)
 
-# Language code mapping: system locale -> Windows asset suffix
-LOCALE_TO_LANG = {
-    'zh_CN': '',     # Chinese Simplified = default (no suffix)
-    'zh_TW': 'tc',   # Traditional Chinese
-    'en': 'en',       # English
-    'de': 'd',        # German
-    'es': 'e',        # Spanish
-    'fr': 'f',        # French
-    'pt': 'p',        # Portuguese
-    'ru': 'r',        # Russian
-    'ja': 'x',        # Japanese
-}
+LOCALE_TO_LANG = Layout.LOCALE_TO_LANG
 
 
 def detect_language() -> str:

{trcc_linux-3.0.8 → trcc_linux-3.0.9}/tests/hid_testing/test_device_led.py

@@ -1334,14 +1334,22 @@ class TestRemapLedColors:
         assert remapped[0] == (40, 50, 60)  # Physical 0 = Cpu2
         assert remapped[1] == (10, 20, 30)  # Physical 1 = Cpu1
 
-    def test_style_2_gpu_at_end(self):
-        """Style 2 last two physical positions are Gpu1 and Gpu2."""
+    def test_style_2_gpu_and_tail(self):
+        """Style 2 physical 78-83: Gpu1, Gpu2, SSD, HSD, C11, B11."""
         colors = [(0, 0, 0)] * 84
         colors[4] = (100, 0, 0)    # Gpu1 at logical 4
         colors[5] = (0, 100, 0)    # Gpu2 at logical 5
+        colors[6] = (0, 0, 100)    # SSD at logical 6
+        colors[7] = (50, 50, 0)    # HSD at logical 7
+        colors[81] = (0, 50, 50)   # C11 at logical 81
+        colors[80] = (50, 0, 50)   # B11 at logical 80
         remapped = remap_led_colors(colors, style_id=2)
-        assert remapped[82] == (100, 0, 0)  # Physical 82 = Gpu1
-        assert remapped[83] == (0, 100, 0)  # Physical 83 = Gpu2
+        assert remapped[78] == (100, 0, 0)  # Physical 78 = Gpu1
+        assert remapped[79] == (0, 100, 0)  # Physical 79 = Gpu2
+        assert remapped[80] == (0, 0, 100)  # Physical 80 = SSD
+        assert remapped[81] == (50, 50, 0)  # Physical 81 = HSD
+        assert remapped[82] == (0, 50, 50)  # Physical 82 = C11
+        assert remapped[83] == (50, 0, 50)  # Physical 83 = B11
 
     def test_style_2_uniform_color_unchanged_count(self):
         """Uniform color (all same) remaps to same colors in different order."""