trcc-linux 5.2.3__tar.gz → 5.3.0__tar.gz

{trcc_linux-5.2.3 → trcc_linux-5.3.0}/PKG-INFO

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

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

{trcc_linux-5.2.3 → trcc_linux-5.3.0}/src/trcc/__version__.py

@@ -1,6 +1,6 @@
 """TRCC Linux version information."""
 
-__version__ = "5.2.3"
+__version__ = "5.3.0"
 __version_info__ = tuple(int(x) for x in __version__.split("."))
 
 # Version history:
@@ -293,3 +293,9 @@ __version_info__ = tuple(int(x) for x in __version__.split("."))
 #          to RGB565 with hardcoded 240x320 header — firmware silently ignored
 #          frames. Now both paths extract fbl from handshake result. Reported
 #          by @Zeltergiest in #35. 2288 tests.
+# 5.3.0  - Full end-to-end data flow audit: fix API always using RGB565
+#          (now delegates to send_pil for JPEG/RGB565 routing, pre-rotation,
+#          byte order), fix SCSI FBL 50 byte order (320x240 little-endian,
+#          not big-endian — only FBL 51 triggers SPIMode=2), propagate FBL
+#          to all byte_order_for() callers (device.py, display.py, lcd.py).
+#          API also propagates fbl_code from handshake. 2291 tests.

{trcc_linux-5.2.3 → trcc_linux-5.3.0}/src/trcc/adapters/device/lcd.py

@@ -150,8 +150,8 @@ class LCDDriver:
             raise RuntimeError("No implementation loaded")
 
         width, height = self.implementation.resolution
-        byte_order = ImageService.byte_order_for('scsi',
-                                                 self.implementation.resolution)
+        byte_order = ImageService.byte_order_for(
+            'scsi', self.implementation.resolution, self.implementation.fbl)
         pixel = ImageService.rgb_to_bytes(r, g, b, byte_order)
         return pixel * (width * height)
 
@@ -165,7 +165,7 @@ class LCDDriver:
             width, height = self.implementation.resolution
             img = Image.open(path).convert('RGB').resize((width, height))
             byte_order = ImageService.byte_order_for(
-                'scsi', self.implementation.resolution)
+                'scsi', self.implementation.resolution, self.implementation.fbl)
             data = bytearray()
             for y in range(height):
                 for x in range(width):

{trcc_linux-5.2.3 → trcc_linux-5.3.0}/src/trcc/api.py

@@ -169,20 +169,21 @@ async def send_image(device_id: int, image: UploadFile, rotation: int = 0,
         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
-            w, h = res
-        else:
+        if result:
+            res = getattr(result, 'resolution', None)
+            if isinstance(res, tuple) and len(res) == 2 and res != (0, 0):
+                dev.resolution = res
+                w, h = res
+            # Propagate FBL code for JPEG mode detection
+            fbl = getattr(result, 'fbl', None) or getattr(result, 'model_id', None)
+            if fbl:
+                dev.fbl_code = fbl
+        if (w, h) == (0, 0):
             raise HTTPException(status_code=503, detail="Cannot discover device resolution")
     img = ImageService.resize(img, w, h)
 
-    # Convert and send
-    byte_order = ImageService.byte_order_for(
-        dev.protocol or "scsi", (w, h)
-    )
-    rgb565 = ImageService.to_rgb565(img, byte_order)
-    ok = _device_svc.send_rgb565(rgb565, w, h)
+    # Encode and send via service (handles JPEG vs RGB565, rotation, byte order)
+    ok = _device_svc.send_pil(img, w, h)
 
     if not ok:
         raise HTTPException(status_code=500, detail="Send failed (device busy or error)")

{trcc_linux-5.2.3 → trcc_linux-5.3.0}/src/trcc/services/device.py

@@ -178,7 +178,7 @@ class DeviceService:
 
         # C# ImageTo565: non-square displays rotate +90° CW before encoding.
         image = ImageService.apply_device_rotation(image, resolution)
-        byte_order = ImageService.byte_order_for(protocol, resolution)
+        byte_order = ImageService.byte_order_for(protocol, resolution, fbl)
         return self.send_image(image, width, height, byte_order)
 
     def send_rgb565_async(self, data: bytes, width: int, height: int) -> None:

{trcc_linux-5.2.3 → trcc_linux-5.3.0}/src/trcc/services/display.py

@@ -539,7 +539,7 @@ class DisplayService:
 
         # C# ImageTo565: non-square displays rotate +90° CW before encoding.
         img = ImageService.apply_device_rotation(img, resolution)
-        byte_order = ImageService.byte_order_for(protocol, resolution)
+        byte_order = ImageService.byte_order_for(protocol, resolution, fbl)
         data = ImageService.to_rgb565(img, byte_order)
         log.debug("_encode_for_device: %dx%d mode=%s order=%s → RGB565 %d bytes",
                   img.width, img.height, img.mode, byte_order, len(data))

{trcc_linux-5.2.3 → trcc_linux-5.3.0}/src/trcc/services/image.py

@@ -117,11 +117,11 @@ class ImageService:
         pixel = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3)
         return struct.pack(f'{byte_order}H', pixel)
 
