eric: comparison src/eric7/MicroPython/Devices/MicrobitDevices.py

-:6378da868bb0
+:f0e22f3a5878
 import os
 import shutil
 from PyQt6.QtCore import QStandardPaths, QUrl, pyqtSlot
 from PyQt6.QtNetwork import QNetworkRequest
-from PyQt6.QtWidgets import QInputDialog, QLineEdit, QMenu
+from PyQt6.QtWidgets import QMenu
 from eric7 import Globals, Preferences
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.SystemUtilities import FileSystemUtilities
 The default returns True.
 @return flag indicating support for time commands
 @rtype bool
 """
-if (
+if self.microPython.isConnected() and self.hasCircuitPython():
-self.microPython.isConnected()
-and self.checkDeviceData()
-and self._deviceData["mpy_name"] == "circuitpython"
-):
 return True
 return False
 def __isMicroBitV1(self):
 )
 self.__flashDAPLinkAct = self.__microbitMenu.addAction(
 self.tr("Flash Firmware"), lambda: self.__flashMicroPython(firmware=True)
 )
 self.__microbitMenu.addSeparator()
-self.__saveScripAct = self.__microbitMenu.addAction(
-self.tr("Save Script"), self.__saveScriptToDevice
-)
-self.__saveScripAct.setToolTip(
-self.tr("Save the current script to the selected device")
-)
 self.__saveMainScriptAct = self.__microbitMenu.addAction(
 self.tr("Save Script as 'main.py'"), self.__saveMain
 )
 self.__saveMainScriptAct.setToolTip(
 self.tr("Save the current script as 'main.py' on the connected device")
 @type QMenu
 """
 connected = self.microPython.isConnected()
 linkConnected = self.microPython.isLinkConnected()
+aw = ericApp().getObject("ViewManager").activeWindow()
+canSaveMain = (
+aw is not None
+and (aw.isPyFile() or aw.isMicroPythonFile())
+and bool(aw.text().strip())
+)
 self.__showMpyAct.setEnabled(connected and self.getDeviceType() != "calliope")
 self.__flashMpyAct.setEnabled(not linkConnected)
 self.__flashDAPLinkAct.setEnabled(not linkConnected)
-self.__saveScripAct.setEnabled(connected)
+self.__saveMainScriptAct.setEnabled(connected and canSaveMain)
-self.__saveMainScriptAct.setEnabled(connected)
 self.__resetAct.setEnabled(connected)
 menu.addMenu(self.__microbitMenu)
 def hasFlashMenuEntry(self):
 def __saveMain(self):
 """
 Private slot to copy the current script as 'main.py' onto the
 connected device.
 """
-self.__saveScriptToDevice("main.py")
-@pyqtSlot()
-def __saveScriptToDevice(self, scriptName=""):
-"""
-Private method to save the current script onto the connected
-device.
-@param scriptName name of the file on the device
-@type str
-"""
 aw = ericApp().getObject("ViewManager").activeWindow()
 if not aw:
 return
