trcc-linux 8.4.0__tar.gz → 8.4.2__tar.gz

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trcc-linux
-Version: 8.4.0
+Version: 8.4.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
@@ -29,6 +29,7 @@ Requires-Dist: numpy>=1.24.0
 Requires-Dist: pillow>=10.0.0
 Requires-Dist: psutil>=5.9.0
 Requires-Dist: pyside6>=6.5.0
+Requires-Dist: python-multipart>=0.0.6
 Requires-Dist: pyusb>=1.2.0
 Requires-Dist: typer>=0.9.0
 Requires-Dist: uvicorn[standard]>=0.20
@@ -40,7 +41,6 @@ Requires-Dist: nvidia-ml-py>=11.0.0; extra == 'all'
 Requires-Dist: pygobject>=3.42.0; extra == 'all'
 Requires-Dist: pytest-cov>=4.0.0; extra == 'all'
 Requires-Dist: pytest>=7.0.0; extra == 'all'
-Requires-Dist: python-multipart>=0.0.6; extra == 'all'
 Requires-Dist: qrcode>=7.0; extra == 'all'
 Requires-Dist: ruff>=0.4.0; extra == 'all'
 Requires-Dist: types-qrcode>=7.0; extra == 'all'
@@ -48,7 +48,6 @@ Provides-Extra: dev
 Requires-Dist: httpx>=0.24.0; extra == 'dev'
 Requires-Dist: pytest-cov>=4.0.0; extra == 'dev'
 Requires-Dist: pytest>=7.0.0; extra == 'dev'
-Requires-Dist: python-multipart>=0.0.6; extra == 'dev'
 Requires-Dist: ruff>=0.4.0; extra == 'dev'
 Requires-Dist: types-qrcode>=7.0; extra == 'dev'
 Provides-Extra: hid
@@ -60,6 +59,8 @@ Requires-Dist: qrcode>=7.0; extra == 'remote'
 Provides-Extra: wayland
 Requires-Dist: dbus-python>=1.3.0; extra == 'wayland'
 Requires-Dist: pygobject>=3.42.0; extra == 'wayland'
+Provides-Extra: windows
+Requires-Dist: wmi>=1.5.1; (sys_platform == 'win32') and extra == 'windows'
 Description-Content-Type: text/markdown
 
 # TRCC Linux
