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

-:64660db96a7a
+:f9a0704d16b2
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-from eric7.SystemUtilities import FileSystemUtilities
+from eric7.SystemUtilities import FileSystemUtilities, OSUtilities
 from . import Devices
 from .Ui_UF2FlashDialog import Ui_UF2FlashDialog
 SupportedUF2Boards = {
 @rtype list of tuple of (str, str, (int, int))
 """
 foundDevices = set()
 # step 1: determine all known UF2 volumes that are mounted
+if not OSUtilities.isWindowsPlatform():
+userMounts = FileSystemUtilities.getUserMounts()
 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):
+if OSUtilities.isWindowsPlatform():
-foundDevices.add((board, description, vidpid))
+if FileSystemUtilities.findVolume(volume, findAll=True):
+foundDevices.add((board, description, vidpid))
-# set 2: determine all devices that have their UF2 volume not mounted
+else:
+# check only user mounted devices on non-Windows systems
+for userMount in userMounts:
+if os.path.basename(userMount).startswith(volume):
+foundDevices.add((board, description, vidpid))
+break
+# step 2: determine all devices that have their UF2 volume not mounted
 availablePorts = QSerialPortInfo.availablePorts()
 for port in availablePorts:
 vid = port.vendorIdentifier()
 pid = port.productIdentifier()
 )
 self.__manualType = "<manual>"
 self.__boardType = boardType
-self.__populate()
+self.on_refreshButton_clicked()
-self.__updateFlashButton()
 def __populate(self):
 """
 Private method to (re-)populate the dialog.
 """
 if devices:
 self.__showSpecificInstructions(list(devices))
 else:
 self.__showAllInstructions()
 self.devicesComboBox.addItem(self.tr("Manual Select"))
-self.devicesComboBox.setItemData(1, self.__manualType, self.DeviceTypeRole)
+self.devicesComboBox.setItemData(0, self.__manualType, self.DeviceTypeRole)
 elif len(devices) == 1:
 # set the board type to the found one
 self.__boardType = devices[0][0]
 self.devicesComboBox.addItem(devices[0][1])
 """
 Private slot to refresh the dialog.
 """
 self.__populate()
 self.__updateFlashButton()
+self.on_devicesComboBox_currentIndexChanged(0)
 @pyqtSlot(int)
 def on_devicesComboBox_currentIndexChanged(self, index):
 """
 Private slot to handle the selection of a board.
 def on_searchBootButton_clicked(self):
 """
 Private slot to look for all known boot paths and present a list to select from.
 """
 foundBootVolumes = set()
+if not OSUtilities.isWindowsPlatform():
+userMounts = FileSystemUtilities.getUserMounts()
 for boardType in SupportedUF2Boards:
 for volumes in SupportedUF2Boards[boardType]["volumes"].values():
 for volume, _ in volumes:
-foundBootVolumes.update(
+if OSUtilities.isWindowsPlatform():
-FileSystemUtilities.findVolume(volume, findAll=True)
+foundBootVolumes.update(
-)
+FileSystemUtilities.findVolume(volume, findAll=True)
+)
+else:
+# check only user mounted devices on non-Windows systems
+for userMount in userMounts:
+if os.path.basename(userMount).startswith(volume):
+foundBootVolumes.add(userMount)
 if len(foundBootVolumes) == 0:
 selectedVolume = ""
 EricMessageBox.information(
 self,

Mercurial Repositories > eric / file comparison

comparison: src/eric7/MicroPython/UF2FlashDialog.py

src/eric7/MicroPython/UF2FlashDialog.py