--- a/eric6/MicroPython/CircuitPythonFirmwareSelectionDialog.py Sat May 02 14:04:18 2020 +0200 +++ b/eric6/MicroPython/CircuitPythonFirmwareSelectionDialog.py Sun May 31 17:26:14 2020 +0200 @@ -48,22 +48,49 @@ self.bootPicker.setMode(E5PathPickerModes.DirectoryShowFilesMode) + self.__manualMarker = "<manual>" boards = ( ("", ""), # indicator for no selection + # 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"), - ("Manual Select", "<manual>"), + # 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: self.boardComboBox.addItem(boardName, bootVolume) @@ -84,7 +111,7 @@ enable = False else: volumeName = self.boardComboBox.currentData() - if volumeName and volumeName != "<manual>": + if volumeName and volumeName != self.__manualMarker: # check if the user selected a board and the board is in # bootloader mode deviceDirectory = Utilities.findVolume(volumeName) @@ -104,7 +131,7 @@ .format(volumeName) ) - elif volumeName == "<manual>": + elif volumeName == self.__manualMarker: # select the device path manually deviceDirectory = self.bootPicker.text() enable = (bool(deviceDirectory) and @@ -134,7 +161,7 @@ @param index index of the selected board type @type int """ - if self.boardComboBox.itemData(index) == "<manual>": + if self.boardComboBox.itemData(index) == self.__manualMarker: self.bootPicker.clear() self.bootPicker.setEnabled(True) else: