v4.2.4: fix device resolution discovery — remove hardcoded 320x320 default

DeviceInfo.resolution now defaults to (0,0) instead of (320,320).
All protocols discover resolution via handshake — no assumptions.
Fixes HID devices (e.g. Assassin Spirit 120 Vision ARGB, PM=36)
receiving wrong-sized 320x320 frames instead of their actual 240x240.
CLI commands also handshake before sending.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: Lexonight1

pyproject.toml

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

src/trcc/__version__.py

@@ -1,6 +1,6 @@
 """TRCC Linux version information."""
 
-__version__ = "4.2.3"
+__version__ = "4.2.4"
 __version_info__ = tuple(int(x) for x in __version__.split("."))
 
 # Version history:
@@ -150,3 +150,8 @@
 #          corruption: add wire remap table for PM=49 (93 LEDs). C# SendHidVal
 #          reorders LEDs from logical to hardware wire positions — our code was
 #          missing this remap, sending colors to wrong physical LEDs. 2308 tests.
+# 4.2.4  - Fix device resolution discovery: remove hardcoded 320x320 default.
+#          All protocols (SCSI, HID, Bulk) now start at (0,0) and discover
+#          resolution via handshake. Fixes HID devices like Assassin Spirit
+#          120 Vision ARGB (PM=36, 240x240) getting wrong-sized frames.
+#          CLI commands also handshake before sending. 2308 tests.

src/trcc/adapters/device/scsi.py

@@ -218,9 +218,8 @@ def find_lcd_devices() -> List[Dict]:
             if not dev.scsi_device:
                 continue
 
-            # Default resolution — actual resolution detected on handshake
-            # via _init_device() -> poll byte[0] -> fbl_to_resolution().
-            resolution = (320, 320)
+            # Resolution discovered via handshake (_init_device → poll → fbl_to_resolution)
+            resolution = (0, 0)
 
             # SCSI poll byte[0] = resolution code = PM (matches USBLCD.exe).
             # Use it to resolve variant-specific button image.

src/trcc/api.py

@@ -164,7 +164,7 @@ async def send_image(device_id: int, image: UploadFile, rotation: int = 0,
         img = ImageService.apply_brightness(img, brightness)
 
     # Resize to device resolution
-    w, h = dev.resolution or (320, 320)
+    w, h = dev.resolution if dev.resolution != (0, 0) else (320, 320)
     img = ImageService.resize(img, w, h)
 
     # Convert and send

src/trcc/cli.py

@@ -563,13 +563,13 @@ class DeviceCommands:
 
     @staticmethod
     def _get_service(device_path: Optional[str] = None):
-        """Create a DeviceService, detect devices, and select by path.
+        """Create a DeviceService, detect devices, select, and handshake.
 
         Args:
             device_path: SCSI path (/dev/sgX) or None to use saved selection.
 
         Returns:
-            DeviceService with a selected device.
+            DeviceService with a selected device (resolution discovered).
         """
         from trcc.services import DeviceService
 
@@ -592,6 +592,19 @@ def _get_service(device_path: Optional[str] = None):
                 if match:
                     svc.select(match)
 
+        # Discover resolution via handshake if not yet known
+        dev = svc.selected
+        if dev and dev.resolution == (0, 0):
+            try:
+                from trcc.adapters.device.factory import DeviceProtocolFactory
+                protocol = DeviceProtocolFactory.get_protocol(dev)
+                result = protocol.handshake()
+                res = getattr(result, 'resolution', None) if result else None
+                if isinstance(res, tuple) and len(res) == 2 and res != (0, 0):
+                    dev.resolution = res
+            except Exception:
+                pass  # Handshake may fail if device not ready
+
         return svc
 
     @staticmethod
@@ -1228,6 +1241,18 @@ def resume():
                 if dev.protocol != "scsi":
                     continue
 
+                # Discover resolution via handshake
+                if dev.resolution == (0, 0):
+                    try:
+                        from trcc.adapters.device.factory import DeviceProtocolFactory
+                        proto = DeviceProtocolFactory.get_protocol(dev)
+                        result = proto.handshake()
+                        res = getattr(result, 'resolution', None) if result else None
+                        if isinstance(res, tuple) and len(res) == 2 and res != (0, 0):
+                            dev.resolution = res
+                    except Exception:
+                        continue
+
                 key = Settings.device_config_key(dev.device_index, dev.vid, dev.pid)
                 cfg = Settings.get_device_config(key)
                 theme_path = cfg.get("theme_path")

src/trcc/core/models.py

@@ -156,7 +156,7 @@ class DeviceInfo:
     """
     name: str
     path: str  # /dev/sgX
-    resolution: Tuple[int, int] = (320, 320)
+    resolution: Tuple[int, int] = (0, 0)  # Discovered via handshake
 
     # Device properties (from detection)
     vendor: Optional[str] = None

src/trcc/qt_components/qt_app_mvc.py

@@ -791,20 +791,13 @@ def _on_device_selected(self, device: DeviceInfo):
             device.device_index, device.vid, device.pid)
         self.uc_preview.set_status(f"Device: {device.path}")
 
