Mercurial Repositories > eric / changeset

--- a/eric6/MicroPython/MicroPythonDevices.py	Wed Jan 27 19:50:23 2021 +0100
+++ b/eric6/MicroPython/MicroPythonDevices.py	Fri Jan 29 12:17:34 2021 +0100
@@ -22,7 +22,13 @@
         "ids": [
             (0x1A86, 0x7523),       # HL-340
             (0x10C4, 0xEA60),       # CP210x
+            (0x0403, 0x6001),       # M5Stack ESP32 device"),
+            (0x0403, 0x6001),       # FT232/FT245 (XinaBox CW01, CW02)
+            (0x0403, 0x6010),       # FT2232C/D/L/HL/Q (ESP-WROVER-KIT)
+            (0x0403, 0x6011),       # FT4232
+            (0x0403, 0x6014),       # FT232H
             (0x0403, 0x6015),       # Sparkfun ESP32
+            (0x0403, 0x601C),       # FT4222H
         ],
         "description": "ESP8266, ESP32",
         "icon": "esp32Device",
@@ -37,10 +43,27 @@
             (0x1209, 0xBAB1),       # Electronic Cats Meow Meow
             (0x1209, 0xBAB2),       # Electronic Cats CatWAN USBStick
             (0x1209, 0xBAB3),       # Electronic Cats Bast Pro Mini M0
+            (0x1209, 0xBAB6),       # Electronic Cats Escornabot Makech
             (0x1B4F, 0x8D22),       # SparkFun SAMD21 Mini Breakout
             (0x1B4F, 0x8D23),       # SparkFun SAMD21 Dev Breakout
             (0x1209, 0x2017),       # Mini SAM M4
             (0x1209, 0x7102),       # Mini SAM M0
+            (0x04D8, 0xEC72),       # XinaBox CC03
+            (0x04D8, 0xEC75),       # XinaBox CS11
+            (0x04D8, 0xED5E),       # XinaBox CW03
+            (0x3171, 0x0101),       # 8086.net Commander
+            (0x04D8, 0xED94),       # PyCubed
+            (0x04D8, 0xEDBE),       # SAM32
+            (0x1D50, 0x60E8),       # PewPew Game Console
+            (0x2886, 0x802D),       # Seeed Wio Terminal
+            (0x2886, 0x002F),       # Seeed XIAO
+            (0x1B4F, 0x0016),       # Sparkfun Thing Plus - SAMD51
+            (0x2341, 0x8057),       # Arduino Nano 33 IoT board
+            (0x04D8, 0xEAD1),       # DynOSSAT-EDU-EPS
+            (0x04D8, 0xEAD2),       # DynOSSAT-EDU-OBC
+            (0x1209, 0x4DDD),       # ODT CP Sapling M0
+            (0x1209, 0x4DDE),       # ODT CP Sapling M0 w/ SPI Flash
+            (0x054C, 0x0BC2),       # Spresense
         ],
         "description": "CircuitPython Board",
         "icon": "circuitPythonDevice",

--- a/eric6/MicroPython/MicroPythonWidget.py	Wed Jan 27 19:50:23 2021 +0100
+++ b/eric6/MicroPython/MicroPythonWidget.py	Fri Jan 29 12:17:34 2021 +0100
@@ -299,15 +299,15 @@
             self.deviceInfoLabel.setText(
                 self.tr("%n supported device(s) detected.", "", len(devices)))
             
-            index = 0
-            for device in sorted(devices):
-                index += 1
+            for index, (board, description, portName) in (
+                enumerate(sorted(devices), 1)
+            ):
                 self.deviceTypeComboBox.addItem(
-                    self.tr("{0} at {1}".format(device[1], device[2])))
+                    self.tr("{0} at {1}".format(description, portName)))
                 self.deviceTypeComboBox.setItemData(
-                    index, device[0], self.DeviceTypeRole)
+                    index, board, self.DeviceTypeRole)
                 self.deviceTypeComboBox.setItemData(
-                    index, device[2], self.DevicePortRole)
+                    index, portName, self.DevicePortRole)
                 
         else:
             self.deviceInfoLabel.setText(