Mercurial Repositories > eric / changeset

--- a/eric6/MicroPython/MicroPythonDevices.py	Tue Feb 02 14:48:37 2021 +0100
+++ b/eric6/MicroPython/MicroPythonDevices.py	Tue Feb 02 16:25:50 2021 +0100
@@ -68,7 +68,7 @@
             (0x1209, 0x4DDE),       # ODT CP Sapling M0 w/ SPI Flash
             (0x054C, 0x0BC2),       # Spresense
         ],
-        "description": "CircuitPython Board",
+        "description": "CircuitPython",
         "icon": "circuitPythonDevice",
         "port_description": "",
     },
@@ -155,7 +155,9 @@
                     ):
                         continue
                 foundDevices.append(
-                    (board, SupportedBoards[board]["description"],
+                    (board,
+                     port.description(),
+                     SupportedBoards[board]["description"],
                      port.portName()))
                 supported = True
         if not supported:

--- a/eric6/MicroPython/MicroPythonWidget.py	Tue Feb 02 14:48:37 2021 +0100
+++ b/eric6/MicroPython/MicroPythonWidget.py	Tue Feb 02 16:25:50 2021 +0100
@@ -300,13 +300,15 @@
             self.deviceInfoLabel.setText(
                 self.tr("%n supported device(s) detected.", "", len(devices)))
             
-            for index, (board, description, portName) in (
+            for index, (boardType, boardName, description, portName) in (
                 enumerate(sorted(devices), 1)
             ):
                 self.deviceTypeComboBox.addItem(
-                    self.tr("{0} at {1}".format(description, portName)))
+                    self.tr("{0} - {1} ({2})")
+                    .format(boardName, description, portName)
+                )
                 self.deviceTypeComboBox.setItemData(
-                    index, board, self.DeviceTypeRole)
+                    index, boardType, self.DeviceTypeRole)
                 self.deviceTypeComboBox.setItemData(
                     index, portName, self.DevicePortRole)