Added difference serial protocols

1 files changed, 20 insertions, 15 deletions

diff --git a/ui/add_device_dialog.py b/ui/add_device_dialog.py
index 7e8e935..4df71a3 100644
--- a/ui/add_device_dialog.py
+++ b/ui/add_device_dialog.py
@@ -23,7 +23,7 @@ from PyQt6.QtGui import QFont
 from devices.device_registry import DeviceRegistry
 from devices.analog_input    import AnalogInputDevice
 from devices.digital_io      import DigitalIODevice
-from devices.serial_device   import SerialDevice
+from devices.serial_device   import SerialDevice, _FORMAT_LABELS
 
 
 # ── Port scanner thread ───────────────────────────────────────────────────────
@@ -339,7 +339,7 @@ class DigitalIOPanel(QWidget):
 
 
 class SerialPanel(QWidget):
-    """Config fields for SerialDevice with live port scanner."""
+    """Config fields for SerialDevice — port, baud, protocol/format, simulate."""
 
     def __init__(self):
         super().__init__()
@@ -354,33 +354,34 @@ class SerialPanel(QWidget):
         form.addRow("Port:", self.port_edit)
 
         self.baud_cb = QComboBox()
-        self.baud_cb.addItems(["9600", "19200", "38400", "57600", "115200", "230400", "460800"])
+        self.baud_cb.addItems(["1200", "2400", "4800", "9600", "19200", "38400",
+                               "57600", "115200", "230400", "460800"])
         self.baud_cb.setCurrentText("115200")
         form.addRow("Baud Rate:", self.baud_cb)
 
-        self.ch_spin = QSpinBox()
-        self.ch_spin.setRange(1, 32)
-        self.ch_spin.setValue(4)
-        form.addRow("Channels:", self.ch_spin)
-
         self.fmt_cb = QComboBox()
-        self.fmt_cb.addItems(["key:val", "csv", "json"])
-        form.addRow("Parse Format:", self.fmt_cb)
+        self.fmt_cb.addItems(list(_FORMAT_LABELS.keys()))
+        form.addRow("Protocol / Format:", self.fmt_cb)
 
         self.sim_chk = QCheckBox("Simulation mode")
         self.sim_chk.setChecked(False)
         form.addRow(self.sim_chk)
 
+        note = QLabel("Protocol-specific settings (queries, registers, motors) available in device config dialog.")
+        note.setObjectName("traceSource")
+        note.setWordWrap(True)
+
         lay.addLayout(form)
+        lay.addWidget(note)
         lay.addWidget(PortScanGroup(self.port_edit))
 
     def build_device(self, device_id: str) -> SerialDevice:
+        fmt = _FORMAT_LABELS.get(self.fmt_cb.currentText(), "key:val")
         return SerialDevice(
             device_id=device_id,
             port=self.port_edit.text().strip() or "COM3",
             baud_rate=int(self.baud_cb.currentText()),
-            num_channels=self.ch_spin.value(),
-            parse_format=self.fmt_cb.currentText(),
+            parse_format=fmt,
             simulate=self.sim_chk.isChecked(),
         )
 
@@ -388,8 +389,8 @@ class SerialPanel(QWidget):
 # ── Main dialog ───────────────────────────────────────────────────────────────
 
 _PANELS = {
-    "Analog Input": AnalogInputPanel,
-    "Digital I/O":  DigitalIOPanel,
+    "Analog Input":  AnalogInputPanel,
+    "Digital I/O":   DigitalIOPanel,
     "Serial / UART": SerialPanel,
 }
 
@@ -480,7 +481,11 @@ class AddDeviceDialog(QDialog):
 
         # Auto-generate ID if blank
         if not dev_id:
-            prefixes = {"Analog Input": "ai", "Digital I/O": "dio", "Serial / UART": "ser"}
+            prefixes = {
+                "Analog Input":  "ai",
+                "Digital I/O":   "dio",
+                "Serial / UART": "ser",
+            }
             prefix   = prefixes.get(type_name, "dev")
             existing = {d.info.device_id for d in self.registry.all_instances()}
             for i in range(100):