@@ -76,7 +77,7 @@ Description-Content-Type: text/markdown
 [![Platform](https://img.shields.io/badge/platform-Linux-FCC624?logo=linux&logoColor=black)](https://github.com/Lexonight1/thermalright-trcc-linux)
 
 [![CI](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml/badge.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
-[![Tests](https://img.shields.io/badge/tests-5163_passed-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
+[![Tests](https://img.shields.io/badge/tests-5207_passed-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
 [![Coverage](https://img.shields.io/badge/coverage-73%25-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
 [![Python](https://img.shields.io/badge/python-3.9%2B-blue.svg)](https://python.org)
 [![Code Style](https://img.shields.io/badge/code_style-ruff-D7FF64?logo=ruff&logoColor=black)](https://docs.astral.sh/ruff/)
@@ -124,13 +125,13 @@ Pre-built packages are available for every major distro. No pip, no venv, no PEP
 
 **Fedora / openSUSE / Nobara:**
 ```bash
-sudo dnf install https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.4.0-1.fc43.noarch.rpm
+sudo dnf install https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.4.2-1.fc43.noarch.rpm
 ```
 
 **Ubuntu 24.04+ / Debian 13+ / Mint 22+ / Pop!_OS 24.04+ / Zorin 17+:**
 ```bash
-curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux_8.4.0-1_all.deb
-sudo dpkg -i trcc-linux_8.4.0-1_all.deb
+curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux_8.4.2-1_all.deb
+sudo dpkg -i trcc-linux_8.4.2-1_all.deb
 sudo apt-get install -f    # pulls in any missing dependencies
 ```
 
@@ -138,8 +139,8 @@ sudo apt-get install -f    # pulls in any missing dependencies
 
 **Arch / CachyOS / Manjaro / EndeavourOS / Garuda:**
 ```bash
-curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.4.0-1-any.pkg.tar.zst
-sudo pacman -U trcc-linux-8.4.0-1-any.pkg.tar.zst
+curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.4.2-1-any.pkg.tar.zst
+sudo pacman -U trcc-linux-8.4.2-1-any.pkg.tar.zst
 ```
 
 **NixOS** — add to your `flake.nix` inputs:
@@ -164,7 +165,7 @@ That's it! If your device isn't detected, run `trcc detect --all` to see what's
 
 ### Windows (experimental)
 
-Download `trcc-8.4.0-setup.exe` from the [latest release](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) and run the installer. It installs both the GUI and CLI:
+Download `trcc-8.4.2-setup.exe` from the [latest release](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) and run the installer. It installs both the GUI and CLI:
 
 - **TRCC** shortcut in Start Menu — launches the GUI
 - **`trcc`** command in Command Prompt/PowerShell — CLI access (installer adds it to PATH)
@@ -173,7 +174,7 @@ Download `trcc-8.4.0-setup.exe` from the [latest release](https://github.com/Lex
 
 ### macOS (experimental)
 
-Download `trcc-8.4.0-macos.dmg` from the [latest release](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest), open the DMG, and drag **TRCC** to Applications.
+Download `trcc-8.4.2-macos.dmg` from the [latest release](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest), open the DMG, and drag **TRCC** to Applications.
 
 > Requires macOS 11+. Install `libusb` first: `brew install libusb`. LCD devices using SCSI (most models) need `sudo` to detach the kernel driver — HID devices work without root. On Apple Silicon Macs, sensor reading requires `sudo` for `powermetrics` access.
 

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/README.md

@@ -12,7 +12,7 @@
 [![Platform](https://img.shields.io/badge/platform-Linux-FCC624?logo=linux&logoColor=black)](https://github.com/Lexonight1/thermalright-trcc-linux)
 
 [![CI](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml/badge.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
-[![Tests](https://img.shields.io/badge/tests-5163_passed-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
+[![Tests](https://img.shields.io/badge/tests-5207_passed-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
 [![Coverage](https://img.shields.io/badge/coverage-73%25-brightgreen.svg)](https://github.com/Lexonight1/thermalright-trcc-linux/actions/workflows/ci.yml)
 [![Python](https://img.shields.io/badge/python-3.9%2B-blue.svg)](https://python.org)
 [![Code Style](https://img.shields.io/badge/code_style-ruff-D7FF64?logo=ruff&logoColor=black)](https://docs.astral.sh/ruff/)
@@ -60,13 +60,13 @@ Pre-built packages are available for every major distro. No pip, no venv, no PEP
 
 **Fedora / openSUSE / Nobara:**
 ```bash
-sudo dnf install https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.4.0-1.fc43.noarch.rpm
+sudo dnf install https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.4.2-1.fc43.noarch.rpm
 ```
 
 **Ubuntu 24.04+ / Debian 13+ / Mint 22+ / Pop!_OS 24.04+ / Zorin 17+:**
 ```bash
-curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux_8.4.0-1_all.deb
-sudo dpkg -i trcc-linux_8.4.0-1_all.deb
+curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux_8.4.2-1_all.deb
+sudo dpkg -i trcc-linux_8.4.2-1_all.deb
 sudo apt-get install -f    # pulls in any missing dependencies
 ```
 
@@ -74,8 +74,8 @@ sudo apt-get install -f    # pulls in any missing dependencies
 
 **Arch / CachyOS / Manjaro / EndeavourOS / Garuda:**
 ```bash
-curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.4.0-1-any.pkg.tar.zst
-sudo pacman -U trcc-linux-8.4.0-1-any.pkg.tar.zst
+curl -LO https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest/download/trcc-linux-8.4.2-1-any.pkg.tar.zst
+sudo pacman -U trcc-linux-8.4.2-1-any.pkg.tar.zst
 ```
 
 **NixOS** — add to your `flake.nix` inputs:
@@ -100,7 +100,7 @@ That's it! If your device isn't detected, run `trcc detect --all` to see what's
 
 ### Windows (experimental)
 
-Download `trcc-8.4.0-setup.exe` from the [latest release](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) and run the installer. It installs both the GUI and CLI:
+Download `trcc-8.4.2-setup.exe` from the [latest release](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest) and run the installer. It installs both the GUI and CLI:
 
 - **TRCC** shortcut in Start Menu — launches the GUI
 - **`trcc`** command in Command Prompt/PowerShell — CLI access (installer adds it to PATH)
@@ -109,7 +109,7 @@ Download `trcc-8.4.0-setup.exe` from the [latest release](https://github.com/Lex
 
 ### macOS (experimental)
 
-Download `trcc-8.4.0-macos.dmg` from the [latest release](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest), open the DMG, and drag **TRCC** to Applications.
+Download `trcc-8.4.2-macos.dmg` from the [latest release](https://github.com/Lexonight1/thermalright-trcc-linux/releases/latest), open the DMG, and drag **TRCC** to Applications.
 
 > Requires macOS 11+. Install `libusb` first: `brew install libusb`. LCD devices using SCSI (most models) need `sudo` to detach the kernel driver — HID devices work without root. On Apple Silicon Macs, sensor reading requires `sudo` for `powermetrics` access.
 

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "trcc-linux"
-version = "8.4.0"
+version = "8.4.2"
 description = "Linux implementation of Thermalright LCD Control Center"
 readme = "README.md"
 license = "GPL-3.0-or-later"
@@ -38,6 +38,7 @@ dependencies = [
     "typer>=0.9.0",
     "fastapi>=0.100",
     "uvicorn[standard]>=0.20",
+    "python-multipart>=0.0.6",
 ]
 
 [project.optional-dependencies]
@@ -48,6 +49,9 @@ wayland = [
     "dbus-python>=1.3.0",
     "PyGObject>=3.42.0",
 ]
+windows = [
+    "wmi>=1.5.1; sys_platform == 'win32'",
+]
 hid = [
     "hidapi>=0.14.0",
 ]
@@ -59,7 +63,6 @@ dev = [
     "pytest-cov>=4.0.0",
     "ruff>=0.4.0",
     "httpx>=0.24.0",
-    "python-multipart>=0.0.6",
     "types-qrcode>=7.0",
 ]
 all = [

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/src/trcc/__version__.py

@@ -1,4 +1,4 @@
 """TRCC Linux version information. History in doc/CHANGELOG.md."""
 
-__version__ = "8.4.0"
+__version__ = "8.4.2"
 __version_info__ = tuple(int(x) for x in __version__.split("."))

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/src/trcc/adapters/device/bulk.py

@@ -123,6 +123,8 @@ class BulkDevice(BulkFrameDevice, FrameDevice):
         return HandshakeResult(
             resolution=resolution,
             model_id=fbl,
+            pm_byte=self.pm,
+            sub_byte=self.sub_type,
             raw_response=resp,
         )
 

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/src/trcc/adapters/device/detector.py

@@ -35,6 +35,7 @@ from trcc.core.models import (
     DetectedDevice,  # noqa: F401 — re-export
     DeviceEntry,  # noqa: F401 — re-export
 )
+from trcc.core.platform import BSD, MACOS, WINDOWS
 
 log = logging.getLogger(__name__)
 
@@ -611,13 +612,35 @@ def main():
     return 0
 
 
-# Aliases used by cli/, __init__.py, and tests
+# Aliases used by cli/, __init__.py, and tests.
+# Platform-aware: route to the correct detector based on OS.
 _get_all_devices = DeviceDetector._get_all_registries
-detect_devices = DeviceDetector.detect
 check_udev_rules = DeviceDetector.check_udev_rules
-get_default_device = DeviceDetector.get_default
 get_device_path = DeviceDetector.get_device_path
 
+if WINDOWS:
+    from trcc.adapters.device.windows.detector import WindowsDeviceDetector
+    detect_devices = WindowsDeviceDetector.detect
+elif MACOS:
+    from trcc.adapters.device.macos.detector import MacOSDeviceDetector
+    detect_devices = MacOSDeviceDetector.detect
+elif BSD:
+    from trcc.adapters.device.bsd.detector import BSDDeviceDetector
+    detect_devices = BSDDeviceDetector.detect
+else:
+    detect_devices = DeviceDetector.detect
+
+
+def get_default_device() -> 'Optional[DetectedDevice]':
+    """Get the first available LCD device (platform-aware)."""
+    devices = detect_devices()
+    if not devices:
+        return None
+    for device in devices:
+        if device.vid == 0x87CD:
+            return device
+    return devices[0]
+
 
 if __name__ == '__main__':
     import sys

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/src/trcc/adapters/device/hid.py

@@ -347,6 +347,8 @@ class HidDeviceType2(HidDevice):
             resolution=resolution,
             model_id=pm,
             serial=serial,
+            pm_byte=pm,
+            sub_byte=sub,
             raw_response=bytes(resp[:64]),
             device_type=2,
             mode_byte_1=pm,
@@ -502,6 +504,8 @@ class HidDeviceType3(HidDevice):
             resolution=resolution,
             model_id=fbl,
             serial=serial,
+            pm_byte=fbl,
+            sub_byte=0,
             raw_response=bytes(resp[:64]),
             device_type=3,
             mode_byte_1=fbl,

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/src/trcc/adapters/device/ly.py

@@ -128,6 +128,8 @@ class LyDevice(BulkFrameDevice, FrameDevice):
         return HandshakeResult(
             resolution=resolution,
             model_id=fbl,
+            pm_byte=self.pm,
+            sub_byte=self.sub_type,
             raw_response=resp,
         )
 

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/src/trcc/adapters/device/scsi.py

@@ -16,7 +16,6 @@ from __future__ import annotations
 
 import binascii
 import ctypes
-import fcntl
 import logging
 import os
 import struct
@@ -128,6 +127,8 @@ def _get_write_bufs(cdb_len: int, data_len: int) -> tuple:
 
 def _sg_io_write(dev: str, cdb: bytes, data: bytes) -> bool:
     """SCSI write via SG_IO ioctl. No subprocess, no temp file."""
+    import fcntl  # Unix-only — Windows uses windows/scsi.py
+
     fd = _get_device_fd(dev)
 
     cdb_buf, data_buf, _sense, hdr, ioctl_buf = _get_write_bufs(len(cdb), len(data))
@@ -144,6 +145,8 @@ def _sg_io_write(dev: str, cdb: bytes, data: bytes) -> bool:
 
 def _sg_io_read(dev: str, cdb: bytes, length: int) -> bytes:
     """SCSI read via SG_IO ioctl. No subprocess."""
+    import fcntl  # Unix-only — Windows uses windows/scsi.py
+
     fd = _get_device_fd(dev)
 
     cdb_buf = (ctypes.c_ubyte * len(cdb)).from_buffer_copy(cdb)

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/src/trcc/adapters/infra/debug_report.py

@@ -21,6 +21,8 @@ import subprocess
 from dataclasses import dataclass, field
 from pathlib import Path
 
+from trcc.core.platform import LINUX
+
 log = logging.getLogger(__name__)
 
 # All known Thermalright VIDs (lowercase hex, no prefix)
@@ -51,13 +53,15 @@ class DebugReport:
     def collect(self) -> None:
         """Gather all diagnostic sections."""
         self._version()
-        self._lsusb()
-        self._udev_rules()
-        self._selinux()
-        self._rapl_permissions()
+        if LINUX:
+            self._lsusb()
+            self._udev_rules()
+            self._selinux()
+            self._rapl_permissions()
         self._dependencies()
         self._devices()
-        self._device_permissions()
+        if LINUX:
+            self._device_permissions()
         self._handshakes()
         self._process_usage()
         self._config()
@@ -99,7 +103,9 @@ class DebugReport:
 
     @staticmethod
     def _distro_name() -> str:
-        """Get Linux distro name (e.g. 'Fedora 43', 'Ubuntu 24.04')."""
+        """Get OS/distro name (e.g. 'Fedora 43', 'Windows 11')."""
+        if not LINUX:
+            return platform.platform()
         try:
             # Python 3.10+ — pyright may not know about this on older stubs
             info: dict[str, str] = platform.freedesktop_os_release()  # type: ignore[attr-defined]
@@ -189,9 +195,9 @@ class DebugReport:
     def _devices(self) -> None:
         sec = self._add("Detected devices")
         try:
-            from trcc.adapters.device.detector import DeviceDetector
+            from trcc.adapters.device.detector import detect_devices
 
-            devices = DeviceDetector.detect()
+            devices = detect_devices()
             self._detected_devices = devices
             if not devices:
                 sec.lines.append("  (none)")
@@ -464,7 +470,8 @@ class DebugReport:
                         f"    Result: None ({error or 'no response'})")
                 return
             sec.lines.append(
-                f"    PM={result.model_id}, resolution={result.resolution}, "
+                f"    PM={result.pm_byte}, SUB={result.sub_byte}, "
+                f"FBL={result.model_id}, resolution={result.resolution}, "
                 f"serial={result.serial}"
             )
             if result.raw_response:
@@ -512,7 +519,8 @@ class DebugReport:
                         f"    Result: None ({error or 'no response'})")
                 return
             sec.lines.append(
-                f"    PM={result.model_id}, resolution={result.resolution}, "
+                f"    PM={result.pm_byte}, SUB={result.sub_byte}, "
+                f"FBL={result.model_id}, resolution={result.resolution}, "
                 f"serial={result.serial}"
             )
             if result.raw_response:

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/src/trcc/cli/_device.py

@@ -180,18 +180,20 @@ def detect(show_all=False):
             dev = devices[0]
         print(f"Active: {_format(dev, probe=True)}")
 
-    # Check for stale/missing udev rules on any device
-    from trcc.core.models import PROTOCOL_TRAITS
-
-    for dev in devices:
-        if not check_udev_rules(dev):
-            msg = f"\nDevice {dev.vid:04x}:{dev.pid:04x} needs updated udev rules.\n"
-            msg += "Run:  sudo trcc setup-udev"
-            traits = PROTOCOL_TRAITS.get(dev.protocol, PROTOCOL_TRAITS['scsi'])
-            if traits.requires_reboot:
-                msg += "\nThen reboot for the USB storage quirk to take effect."
-            print(msg)
-            break
+    # Check for stale/missing udev rules (Linux only)
+    from trcc.core.platform import LINUX
+    if LINUX:
+        from trcc.core.models import PROTOCOL_TRAITS
+
+        for dev in devices:
+            if not check_udev_rules(dev):
+                msg = f"\nDevice {dev.vid:04x}:{dev.pid:04x} needs updated udev rules.\n"
+                msg += "Run:  sudo trcc setup-udev"
+                traits = PROTOCOL_TRAITS.get(dev.protocol, PROTOCOL_TRAITS['scsi'])
+                if traits.requires_reboot:
+                    msg += "\nThen reboot for the USB storage quirk to take effect."
+                print(msg)
+                break
 
     return 0
 

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/src/trcc/core/models.py

@@ -396,6 +396,8 @@ class HandshakeResult:
     resolution: Optional[Tuple[int, int]] = None
     model_id: int = 0
     serial: str = ""
+    pm_byte: int = 0   # Raw PM from handshake (for button image lookup)
+    sub_byte: int = 0   # Raw SUB from handshake (for button image lookup)
     raw_response: bytes = field(default=b"", repr=False)
 
 

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/src/trcc/qt_components/trcc_app.py

@@ -1259,7 +1259,10 @@ class TRCCApp(QMainWindow):
                     resolution = getattr(result, 'resolution', None)
                     fbl = getattr(result, 'fbl', None) or getattr(
                         result, 'model_id', None)
-                    self._handshake_done.emit(device, (resolution, fbl))
+                    pm = getattr(result, 'pm_byte', 0)
+                    sub = getattr(result, 'sub_byte', 0)
+                    self._handshake_done.emit(
+                        device, (resolution, fbl, pm, sub))
                 else:
                     self._handshake_done.emit(device, None)
             except Exception as e:
@@ -1272,21 +1275,22 @@ class TRCCApp(QMainWindow):
         if not data:
             self.uc_preview.set_status("Handshake failed — replug device")
             return
-        resolution, fbl = data
+        resolution, fbl, pm, sub = data
         if not resolution or resolution == (0, 0):
             self.uc_preview.set_status("Handshake failed — no resolution")
             return
-        log.info("Handshake OK: %s -> %s (FBL=%s)", device.path, resolution, fbl)
+        log.info("Handshake OK: %s -> %s (FBL=%s, PM=%s, SUB=%s)",
+                 device.path, resolution, fbl, pm, sub)
         device.resolution = resolution
         if fbl:
             device.fbl_code = fbl
-            self._resolve_device_identity(device, fbl)
+            self._resolve_device_identity(device, pm or fbl, sub)
         # use_jpeg is computed from protocol + fbl — no propagation needed
         self._on_device_selected(device)
 
-    def _resolve_device_identity(self, device: DeviceInfo, fbl: int):
+    def _resolve_device_identity(self, device: DeviceInfo, pm: int, sub: int = 0):
         from ..core.models import get_button_image
-        btn_img = get_button_image(fbl)
+        btn_img = get_button_image(pm, sub)
         if not btn_img:
             return
         product = btn_img.replace('A1', '', 1).replace('_', ' ')
@@ -1928,10 +1932,16 @@ def _lock_path() -> Path:
 
 
 def _acquire_instance_lock() -> object | None:
-    import fcntl
+    from trcc.core.platform import WINDOWS
     try:
-        fh = open(_lock_path(), "w")  # noqa: SIM115
-        fcntl.flock(fh, fcntl.LOCK_EX | fcntl.LOCK_NB)
+        if WINDOWS:
+            import msvcrt  # pyright: ignore[reportMissingImports]
+            fh = open(_lock_path(), "w")  # noqa: SIM115
+            msvcrt.locking(fh.fileno(), msvcrt.LK_NBLCK, 1)  # pyright: ignore[reportAttributeAccessIssue]
+        else:
+            import fcntl
+            fh = open(_lock_path(), "w")  # noqa: SIM115
+            fcntl.flock(fh, fcntl.LOCK_EX | fcntl.LOCK_NB)
         fh.write(str(os.getpid()))
         fh.flush()
         return fh

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/tests/adapters/device/test_bulk.py

@@ -455,6 +455,30 @@ class TestBulkDeviceHandshake(unittest.TestCase):
         bd.handshake()
         self.assertFalse(bd.use_jpeg)
 
+    def test_handshake_pm_byte_and_sub_byte_on_result(self):
+        """HandshakeResult carries raw PM + SUB for button image lookup (#69)."""
+        bd = self._setup_device()
+        resp = _make_handshake_response(pm=7, sub=1)
+        bd._ep_in.read.return_value = resp
+
+        result = bd.handshake()
+
+        self.assertEqual(result.pm_byte, 7)
+        self.assertEqual(result.sub_byte, 1)
+        # model_id is FBL (64), NOT the raw PM
+        self.assertEqual(result.model_id, 64)
+
+    def test_handshake_pm_byte_differs_from_fbl(self):
+        """PM=7 → FBL=64 — pm_byte must be the raw PM, not FBL (#69)."""
+        bd = self._setup_device()
+        resp = _make_handshake_response(pm=7, sub=0)
+        bd._ep_in.read.return_value = resp
+
+        result = bd.handshake()
+
+        self.assertEqual(result.pm_byte, 7)
+        self.assertNotEqual(result.pm_byte, result.model_id)
+
     def test_handshake_opens_device_if_needed(self):
         """If _dev is None, handshake calls _open() first."""
         bd = BulkDevice(0x87AD, 0x70DB)

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/tests/adapters/device/test_hid.py

@@ -288,6 +288,21 @@ class TestType2Handshake:
         assert info.mode_byte_1 == 0x99
         assert info.mode_byte_2 == 0x42
 
+    def test_handshake_pm_byte_and_sub_byte(self):
+        """Type 2: pm_byte/sub_byte carry raw PM+SUB for button image (#69)."""
+        transport = _make_mock_transport()
+        resp = bytearray(_make_type2_valid_response())
+        resp[4] = 1   # SUB
+        resp[5] = 7   # PM
+        transport.read.return_value = bytes(resp)
+        transport.write.return_value = TYPE2_INIT_SIZE
+
+        dev = HidDeviceType2(transport)
+        info = dev.handshake()
+
+        assert info.pm_byte == 7
+        assert info.sub_byte == 1
+
     def test_handshake_timing(self):
         """Verify C# Sleep(50) + Sleep(200) timing is called."""
         transport = _make_mock_transport()
@@ -577,6 +592,18 @@ class TestType3Handshake:
         assert dev.device_info is info
         assert info.fbl == 101
 
+    def test_handshake_pm_byte_equals_fbl(self):
+        """Type 3: pm_byte=fbl (PM=FBL for Type 3 devices, #69)."""
+        transport = _make_mock_transport()
+        transport.read.return_value = _make_type3_valid_response(0x66)
+        transport.write.return_value = TYPE3_INIT_SIZE
+
+        dev = HidDeviceType3(transport)
+        info = dev.handshake()
+
+        assert info.pm_byte == 101  # 0x66 - 1
+        assert info.sub_byte == 0
+
     def test_handshake_timing(self):
         """Verify C# Sleep(50) + Sleep(200) timing is called."""
         transport = _make_mock_transport()

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/tests/adapters/device/test_ly.py

@@ -174,6 +174,16 @@ class TestLyDeviceHandshake(unittest.TestCase):
         d.handshake()
         self.assertTrue(d.use_jpeg)
 
+    def test_handshake_pm_byte_and_sub_byte(self):
+        """HandshakeResult carries raw PM + SUB for button image lookup (#69)."""
+        d = self._setup()
+        d._ep_in.read.return_value = _make_ly_response(pm_byte_20=1, pm_byte_22=2)
+        result = d.handshake()
+
+        self.assertEqual(result.pm_byte, 65)   # 64 + 1
+        self.assertEqual(result.sub_byte, 3)   # resp[22]+1
+        self.assertEqual(result.model_id, 192)  # FBL
+
 
 class TestLyDeviceSendFrame(unittest.TestCase):
     def _setup(self, pid=_PID_LY):

{trcc_linux-8.4.0 → trcc_linux-8.4.2}/tests/adapters/infra/test_debug_report.py

@@ -275,7 +275,7 @@ class TestDependenciesExtra:
 class TestDevicesExtra:
     """_devices extra coverage."""
 
-    @patch("trcc.adapters.device.detector.DeviceDetector.detect",
+    @patch("trcc.adapters.device.detector.detect_devices",
            side_effect=RuntimeError("usb error"))
     def test_detect_raises(self, _):
         """Exception from detect() is caught gracefully."""
@@ -284,7 +284,7 @@ class TestDevicesExtra:
         _, body = _section(rpt)
         assert "detect failed" in body
 
-    @patch("trcc.adapters.device.detector.DeviceDetector.detect")
+    @patch("trcc.adapters.device.detector.detect_devices")
     def test_scsi_device_shows_scsi_path(self, mock_detect):
         """SCSI device uses scsi_device path in output."""
         dev = MagicMock()
@@ -301,7 +301,7 @@ class TestDevicesExtra:
         assert "/dev/sg0" in body
         assert "SCSI" in body
 
-    @patch("trcc.adapters.device.detector.DeviceDetector.detect")
+    @patch("trcc.adapters.device.detector.detect_devices")
     def test_hid_device_shows_usb_path(self, mock_detect):
         """HID device uses usb_path when scsi_device is None."""
         dev = MagicMock()
@@ -802,11 +802,13 @@ class TestHandshakeBulk:
         return dev
 
     def _make_result(self, model_id=32, resolution=(480, 480),
-                     serial="", raw=bytes(64)):
+                     serial="", raw=bytes(64), pm_byte=7, sub_byte=1):
         r = MagicMock()
         r.model_id = model_id
         r.resolution = resolution
         r.serial = serial
+        r.pm_byte = pm_byte
+        r.sub_byte = sub_byte
         r.raw_response = raw
         return r
 
@@ -822,7 +824,9 @@ class TestHandshakeBulk:
         rpt._handshake_bulk(self._make_dev(), sec_obj)
 
         text = " ".join(sec_obj.lines)
-        assert "PM=32" in text
+        assert "PM=7" in text
+        assert "SUB=1" in text
+        assert "FBL=32" in text
         assert "(480, 480)" in text
         proto.close.assert_called_once()
 
@@ -904,11 +908,13 @@ class TestHandshakeLy:
         return dev
 
     def _make_result(self, model_id=64, resolution=(1280, 480),
-                     serial="", raw=bytes(64)):
+                     serial="", raw=bytes(64), pm_byte=68, sub_byte=0):
         r = MagicMock()
         r.model_id = model_id
         r.resolution = resolution
         r.serial = serial
+        r.pm_byte = pm_byte
+        r.sub_byte = sub_byte
         r.raw_response = raw
         return r
 
@@ -924,7 +930,9 @@ class TestHandshakeLy:
         rpt._handshake_ly(self._make_dev(), sec_obj)
 
         text = " ".join(sec_obj.lines)
-        assert "PM=64" in text
+        assert "PM=68" in text
+        assert "SUB=0" in text
+        assert "FBL=64" in text
         assert "(1280, 480)" in text
         proto.close.assert_called_once()