-    # SCSI resolutions that use big-endian RGB565 (SPIMode=2).
-    # C#: myDeviceMode==1 && fbl==51 → myDeviceSPIMode=2.
-    # FBL 100/101/102 → 320x320 (is320x320), FBL 51 → 320x240 (SPIMode=2).
+    # SCSI resolutions that use big-endian RGB565 (is320x320 in C#).
+    # FBL 100/101/102 → 320x320 → big-endian.
+    # FBL 51 → 320x240 also big-endian (SPIMode=2), but handled via fbl param.
     # FBL 50 → 320x240 does NOT trigger SPIMode=2 (little-endian).
-    _SCSI_BIG_ENDIAN = {(320, 320), (320, 240)}
+    _SCSI_BIG_ENDIAN = {(320, 320)}
 
     # Square resolutions that skip the 90° device pre-rotation.
     # C# ImageTo565: (is240x240 || is320x320 || is480x480) → use directionB directly.
@@ -129,20 +129,22 @@ class ImageService:
     _SQUARE_NO_ROTATE = {(240, 240), (320, 320), (480, 480)}
 
     @staticmethod
-    def byte_order_for(protocol: str, resolution: tuple[int, int]) -> str:
+    def byte_order_for(protocol: str, resolution: tuple[int, int],
+                       fbl: int | None = None) -> str:
         """Determine RGB565 byte order for a device.
 
         C# ImageTo565 byte-order logic:
           - is320x320 (FBL 100/101/102) → big-endian
-          - myDeviceSPIMode==2 → big-endian (SCSI mode 1 + FBL 51,
-            or HID mode 3 + FBL 53 which also resolves to 320x320)
+          - myDeviceSPIMode==2 → big-endian (SCSI mode 1 + FBL 51)
           - else → little-endian
 
-        SCSI: big-endian for 320x320 and 320x240, little-endian otherwise.
-        HID/Bulk: big-endian only for 320x320 (is320x320 check), little-endian
-        otherwise.  HID Type 2 at 320x240 does NOT set myDeviceSPIMode=2.
+        SCSI: big-endian for 320x320 (FBL 100/101/102) and FBL 51 (320x240
+        SPIMode=2).  FBL 50 → 320x240 does NOT trigger SPIMode=2 → little-endian.
+        HID/Bulk: big-endian only for 320x320 (is320x320 in C#).
         """
         if protocol == 'scsi':
+            if fbl == 51:  # SPIMode=2: 320x240 big-endian
+                return '>'
             return '>' if resolution in ImageService._SCSI_BIG_ENDIAN else '<'
         # HID/Bulk: only 320x320 uses big-endian (is320x320 in C#)
         return '>' if resolution == (320, 320) else '<'

{trcc_linux-5.2.3 → trcc_linux-5.3.0}/tests/test_api.py

@@ -135,7 +135,7 @@ class TestSendImage(unittest.TestCase):
         _device_svc._devices = [self.dev]
         _device_svc._selected = None
 
-    @patch.object(_device_svc, 'send_rgb565', return_value=True)
+    @patch.object(_device_svc, 'send_pil', return_value=True)
     def test_send_image_success(self, mock_send):
         img = Image.new('RGB', (100, 100), (255, 0, 0))
         buf = io.BytesIO()
