Device dependent margins/config

src/labelle/gui/gui.py

@@ -63,7 +63,7 @@ def _init_elements(self) -> None:
         self._device_manager = DeviceManager()
         self._dymo_labeler = DymoLabeler()
         self._settings_toolbar.update_labeler_context(
-            supported_tape_sizes=self._dymo_labeler.SUPPORTED_TAPE_SIZES_MM,
+            supported_tape_sizes=self._dymo_labeler.labeler_supported_tape_sizes,
             installed_tape_size=self._dymo_labeler.tape_size_mm,
             minimum_horizontal_margin_mm=self._dymo_labeler.minimum_horizontal_margin_mm,
         )

src/labelle/gui/q_settings_toolbar.py

@@ -57,7 +57,7 @@ def _init_elements(self) -> None:
 
     def update_labeler_context(
         self,
-        supported_tape_sizes: tuple[int, ...],
+        supported_tape_sizes: list[int],
         installed_tape_size: int,
         minimum_horizontal_margin_mm: float,
     ) -> None:

src/labelle/lib/constants.py

@@ -34,19 +34,56 @@
     "WARNING: This device is not confirmed to work with this software. Please "
     "report your experiences in https://github.com/labelle-org/labelle/issues/4"
 )
+
+
+# Supported USB device ID enumeration
+class SUPPORTED_DEVICE_ID(Enum):
+    LABELMANAGER_PC = 0x0011
+    LABELPOINT_350 = 0x0015
+    LABELMANAGER_PC_II = 0x001C
+    LABELMANAGER_PNP_NO_MODE_SWITCH = 0x1001
+    LABELMANAGER_PNP_MODE_SWITCH = 0x1002
+    LABELMANAGER_420P_NO_MODE_SWITCH = 0x1003
+    LABELMANAGER_420P_MODE_SWITCH = 0x1004
+    LABELMANAGER_280P_NO_MODE_SWITCH = 0x1005
+    LABELMANAGER_280P_MODE_SWITCH = 0x1006
+    LABELMANAGER_WIRELESS_PNP_NO_MODE_SWITCH = 0x1007
+    LABELMANAGER_WIRELESS_PNP_MODE_SWITCH = 0x1008
+    MOBILE_LABELER = 0x1009
+
+
+# fmt: off
+# Very bad I know, but it keeps a loop of removing the line breaks and errroring
+
 SUPPORTED_PRODUCTS = {
-    0x0011: "DYMO LabelMANAGER PC",
-    0x0015: "LabelPoint 350",
-    0x1001: "LabelManager PnP (no mode switch)",
-    0x1002: "LabelManager PnP (mode switch)",
-    0x1003: f"LabelManager 420P (no mode switch) {UNCONFIRMED_MESSAGE}",
-    0x1004: f"LabelManager 420P (mode switch) {UNCONFIRMED_MESSAGE}",
-    0x1005: "LabelManager 280 (no mode switch)",
-    0x1006: "LabelManager 280 (no mode switch)",
-    0x1007: f"LabelManager Wireless PnP (no mode switch) {UNCONFIRMED_MESSAGE}",
-    0x1008: f"LabelManager Wireless PnP (mode switch) {UNCONFIRMED_MESSAGE}",
-    0x1009: f"MobileLabeler {UNCONFIRMED_MESSAGE}",
+    SUPPORTED_DEVICE_ID.LABELMANAGER_PC:
+        "DYMO LabelMANAGER PC",
+    SUPPORTED_DEVICE_ID.LABELPOINT_350:
+        "LabelPoint 350",
+    SUPPORTED_DEVICE_ID.LABELMANAGER_PC_II:
+        "DYMO LabelMANAGER PC II",
+    SUPPORTED_DEVICE_ID.LABELMANAGER_PNP_NO_MODE_SWITCH:
+        "LabelManager PnP (no mode switch)",
+    SUPPORTED_DEVICE_ID.LABELMANAGER_PNP_MODE_SWITCH:
+        "LabelManager PnP (mode switch)",
+    SUPPORTED_DEVICE_ID.LABELMANAGER_420P_NO_MODE_SWITCH:
+        f"LabelManager 420P (no mode switch) {UNCONFIRMED_MESSAGE}",
+    SUPPORTED_DEVICE_ID.LABELMANAGER_420P_MODE_SWITCH:
+        f"LabelManager 420P (mode switch) {UNCONFIRMED_MESSAGE}",
+    SUPPORTED_DEVICE_ID.LABELMANAGER_280P_NO_MODE_SWITCH:
+        "LabelManager 280 (no mode switch)",
+    SUPPORTED_DEVICE_ID.LABELMANAGER_280P_MODE_SWITCH:
+        "LabelManager 280 (no mode switch)",
+    SUPPORTED_DEVICE_ID.LABELMANAGER_WIRELESS_PNP_NO_MODE_SWITCH:
+        f"LabelManager Wireless PnP (no mode switch) {UNCONFIRMED_MESSAGE}",
+    SUPPORTED_DEVICE_ID.LABELMANAGER_WIRELESS_PNP_MODE_SWITCH:
+        f"LabelManager Wireless PnP (mode switch) {UNCONFIRMED_MESSAGE}",
+    SUPPORTED_DEVICE_ID.MOBILE_LABELER:
+        f"MobileLabeler {UNCONFIRMED_MESSAGE}",
 }
