Mercurial Repositories > eric / changeset

--- a/eric6/MicroPython/CircuitPythonDevices.py	Sat May 16 12:12:38 2020 +0200
+++ b/eric6/MicroPython/CircuitPythonDevices.py	Mon May 18 17:39:01 2020 +0200
@@ -190,7 +190,7 @@
         """
         Private slot to flash a CircuitPython firmware to the device.
         """
-        ok = E5MessageBox.information(
+        button = E5MessageBox.information(
             self.microPython,
             self.tr("Flash CircuitPython Firmware"),
             self.tr("Please reset the device to bootloader mode and confirm"
@@ -198,7 +198,7 @@
             E5MessageBox.StandardButtons(
                 E5MessageBox.Abort |
                 E5MessageBox.Ok))
-        if ok:
+        if button == E5MessageBox.Ok:
             from .CircuitPythonFirmwareSelectionDialog import (
                 CircuitPythonFirmwareSelectionDialog)
             dlg = CircuitPythonFirmwareSelectionDialog()

--- a/eric6/MicroPython/CircuitPythonFirmwareSelectionDialog.py	Sat May 16 12:12:38 2020 +0200
+++ b/eric6/MicroPython/CircuitPythonFirmwareSelectionDialog.py	Mon May 18 17:39:01 2020 +0200
@@ -52,20 +52,44 @@
         boards = (
             ("", ""),           # indicator for no selection
             
-            ("Adafruit CLUE", "CLUEBOOT"),
+            # Adafruit boards
+            ("--- Adafruit ---", ""),
+            ("CLUE nRF52840 Express", "CLUEBOOT"),
             ("Circuit Playground Bluefruit", "CPLAYBTBOOT"),
             ("Circuit Playground Express", "CPLAYBOOT"),
+            ("Feather Bluefruit Sense", "FTHR840BOOT"),
+            ("Feather M0 Adalogger", "FEATHERBOOT"),
+            ("Feather M0 Basic", "FEATHERBOOT"),
             ("Feather M0 Express", "FEATHERBOOT"),
+            ("Feather M0 RFM69", "FEATHERBOOT"),
+            ("Feather M0 RFM9x", "FEATHERBOOT"),
             ("Feather M4 Express", "FEATHERBOOT"),
+            ("Feather nRF52840 Express", "FTHR840BOOT"),
             ("Gemma M0", "GEMMABOOT"),
             ("Grand Central M4 Express", "GCM4BOOT"),
+            ("Hallowing M4 Express", "HALLOM4BOOT"),
             ("ItsyBitsy M0 Express", "ITSYBOOT"),
             ("ItsyBitsy M4 Express", "ITSYM4BOOT"),
+            ("ItsyBitsy nRF52840 Express", " ITSY840BOOT"),
             ("Metro M0 Express", "METROBOOT"),
             ("Metro M4 Express", "METROM4BOOT"),
+            ("Metro M4 Express AirLift", "METROM4BOOT"),
             ("NeoTrelis M4 Express", "TRELM4BOOT"),
+            ("PyBadge", "BADGEBOOT"),
+            ("PyGamer", "PYGAMERBOOT"),
+            ("PyPortal", "PORTALBOOT"),
+            ("PyPortal Pynt", "PORTALBOOT"),
+            ("PyPortal Titano", "PORTALBOOT"),
+            ("PyRuler", "TRINKETBOOT"),
             ("Trinket M0", "TRINKETBOOT"),
             
+            # SparkFun boards
+            ("--- SparkFun ---", ""),
+            ("Qwiic Micro", "QwiicMicro"),
+            ("SAMD51 Thing Plus", "51THINGBOOT"),
+            ("RedBoard Turbo", "TURBOBOOT"),
+            ("Pro nRF52840 Mini", "NRF52BOOT"),
+            
             (self.tr("Manual Select"), self.__manualMarker),
         )
         for boardName, bootVolume in boards:

--- a/eric6/MicroPython/MicroPythonDevices.py	Sat May 16 12:12:38 2020 +0200
+++ b/eric6/MicroPython/MicroPythonDevices.py	Mon May 18 17:39:01 2020 +0200
@@ -43,7 +43,7 @@
             (0x1209, 0x2017),       # Mini SAM M4
             (0x1209, 0x7102),       # Mini SAM M0
         ],
-        "description": "CircuitPython Boards",
+        "description": "CircuitPython Board",
         "icon": "circuitPythonDevice",
     },