eric: comparison src/eric7/MicroPython/UF2FlashDialog.py

-:1aa8517bc61f
+:7c5fa3eef082
 """
 Module implementing a dialog to flash any UF2 capable device.
 """
-import contextlib
 import os
 import shutil
 from PyQt6.QtCore import QCoreApplication, QEventLoop, Qt, QThread, pyqtSlot
 from PyQt6.QtSerialPort import QSerialPortInfo
 "<li>Select the firmware file to be flashed and click the"
 " flash button.</li>"
 "</ol>",
 ),
 "show_all": True,
-"firmware": "CircuitPython",
-},
-"circuitpython_rp2040": {
-"volumes": {
-(0x239A, 0x80F4): [
-("RPI-RP2", "Raspberry Pi Pico"),
-],
-},
-"instructions": QCoreApplication.translate(
-"UF2FlashDialog",
-"<h3>Pi Pico (RP2040) Board</h3>"
-"<p>In order to prepare the board for flashing follow these"
-" steps:</p><ol>"
-"<li>Enter 'bootloader' mode (board <b>without</b> RESET button):"
-"<ul>"
-"<li>Plug in your board while holding the BOOTSEL button.</li>"
-"</ul>"
-"Enter 'bootloader' mode (board <b>with</b> RESET button):"
-"<ul>"
-"<li>hold down RESET</li>"
-"<li>hold down BOOTSEL</li>"
-"<li>release RESET</li>"
-"<li>release BOOTSEL</li>"
-"</ul></li>"
-"<li>Wait until the device has entered 'bootloader' mode.</li>"
-"<li>Ensure the boot volume is available (this may require"
-" mounting it).</li>"
-"<li>Select the firmware file to be flashed and click the"
-" flash button.</li>"
-"</ol>",
-),
-"show_all": False,
 "firmware": "CircuitPython",
 },
 "rp2040": {
 "volumes": {
 (0x0000, 0x0000): [
 VID and PID
 @rtype list of tuple of (str, str, (int, int))
 """
 foundDevices = set()
+# step 1: determine all known UF2 volumes that are mounted
+boardTypes = [boardType] if boardType else list(SupportedUF2Boards.keys())
+for board in boardTypes:
+for vidpid, volumes in SupportedUF2Boards[board]["volumes"].items():
+for volume, description in volumes:
+if FileSystemUtilities.findVolume(volume, findAll=True):
+foundDevices.add((board, description, vidpid))
+# set 2: determine all devices that have their UF2 volume not mounted
 availablePorts = QSerialPortInfo.availablePorts()
 for port in availablePorts:
 vid = port.vendorIdentifier()
 pid = port.productIdentifier()
 for board in SupportedUF2Boards:
 if (not boardType or (board.startswith(boardType))) and (
 vid,
 pid,
 ) in SupportedUF2Boards[board]["volumes"]:
-foundDevices.add(
+for device in foundDevices:
-(
+if (vid, pid) == device[2]:
-board,
+break
-port.description(),
+else:
-(vid, pid),
+foundDevices.add(
+(
+board,
+port.description(),
+(vid, pid),
+)
 )
-)
-# second run for boards needing special treatment (e.g. RP2040)
-for board in SupportedUF2Boards:
-if not boardType or (board == boardType):
-with contextlib.suppress(KeyError):
-# find mounted volume
-volumes = SupportedUF2Boards[board]["volumes"][(0, 0)]
-for volume, description in volumes:
-if FileSystemUtilities.findVolume(volume, findAll=True):
-foundDevices.add(
-(board, port.description() or description, (0, 0))
-)
-# third run for CircuitPython boards in UF2 mode but with VID/PID being invalid
-for vidpid, volumes in SupportedUF2Boards["circuitpython"]["volumes"].items():
-for volume, description in volumes:
-if FileSystemUtilities.findVolume(volume, findAll=True):
-foundDevices.add(
-(
-"circuitpython",
-port.description() or description,
-vidpid,
-)
-)
 return list(foundDevices)
 class UF2FlashDialog(QDialog, Ui_UF2FlashDialog):
 self.__manualType = "<manual>"
 self.__boardType = boardType
 self.__populate()
 self.__updateFlashButton()
 def __populate(self):
 """
 Private method to (re-)populate the dialog.
 )
 # select the remembered device, if it is still there
 if currentDevice:
 self.devicesComboBox.setCurrentText(currentDevice)
+if self.devicesComboBox.currentIndex() == -1 and len(devices) == 1:
+# the device name has changed but only one is present; select it
+self.devicesComboBox.setCurrentIndex(0)
 self.firmwarePicker.setText(firmwareFile)
 elif len(devices) == 1:
 self.devicesComboBox.setCurrentIndex(0)
 else:
 self.devicesComboBox.setCurrentIndex(-1)
 @pyqtSlot()
 def on_refreshButton_clicked(self):
 """
 Private slot to refresh the dialog.
 """
-# special treatment for RPi Pico
-if self.__boardType == "circuitpython_rp2040":
-self.__boardType = "rp2040"
 self.__populate()
+self.__updateFlashButton()
 @pyqtSlot(int)
 def on_devicesComboBox_currentIndexChanged(self, index):
 """
 Private slot to handle the selection of a board.
 self.__showNoVolumeInformation([v[0] for v in volumes], boardType)
 self.bootPicker.clear()
 elif len(foundVolumes) == 1:
 self.bootPicker.setText(foundVolumes[0])
 else:
-self.__showMultipleVolumesInformation()
+self.__showMultipleVolumesInformation(foundVolumes)
 self.bootPicker.clear()
 self.__updateFlashButton()
 @pyqtSlot(str)

Mercurial Repositories > eric / file comparison

comparison: src/eric7/MicroPython/UF2FlashDialog.py

src/eric7/MicroPython/UF2FlashDialog.py