+# fmt: on
+
+
 DEV_VENDOR = 0x0922
 
 PRINTER_INTERFACE_CLASS = 0x07

src/labelle/lib/devices/device_manager.py

@@ -5,6 +5,7 @@
 from usb.core import NoBackendError, USBError
 
 from labelle.lib.constants import (
+    SUPPORTED_DEVICE_ID,
     SUPPORTED_PRODUCTS,
     UNCONFIRMED_MESSAGE,
 )
@@ -80,7 +81,8 @@ def find_and_select_device(self, patterns: list[str] | None = None) -> UsbDevice
             LOG.debug(dev.device_info)
         dev = devices[0]
         if dev.is_supported:
-            msg = f"Recognized device as {SUPPORTED_PRODUCTS[dev.id_product]}"
+            msg = f"Recognized device as \
+                {SUPPORTED_PRODUCTS[SUPPORTED_DEVICE_ID(dev.id_product)]}"
         else:
             msg = f"Unrecognized device: {hex(dev.id_product)}. {UNCONFIRMED_MESSAGE}"
         LOG.debug(msg)

src/labelle/lib/devices/dymo_labeler.py

@@ -10,12 +10,13 @@
 import array
 import logging
 import math
+from typing import Any
 
 import usb
 from PIL import Image
 from usb.core import NoBackendError, USBError
 
-from labelle.lib.constants import ESC, SYN
+from labelle.lib.constants import ESC, SUPPORTED_DEVICE_ID, SYN
 from labelle.lib.devices.usb_device import UsbDevice, UsbDeviceError
 from labelle.lib.utils import mm_to_px
 
@@ -240,23 +241,81 @@ class DymoLabeler:
 
     LABELER_DISTANCE_BETWEEN_PRINT_HEAD_AND_CUTTER_MM = 8.1
     LABELER_PRINT_HEAD_HEIGHT_MM = 8.2
-    SUPPORTED_TAPE_SIZES_MM = (19, 12, 9, 6)
     DEFAULT_TAPE_SIZE_MM = 12
 
+    # Default supported tape sizes
+    labeler_supported_tape_sizes: list
+
+    # Default printer head size in dots
+    labeler_print_head_width_pixels: int
+
+    # Default printer margins (for each tape size)
+    # { tapeSizeMm : (firstVisiblePixel, lastVisiblePixel) }
+    labeler_label_vertical_margins: dict[int, Any]
+
     def __init__(
         self,
         tape_size_mm: int | None = None,
         device: UsbDevice | None = None,
     ):
         if tape_size_mm is None:
             tape_size_mm = self.DEFAULT_TAPE_SIZE_MM
-        if tape_size_mm not in self.SUPPORTED_TAPE_SIZES_MM:
+
+        self._device = device
+
+        # --- Set options based on printer type ---
+        if self._device is not None:
+            if self._device.id_product == SUPPORTED_DEVICE_ID.LABELMANAGER_PC:
+                self.labeler_print_head_width_pixels = 128
+                self.labeler_supported_tape_sizes = [19, 12, 9, 6]
+                self.labeler_label_vertical_margins = {
+                    6: (11, 51),
+                    9: (1, 62),
+                    12: (0, 63),
+                    19: (0, 0),
+                }
+
+            elif self._device.id_product == SUPPORTED_DEVICE_ID.LABELMANAGER_PC_II:
+                self.labeler_print_head_width_pixels = 128
+                self.labeler_supported_tape_sizes = [24, 19, 12, 9, 6]
+                self.labeler_label_vertical_margins = {
+                    6: (11, 51),
+                    9: (1, 62),
+                    12: (0, 63),
+                    19: (0, 0),
+                    24: (0, 0),
+                }
+
+            else:
+                # Defaults (For most printers)
+                self.labeler_print_head_width_pixels = 64
+                self.labeler_supported_tape_sizes = [12, 9, 6]
+                self.labeler_label_vertical_margins = {
+                    6: (11, 51),
+                    9: (1, 62),
+                    12: (0, 63),
+                }
+        else:
+            # Simulator (supports everything)
+            self.labeler_print_head_width_pixels = 128
+            self.labeler_supported_tape_sizes = [24, 19, 12, 9, 6]
+            self.labeler_label_vertical_margins = {
+                6: (11, 51),
+                9: (1, 62),
+                12: (0, 63),
+                19: (0, 0),
+                24: (0, 0),
+            }
+
+        # --- End set options based on printer type ---
+
+        # Check if selected tape size is supported by printer
+        if tape_size_mm not in self.labeler_supported_tape_sizes:
             raise ValueError(
                 f"Unsupported tape size {tape_size_mm}mm. "
-                f"Supported sizes: {self.SUPPORTED_TAPE_SIZES_MM}"
+                f"Supported sizes: {self.labeler_supported_tape_sizes}"
             )
         self.tape_size_mm = tape_size_mm
-        self._device = device
 
     @property
     def height_px(self):
@@ -277,6 +336,7 @@ def minimum_horizontal_margin_mm(self):
 
     @property
     def labeler_margin_px(self) -> tuple[float, float]:
+        # ToDo: Use preset margins here instead of this calculation
         vertical_margin_mm = max(
             0, (self.tape_size_mm - self.LABELER_PRINT_HEAD_HEIGHT_MM) / 2
         )