-title = (
+title = self.tr("Save Script as 'main.py'")
-self.tr("Save Script as '{0}'").format(scriptName)
-if scriptName
-else self.tr("Save Script")
-)
 if not (aw.isPyFile() or aw.isMicroPythonFile()):
 yes = EricMessageBox.yesNo(
 self.microPython,
 title,
 EricMessageBox.warning(
 self.microPython, title, self.tr("""The script is empty. Aborting.""")
 )
 return
-if not scriptName:
+self.putData("main.py", script.encode("utf-8"))
-scriptName = os.path.basename(aw.getFileName())
-scriptName, ok = QInputDialog.getText(
-self.microPython,
-title,
-self.tr("Enter a file name on the device:"),
-QLineEdit.EchoMode.Normal,
-scriptName,
-)
-if not ok or not bool(scriptName):
-return
-title = self.tr("Save Script as '{0}'").format(scriptName)
-commands = [
-"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.deviceInterface().execute(commands)
-if err:
-EricMessageBox.critical(
-self.microPython,
-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()
 Private slot to reset the connected device.
 """
 if self.getDeviceType() == "bbc_microbit":
 # BBC micro:bit
 self.microPython.deviceInterface().execute(
-[
+"import microbit\nmicrobit.reset()\n"
-"import microbit",
-"microbit.reset()",
-]
 )
 else:
 # Calliope mini
 self.microPython.deviceInterface().execute(
-[
+"import calliope_mini\ncalliope_mini.reset()\n"
-"import calliope_mini",
-"calliope_mini.reset()",
-]
 )
 def getDocumentationUrl(self):
 """
 Public method to get the device documentation URL.
 @type str
 @return tuple containg the directory listing
 @rtype tuple of str
 @exception OSError raised to indicate an issue with the device
 """
-# BBC micro:bit does not support directories
+if self.hasCircuitPython():
-commands = [
+return super().ls(dirname=dirname)
-"import os as __os_",
+else:
-"print(__os_.listdir())",
+# BBC micro:bit with MicroPython does not support directories
-"del __os_",
+command = """
-]
+import os as __os_
-out, err = self._interface.execute(commands)
+print(__os_.listdir())
-if err:
+del __os_
-raise OSError(self._shortError(err))
+"""
-return ast.literal_eval(out.decode("utf-8"))
+out, err = self._interface.execute(command)
+if err:
+raise OSError(self._shortError(err))
+return ast.literal_eval(out.decode("utf-8"))
 def lls(self, dirname="", fullstat=False, showHidden=False):
 """
 Public method to get a long directory listing of the connected device
 including meta data.
 false) or the complete stat() tuple. 'None' is returned in case the
 directory doesn't exist.
 @rtype tuple of (str, tuple)
 @exception OSError raised to indicate an issue with the device
 """
-# BBC micro:bit does not support directories
+if self.hasCircuitPython():
-commands = [
+return super().lls(
-"import os as __os_",
+dirname=dirname, fullstat=fullstat, showHidden=showHidden
-"\n".join(
+)
-[
+else:
-"def is_visible(filename, showHidden):",
+# BBC micro:bit with MicroPython does not support directories
-"    return showHidden or "
+command = """
-"(filename[0] != '.' and filename[-1] != '~')",
+import os as __os_
-]
-),
+def is_visible(filename, showHidden):
-"\n".join(
+return showHidden or (filename[0] != '.' and filename[-1] != '~')
-[
-"def stat(filename):",
+def stat(filename):
-"    size = __os_.size(filename)",
+size = __os_.size(filename)
-"    return (0, 0, 0, 0, 0, 0, size, 0, 0, 0)",
+return (0, 0, 0, 0, 0, 0, size, 0, 0, 0)
-]
-),
+def listdir_stat(showHidden):
-"\n".join(
+files = __os_.listdir()
-[
+return list((f, stat(f)) for f in files if is_visible(f,showHidden))
-"def listdir_stat(showHidden):",
-"    files = __os_.listdir()",
+print(listdir_stat({0}))
-"    return list((f, stat(f)) for f in files if"
+del __os_, stat, listdir_stat, is_visible
-" is_visible(f,showHidden))",
+""".format(
-]
+showHidden
-),
+)
-"print(listdir_stat({0}))".format(showHidden),
+out, err = self._interface.execute(command)
-"del __os_, stat, listdir_stat, is_visible",
+if err:
-]
+raise OSError(self._shortError(err))
-out, err = self._interface.execute(commands)
+fileslist = ast.literal_eval(out.decode("utf-8"))
-if err:
+if fileslist is None:
-raise OSError(self._shortError(err))
+return None
-fileslist = ast.literal_eval(out.decode("utf-8"))
-if fileslist is None:
-return None
-else:
-if fullstat:
-return fileslist
 else:
-return [(f, (s[0], s[6], s[8])) for f, s in fileslist]
+if fullstat:
+return fileslist
+else:
+return [(f, (s[0], s[6], s[8])) for f, s in fileslist]
 def pwd(self):
 """
 Public method to get the current directory of the connected device.
 @return current directory
 @rtype str
 """
-# BBC micro:bit does not support directories
+if self.hasCircuitPython():
-return ""
+return super().pwd()
+else:
+# BBC micro:bit with MicroPython does not support directories
+return ""
 ##################################################################
 ## time related methods below
 ##################################################################
 # rtc_time[4] - hour    0..23
 # rtc_time[5] - minute  0..59
 # rtc_time[6] - second  0..59
 # rtc_time[7] - yearday 1..366
 # rtc_time[8] - isdst   0, 1, or -1
-return ""
+if self.hasCircuitPython():
+return super()._getSetTimeCode()
+else:
+return ""
 def createDevice(microPythonWidget, deviceType, vid, pid, boardName, serialNumber):
 """
 Function to instantiate a MicroPython device object.

Mercurial Repositories > eric / file comparison

comparison: src/eric7/MicroPython/Devices/MicrobitDevices.py

src/eric7/MicroPython/Devices/MicrobitDevices.py