eric: comparison eric6/MicroPython/MicrobitDevices.py

-:9d15757d06ac
+:a22b87b46128
 """
 Module implementing the device interface class for BBC micro:bit boards.
 """
-import sys
 import os
+import shutil
 from PyQt5.QtCore import pyqtSlot, QStandardPaths
+from PyQt5.QtWidgets import QInputDialog, QLineEdit
 from .MicroPythonDevices import MicroPythonDevice
 from .MicroPythonWidget import HAS_QTCHART
 from E5Gui import E5MessageBox, E5FileDialog
 from E5Gui.E5Application import e5App
-from E5Gui.E5ProcessDialog import E5ProcessDialog
 import Utilities
 import Preferences
 @param menu reference to the context menu
 @type QMenu
 """
 connected = self.microPython.isConnected()
-act = menu.addAction(self.tr("Flash Default MicroPython Firmware"),
+act = menu.addAction(self.tr("Flash MicroPython Firmware"),
 self.__flashMicroPython)
 act.setEnabled(not connected)
-act = menu.addAction(self.tr("Flash Custom MicroPython Firmware"),
-self.__flashCustomMicroPython)
-act.setEnabled(not connected)
 menu.addSeparator()
-act = menu.addAction(self.tr("Flash Script"), self.__flashScript)
+act = menu.addAction(self.tr("Save Script"), self.__saveScriptToDevice)
 act.setToolTip(self.tr(
-"Flash the current script to the selected device."))
+"Save the current script to the selected device"))
-act.setEnabled(not connected)
+act.setEnabled(connected)
 act = menu.addAction(self.tr("Save Script as 'main.py'"),
 self.__saveMain)
 act.setToolTip(self.tr(
 "Save the current script as 'main.py' on the connected device"))
 act.setEnabled(connected)
 menu.addSeparator()
 act = menu.addAction(self.tr("Reset micro:bit"), self.__resetDevice)
 act.setEnabled(connected)
-menu.addSeparator()
-menu.addAction(self.tr("Install 'uflash'"), self.__installUflashTool)
 @pyqtSlot()
 def __flashMicroPython(self):
 """
 Private slot to flash the default MicroPython firmware to the device.
 """
-flashArgs = [
+# Attempts to find the path on the filesystem that represents the
-"-u",
+# plugged in micro:bit board in maintenance mode.
-"-m", "uflash",
+deviceDirectory = Utilities.findVolume("MAINTENANCE")
-]
+if not deviceDirectory:
-dlg = E5ProcessDialog(self.tr("'uflash' Output"),
+# BBC micro:bit is not ready or not mounted
-self.tr("Flash Default MicroPython Firmware"))
+E5MessageBox.critical(
-res = dlg.startProcess(sys.executable, flashArgs)
+self.microPython,
-if res:
+self.tr("Flash MicroPython Firmware"),
-dlg.exec_()
+self.tr(
+'The BBC micro:bit is not ready for flashing. See the'
+' <a href="https://microbit.org/guide/firmware/">'
+'micro:bit web site</a> for details.'
+))
+else:
+downloadsPath = QStandardPaths.standardLocations(
+QStandardPaths.DownloadLocation)[0]
+firmware = E5FileDialog.getOpenFileName(
+self.microPython,
+self.tr("Flash MicroPython Firmware"),
+downloadsPath,
+self.tr("MicroPython Firmware Files (*.hex);;All Files (*)"))
+if firmware and os.path.exists(firmware):
+shutil.copy2(firmware, deviceDirectory)
 @pyqtSlot()
-def __flashCustomMicroPython(self):
+def __saveMain(self):
 """
-Private slot to flash a custom MicroPython firmware to the device.
+Private slot to copy the current script as 'main.py' onto the
-"""
+connected device.
-downloadsPath = QStandardPaths.standardLocations(
+"""
-QStandardPaths.DownloadLocation)[0]
+self.__saveScriptToDevice("main.py")
-firmware = E5FileDialog.getOpenFileName(
-self.microPython,
-self.tr("Flash Custom MicroPython Firmware"),
-downloadsPath,
-self.tr("MicroPython Firmware Files (*.hex);;All Files (*)"))
-if firmware and os.path.exists(firmware):
-flashArgs = [
-"-u",
-"-m", "uflash",
-"--runtime", firmware,
-]
-dlg = E5ProcessDialog(
-self.tr("'uflash' Output"),
-self.tr("Flash Default MicroPython Firmware"))
-res = dlg.startProcess(sys.executable, flashArgs)
-if res:
-dlg.exec_()
 @pyqtSlot()