-        # HID/Bulk devices start with resolution (0,0) — need handshake to discover it.
-        # Detection only scans USB; the handshake requires opening the transport.
+        # Resolution (0,0) = not yet discovered — handshake to find it.
         w, h = device.resolution
-        if (w, h) == (0, 0) and device.protocol in ('hid', 'bulk'):
+        if (w, h) == (0, 0):
             self.uc_preview.set_status("Connecting to device...")
             self._start_handshake(device)
             return
 
-        if (w, h) == (0, 0):
-            log.warning("Device resolution (0,0) — handshake not supported for protocol %s",
-                        device.protocol)
-            self.uc_preview.set_status("Handshake failed — replug device and restart")
-            return
-
         self._apply_device_config(device, w, h)
 
     def _start_handshake(self, device: DeviceInfo):
@@ -1020,7 +1013,7 @@ def _on_device_widget_clicked(self, device_info: dict):
         device = DeviceInfo(
             name=device_info.get('name', 'LCD'),
             path=device_info.get('path', ''),
-            resolution=device_info.get('resolution', (320, 320)),
+            resolution=device_info.get('resolution', (0, 0)),
             model=device_info.get('model'),
             vid=device_info.get('vid', 0),
             pid=device_info.get('pid', 0),
@@ -2069,7 +2062,7 @@ def _on_device_poll(self):
                 device = DeviceInfo(
                     name=d.get('name', 'LCD'),
                     path=d.get('path', ''),
-                    resolution=d.get('resolution', (320, 320)),
+                    resolution=d.get('resolution', (0, 0)),
                     vendor=d.get('vendor'),
                     product=d.get('product'),
                     model=d.get('model'),

tests/test_device_scsi.py

@@ -344,7 +344,7 @@ def test_returns_device_dicts(self, mock_detect, mock_driver_cls):
         self.assertEqual(len(devices), 1)
         self.assertEqual(devices[0]['name'], 'Thermalright LCD')
         self.assertEqual(devices[0]['path'], '/dev/sg0')
-        self.assertEqual(devices[0]['resolution'], (320, 320))
+        self.assertEqual(devices[0]['resolution'], (0, 0))
         self.assertEqual(devices[0]['device_index'], 0)
 
     @patch('trcc.adapters.device.detector.detect_devices')
@@ -358,7 +358,7 @@ def test_skips_devices_without_scsi(self, mock_detect):
 
     @patch('trcc.adapters.device.lcd.LCDDriver', side_effect=Exception('driver fail'))
     @patch('trcc.adapters.device.detector.detect_devices')
-    def test_driver_error_uses_default_resolution(self, mock_detect, _):
+    def test_driver_error_uses_unresolved_resolution(self, mock_detect, _):
         dev = MagicMock()
         dev.scsi_device = '/dev/sg0'
         dev.vendor_name = 'Test'
@@ -372,7 +372,7 @@ def test_driver_error_uses_default_resolution(self, mock_detect, _):
         mock_detect.return_value = [dev]
 
         devices = find_lcd_devices()
-        self.assertEqual(devices[0]['resolution'], (320, 320))
+        self.assertEqual(devices[0]['resolution'], (0, 0))
 
 
 # -- send_image_to_device --

tests/test_integration.py

@@ -107,10 +107,13 @@ class TestCLISendPipeline(unittest.TestCase):
     def test_cli_send_image(self, mock_detect, mock_get_protocol):
         """trcc send image.png end-to-end via DeviceService."""
         from trcc.cli import send_image
+        from trcc.core.models import HandshakeResult
 
         mock_detect.return_value = [_make_device()]
         mock_protocol = MagicMock()
         mock_protocol.send_image.return_value = True
+        mock_protocol.handshake.return_value = HandshakeResult(
+            resolution=(320, 320))
         mock_get_protocol.return_value = mock_protocol
 
         with tempfile.NamedTemporaryFile(suffix=".png", delete=False) as f:
@@ -136,10 +139,13 @@ def test_cli_send_missing_file(self):
     def test_cli_send_color(self, mock_detect, mock_get_protocol):
         """trcc color ff0000 end-to-end via DeviceService."""
         from trcc.cli import send_color
+        from trcc.core.models import HandshakeResult
 
         mock_detect.return_value = [_make_device()]
         mock_protocol = MagicMock()
         mock_protocol.send_image.return_value = True
+        mock_protocol.handshake.return_value = HandshakeResult(
+            resolution=(320, 320))
         mock_get_protocol.return_value = mock_protocol
 
         result = send_color("ff0000", device="/dev/sg0")
@@ -169,12 +175,15 @@ def test_resume_with_saved_theme(self, mock_key, mock_cfg, mock_detect,
                                      mock_get_protocol):
         """resume() sends last theme with brightness and rotation applied."""
         from trcc.cli import resume
+        from trcc.core.models import HandshakeResult
 
         mock_detect.return_value = [_make_device()]
         mock_key.return_value = "0:87cd_70db"
 
         mock_protocol = MagicMock()
         mock_protocol.send_image.return_value = True
+        mock_protocol.handshake.return_value = HandshakeResult(
+            resolution=(320, 320))
         mock_get_protocol.return_value = mock_protocol
 
         with tempfile.TemporaryDirectory() as td: