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

-:4958dd72c937
+:606ac0e26533
 DeviceTypeRole = Qt.ItemDataRole.UserRole
 DeviceBoardRole = Qt.ItemDataRole.UserRole + 1
 DevicePortRole = Qt.ItemDataRole.UserRole + 2
 DeviceVidRole = Qt.ItemDataRole.UserRole + 3
 DevicePidRole = Qt.ItemDataRole.UserRole + 4
+DeviceSerNoRole = Qt.ItemDataRole.UserRole + 5
 dataReceived = pyqtSignal(bytes)
 ManualMarker = "<manual>"
 self.__device = None
 self.__connected = False
 self.__linkConnected = False
 self.__setConnected(False)
+self.__replBuffer = b""
 if not HAS_QTSERIALPORT:
 self.replEdit.setHtml(
 self.tr(
 "<h3>The QtSerialPort package is not available.<br/>"
 "MicroPython support is deactivated.</h3>"
 boardName,
 description,
 portName,
 vid,
 pid,
+serialNumber,
 ) in enumerate(sorted(devices), 1):
 self.deviceTypeComboBox.addItem(
 self.tr(
 "{0} - {1} ({2})", "board name, description, port name"
 ).format(boardName, description, portName)
 self.deviceTypeComboBox.setItemData(
 index, portName, self.DevicePortRole
 )
 self.deviceTypeComboBox.setItemData(index, vid, self.DeviceVidRole)
 self.deviceTypeComboBox.setItemData(index, pid, self.DevicePidRole)
+self.deviceTypeComboBox.setItemData(
+index, serialNumber, self.DeviceSerNoRole
+)
 else:
 supportedMessage = self.tr("No supported devices detected.")
 self.__unknownPorts = unknownPorts
 # entry is no longer present
 index = 0
 if self.__linkConnected:
 # we are still connected, so disconnect
 self.on_connectButton_clicked()
+self.__device = None
 self.on_deviceTypeComboBox_activated(index)
 self.deviceTypeComboBox.setCurrentIndex(index)
 if unknownDevices:
 )
 boardName = self.deviceTypeComboBox.itemData(index, self.DeviceBoardRole)
 vid = self.deviceTypeComboBox.itemData(index, self.DeviceVidRole)
 pid = self.deviceTypeComboBox.itemData(index, self.DevicePidRole)
+serNo = self.deviceTypeComboBox.itemData(index, self.DeviceSerNoRole)
 if deviceType or (pid is not None and pid is not None):
 self.__device = MicroPythonDevices.getDevice(
-deviceType, self, vid, pid, boardName
+deviceType, self, vid, pid, boardName=boardName, serialNumber=serNo
 )
 self.__device.setButtons()
 self.connectButton.setEnabled(bool(deviceType))
+else:
+self.__device = None
 @pyqtSlot()
 def on_checkButton_clicked(self):
 """
 Private slot to check for connected devices.
 charFormat = tc.charFormat()
 charFormat.setFontFamilies([self.__font.family()])
 charFormat.setFontPointSize(self.__font.pointSize())
 tc.setCharFormat(charFormat)
+# add received data to the buffered one
+data = self.__replBuffer + data
 index = 0
 while index < len(data):
 if data[index] == 8:  # \b
 tc.movePosition(QTextCursor.MoveOperation.Left)
 self.replEdit.setTextCursor(tc)
 mode=QTextCursor.MoveMode.KeepAnchor,
 )
 tc.removeSelectedText()
 self.replEdit.setTextCursor(tc)
 elif match.group("count") == "1":
-# delete to beinning of line
+# delete to beginning of line
 tc.movePosition(
 QTextCursor.MoveOperation.StartOfLine,
 mode=QTextCursor.MoveMode.KeepAnchor,
 )
 tc.removeSelectedText()
 )
 tc.removeSelectedText()
 self.replEdit.setTextCursor(tc)
 elif action == "m":
 self.__setCharFormat(match.group(0)[:-1].split(";"), tc)
+elif (
+len(data) > index + 1
+and data[index] == 27
+and data[index + 1 : index + 4] == b"]0;"
+):
+if b"\x1b\\" in data[index + 4 :]:
+# 'set window title' command detected: <Esc>]0;...<Esc>\
+# __IGNORE_WARNING_M891__
+titleData = data[index + 4 :].split(b"\x1b\\")[0]
+title = titleData.decode()
+index += len(titleData) + 5  # one more is done at the end
+tc.deleteChar()
+self.replEdit.setTextCursor(tc)
+self.replEdit.insertPlainText(title)
+else:
+# data is incomplete; buffer and stop processing
+self.__replBuffer = data[index:]
+return
 else:
 tc.deleteChar()
 self.replEdit.setTextCursor(tc)
 self.replEdit.insertPlainText(chr(data[index]))
 index += 1
 self.replEdit.ensureCursorVisible()
+self.__replBuffer = b""
 def __setCharFormat(self, formatCodes, textCursor):
 """
 Private method setting the current text format of the REPL pane based
 on the passed ANSI codes.
 return
 if self.__interface.connectToDevice(port):
 deviceResponding = self.__interface.probeDevice()
 self.__setConnected(deviceResponding)
+self.__device.setConnected(deviceResponding)
 if deviceResponding:
 if (
 Preferences.getMicroPython("SyncTimeAfterConnect")
 and self.__device.hasTimeCommands()
 ):
 def __disconnectFromDevice(self):
 """
 Private method to disconnect from the device.
 """
+self.__device.setConnected(False)
 self.__interface.disconnectFromDevice()
 self.__setConnected(False)
 @pyqtSlot()
 def on_runButton_clicked(self):
 downloadMenu = None
 # populate the super menu
 hasTime = self.__device.hasTimeCommands() if self.__device else False
-act = self.__superMenu.addAction(
+self.__superMenu.addAction(
 self.tr("Show Version"), self.__showDeviceVersion
-)
+).setEnabled(self.__connected)
-act.setEnabled(self.__connected)
+self.__superMenu.addAction(
-act = self.__superMenu.addAction(
 self.tr("Show Implementation"), self.__showImplementation
-)
+).setEnabled(self.__connected)
-act.setEnabled(self.__connected)
+self.__superMenu.addAction(
-act = self.__superMenu.addAction(
 self.tr("Show Board Data"), self.__showBoardInformation
-)
+).setEnabled(self.__connected)
-act.setEnabled(self.__connected)
 self.__superMenu.addSeparator()
 if hasTime:
-act = self.__superMenu.addAction(
+self.__superMenu.addAction(
 self.tr("Synchronize Time"), self.__synchronizeTime
-)
+).setEnabled(self.__connected)
-act.setEnabled(self.__connected)
+self.__superMenu.addAction(
-act = self.__superMenu.addAction(
 self.tr("Show Device Time"), self.__showDeviceTime
-)
+).setEnabled(self.__connected)
-act.setEnabled(self.__connected)
 self.__superMenu.addAction(self.tr("Show Local Time"), self.__showLocalTime)
 if hasTime:
-act = self.__superMenu.addAction(
+self.__superMenu.addAction(
 self.tr("Show Time"), self.__showLocalAndDeviceTime
-)
+).setEnabled(self.__connected)
-act.setEnabled(self.__connected)
 self.__superMenu.addSeparator()
 self.__superMenu.addAction(
 self.tr("Show Builtin Modules"), self.__showBuiltinModules
 ).setEnabled(self.__connected)
 self.__superMenu.addSeparator()
 if not OSUtilities.isWindowsPlatform():
 available = self.__mpyCrossAvailable()
-act = self.__superMenu.addAction(
+self.__superMenu.addAction(
 self.tr("Compile Python File"), self.__compileFile2Mpy
-)
+).setEnabled(available)
-act.setEnabled(available)
+aw = ericApp().getObject("ViewManager").activeWindow()
-act = self.__superMenu.addAction(
+self.__superMenu.addAction(
 self.tr("Compile Current Editor"), self.__compileEditor2Mpy
-)
+).setEnabled(available and bool(aw))
-aw = ericApp().getObject("ViewManager").activeWindow()
-act.setEnabled(available and bool(aw))
 self.__superMenu.addSeparator()
 if self.__device:
 self.__device.addDeviceMenuEntries(self.__superMenu)
 self.__superMenu.addSeparator()
 if downloadMenu is None:
 # generic download action
-act = self.__superMenu.addAction(
+self.__superMenu.addAction(
 self.tr("Download Firmware"), self.__downloadFirmware
-)
+).setEnabled(self.__device.hasFirmwareUrl())
-act.setEnabled(self.__device.hasFirmwareUrl())
 else:
 # download sub-menu
 self.__superMenu.addMenu(downloadMenu)
 self.__superMenu.addSeparator()
-act = self.__superMenu.addAction(
+self.__superMenu.addAction(
 self.tr("Show Documentation"), self.__showDocumentation
-)
+).setEnabled(self.__device.hasDocumentationUrl())
-act.setEnabled(self.__device.hasDocumentationUrl())
 self.__superMenu.addSeparator()
-if self.__device is not None and not self.__device.hasFlashMenuEntry():
+##if self.__device is not None and not self.__device.hasFlashMenuEntry():
+if bool(UF2FlashDialog.getFoundDevices()):
 self.__superMenu.addAction(self.tr("Flash UF2 Device"), self.__flashUF2)
 self.__superMenu.addSeparator()
 self.__superMenu.addAction(
 self.tr("Manage Unknown Devices"), self.__manageUnknownDevices
 )
 @pyqtSlot()
 def __showDeviceVersion(self):
 """
 Private slot to show some version info about MicroPython of the device.
 """
-try:
+data = self.__device.getDeviceData()
-versionInfo = self.__interface.version()
+if data:
-if versionInfo:
+msg = self.tr("<h3>Device Version Information</h3>")
-msg = self.tr("<h3>Device Version Information</h3>")
+msg += "<table>"
-msg += "<table>"
+for key in ("sysname", "nodename", "release", "version", "machine"):
-for key, value in versionInfo.items():
+msg += "<tr><td><b>{0}</b></td><td>{1}</td></tr>".format(
-msg += "<tr><td><b>{0}</b></td><td>{1}</td></tr>".format(
+key.capitalize(), data[key]
-key.capitalize(), value
+)
-)
+msg += "</table>"
-msg += "</table>"
-else:
-msg = self.tr("No version information available.")
 EricMessageBox.information(self, self.tr("Device Version Information"), msg)
-except Exception as exc:
+else:
-self.__showError("version()", str(exc))
+EricMessageBox.critical(
+self,
+self.tr("Device Version Information"),
+self.tr("No version information available."),
+)
 @pyqtSlot()
 def __showImplementation(self):
 """
 Private slot to show some implementation related information.
 """
-try:
+data = self.__device.getDeviceData()
-impInfo = self.__interface.getImplementation()
+if data:
-if impInfo["name"] == "micropython":
+if data["mpy_name"] == "micropython":
 name = "MicroPython"
-elif impInfo["name"] == "circuitpython":
+elif data["mpy_name"] == "circuitpython":
 name = "CircuitPython"
-elif impInfo["name"] == "unknown":
+elif data["mpy_name"] == "unknown":
 name = self.tr("unknown")
 else:
-name = impInfo["name"]
+name = data["mpy_name"]
 version = (
 self.tr("unknown")
-if impInfo["version"] == "unknown"
+if data["mpy_version"] == "unknown"
-else impInfo["version"]
+else data["mpy_version"]
 )
 variant = (
-self.tr(" ({0})").format(impInfo["variant"])
+self.tr(" ({0})").format(data["mpy_variant"])
-if impInfo["variant"]
+if data["mpy_variant"]
 else ""
 )
 EricMessageBox.information(
 self,
 self.tr(
 "<h3>Device Implementation Information</h3>"
 "<p>This device contains <b>{0} {1}{2}</b>.</p>"
 ).format(name, version, variant),
 )
-except Exception as exc:
+else:
-self.__showError("getImplementation()", str(exc))
+EricMessageBox.critical(
+self,
+self.tr("Device Implementation Information"),
+self.tr("No device implementation information available."),
+)
 @pyqtSlot()
 def __showBoardInformation(self):
 """
 Private slot to show all available information about a board.
 @param quiet flag indicating to not show a message
 @type bool
 """
 if self.__device and self.__device.hasTimeCommands():
+hasCPy = (
+self.__device.checkDeviceData()
+and self.__device.getDeviceData()["mpy_name"] == "circuitpython"
+)
 try:
-self.__interface.syncTime(self.__device.getDeviceType())
+self.__interface.syncTime(self.__device.getDeviceType(), hasCPy=hasCPy)
 if not quiet:
 with EricOverridenCursor():
 EricMessageBox.information(
 self,

Mercurial Repositories > eric / file comparison

comparison: src/eric7/MicroPython/MicroPythonWidget.py

src/eric7/MicroPython/MicroPythonWidget.py