@@ -150,7 +150,7 @@ class TestSendImage(unittest.TestCase):
         self.assertTrue(resp.json()["sent"])
         mock_send.assert_called_once()
 
-    @patch.object(_device_svc, 'send_rgb565', return_value=False)
+    @patch.object(_device_svc, 'send_pil', return_value=False)
     def test_send_image_failure(self, mock_send):
         img = Image.new('RGB', (100, 100), (0, 0, 255))
         buf = io.BytesIO()
@@ -192,7 +192,7 @@ class TestSendImage(unittest.TestCase):
         )
         self.assertEqual(resp.status_code, 404)
 
-    @patch.object(_device_svc, 'send_rgb565', return_value=True)
+    @patch.object(_device_svc, 'send_pil', return_value=True)
     def test_send_with_rotation(self, mock_send):
         img = Image.new('RGB', (100, 100), (0, 255, 0))
         buf = io.BytesIO()
@@ -206,6 +206,38 @@ class TestSendImage(unittest.TestCase):
         self.assertEqual(resp.status_code, 200)
 
 
+    @patch.object(_device_svc, 'send_pil', return_value=True)
+    def test_send_propagates_fbl_from_handshake(self, mock_send):
+        """Handshake fbl_code propagates to DeviceInfo for JPEG mode detection."""
+        dev = DeviceInfo(name="HID", path="hid:0416:5302", vid=0x0416, pid=0x5302,
+                         protocol="hid", resolution=(0, 0))
+        _device_svc._devices = [dev]
+
+        mock_result = MagicMock()
+        mock_result.resolution = (1280, 480)
+        mock_result.fbl = 128
+        mock_result.model_id = 128
+
+        with patch('trcc.adapters.device.factory.DeviceProtocolFactory') as mock_factory:
+            mock_protocol = MagicMock()
+            mock_protocol.handshake.return_value = mock_result
+            mock_factory.get_protocol.return_value = mock_protocol
+
+            img = Image.new('RGB', (100, 100), (255, 0, 0))
+            buf = io.BytesIO()
+            img.save(buf, format='PNG')
+            buf.seek(0)
+
+            resp = self.client.post(
+                "/devices/0/send",
+                files={"image": ("test.png", buf, "image/png")},
+            )
+            self.assertEqual(resp.status_code, 200)
+            self.assertEqual(dev.fbl_code, 128)
+            self.assertEqual(dev.resolution, (1280, 480))
+            mock_send.assert_called_once()
+
+
 class TestThemesEndpoint(unittest.TestCase):
     """GET /themes — list local themes."""
 

{trcc_linux-5.2.3 → trcc_linux-5.3.0}/tests/test_services.py

@@ -136,9 +136,17 @@ class TestImageServiceByteOrder(unittest.TestCase):
     def test_320x320_scsi_big_endian(self):
         self.assertEqual(ImageService.byte_order_for('scsi', (320, 320)), '>')
 
-    def test_320x240_scsi_big_endian(self):
-        """SCSI 320x240 (FBL 51) uses SPIMode=2 → big-endian."""
-        self.assertEqual(ImageService.byte_order_for('scsi', (320, 240)), '>')
+    def test_320x240_scsi_fbl51_big_endian(self):
+        """SCSI 320x240 FBL 51 uses SPIMode=2 → big-endian."""
+        self.assertEqual(ImageService.byte_order_for('scsi', (320, 240), fbl=51), '>')
+
+    def test_320x240_scsi_fbl50_little_endian(self):
+        """SCSI 320x240 FBL 50 does NOT trigger SPIMode=2 → little-endian."""
+        self.assertEqual(ImageService.byte_order_for('scsi', (320, 240), fbl=50), '<')
+
+    def test_320x240_scsi_no_fbl_little_endian(self):
+        """SCSI 320x240 with no FBL defaults to little-endian (safe default)."""
+        self.assertEqual(ImageService.byte_order_for('scsi', (320, 240)), '<')
 
     def test_480x480_scsi_little_endian(self):
         self.assertEqual(ImageService.byte_order_for('scsi', (480, 480)), '<')