-def __flashScript(self):
+def __saveScriptToDevice(self, scriptName=""):
 """
-Private slot to flash the current script onto the selected device.
+Private method to save the current script onto the connected
+device.
+@param scriptName name of the file on the device
+@type str
 """
 aw = e5App().getObject("ViewManager").activeWindow()
 if not aw:
 return
+if scriptName:
+title = self.tr("Save Script as '{0}'").format(scriptName)
+else:
+title = self.tr("Save Script")
 if not (aw.isPyFile() or aw.isMicroPythonFile()):
 yes = E5MessageBox.yesNo(
 self.microPython,
-self.tr("Flash Script"),
+title,
-self.tr("""The current editor does not contain a Python"""
-""" script. Flash it anyway?"""))
-if not yes:
-return
-script = aw.text().strip()
-if not script:
-E5MessageBox.warning(
-self.microPython,
-self.tr("Flash Script"),
-self.tr("""The script is empty. Aborting."""))
-return
-if aw.checkDirty():
-filename = aw.getFileName()
-flashArgs = [
-"-u",
-"-m", "uflash",
-filename,
-]
-dlg = E5ProcessDialog(self.tr("'uflash' Output"),
-self.tr("Flash Script"))
-res = dlg.startProcess(sys.executable, flashArgs)
-if res:
-dlg.exec_()
-@pyqtSlot()
-def __saveMain(self):
-"""
-Private slot to copy the current script as 'main.py' onto the
-connected device.
-"""
-aw = e5App().getObject("ViewManager").activeWindow()
-if not aw:
-return
-if not (aw.isPyFile() or aw.isMicroPythonFile()):
-yes = E5MessageBox.yesNo(
-self.microPython,
-self.tr("Save Script as 'main.py'"),
 self.tr("""The current editor does not contain a Python"""
 """ script. Write it anyway?"""))
 if not yes:
 return
 script = aw.text().strip()
 if not script:
 E5MessageBox.warning(
 self.microPython,
-self.tr("Save Script as 'main.py'"),
+title,
 self.tr("""The script is empty. Aborting."""))
 return
+if not scriptName:
+scriptName = os.path.basename(aw.getFileName())
+scriptName, ok = QInputDialog.getText(
+self.microPython,
+title,
+self.tr("Enter a file name on the device:"),
+QLineEdit.Normal,
+scriptName)
+if not ok or not bool(scriptName):
+return
+title = self.tr("Save Script as '{0}'").format(scriptName)
 commands = [
-"fd = open('main.py', 'wb')",
+"fd = open('{0}', 'wb')".format(scriptName),
 "f = fd.write",
 ]
 for line in script.splitlines():
 commands.append("f(" + repr(line + "\n") + ")")
 commands.append("fd.close()")
 out, err = self.microPython.commandsInterface().execute(commands)
 if err:
 E5MessageBox.critical(
 self.microPython,
-self.tr("Save Script as 'main.py'"),
+title,
 self.tr("""<p>The script could not be saved to the"""
 """ device.</p><p>Reason: {0}</p>""")
 .format(err.decode("utf-8")))
 # reset the device
+self.__resetDevice()
+@pyqtSlot()
+def __resetDevice(self):
+"""
+Private slot to reset the connected device.
+"""
 self.microPython.commandsInterface().execute([
 "import microbit",
 "microbit.reset()",
 ])
-@pyqtSlot()
-def __resetDevice(self):
-"""
-Private slot to reset the connected device.
-"""
-self.microPython.commandsInterface().execute([
-"import microbit",
-"microbit.reset()",
-])
-@pyqtSlot()
-def __installUflashTool(self):
-"""
-Private slot to install the uflash package via pip.
-"""
-pip = e5App().getObject("Pip")
-pip.installPackages(["uflash"], interpreter=sys.executable)
 def getDocumentationUrl(self):
 """
 Public method to get the device documentation URL.
 @return documentation URL of the device

Mercurial Repositories > eric / file comparison

comparison: eric6/MicroPython/MicrobitDevices.py

eric6/MicroPython/MicrobitDevices.py