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

-:286c2a21f36f
+:54c614d91eff
 #
 """
 Module implementing the MicroPython REPL widget.
 """
+# TODO: refactor the code such to have the MicroPythonWidget as the top level
+#       container and a MicroPythonReplWidget containing the REPL related stuff
+#       (incl. device status line and zoom widget ?)
 import contextlib
 import functools
 import os
 import re
 HAS_QTCHART = True
 except ImportError:
 HAS_QTCHART = False
 try:
-from .MicroPythonDeviceInterface import MicroPythonDeviceInterface
+from .MicroPythonSerialDeviceInterface import MicroPythonSerialDeviceInterface
 HAS_QTSERIALPORT = True
 except ImportError:
 HAS_QTSERIALPORT = False
 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
+DeviceInterfaceTypeRole = Qt.ItemDataRole.UserRole + 6
 dataReceived = pyqtSignal(bytes)
 ManualMarker = "<manual>"
 self.__unknownPorts = []
 self.__lastPort = None
 self.__lastDeviceType = None
-if HAS_QTSERIALPORT:
+self.__interface = None
-self.__interface = MicroPythonDeviceInterface(self)
-else:
-self.__interface = None
 self.__device = None
 self.__connected = False
 self.__linkConnected = False
 self.__setConnected(False)
 self.__origReplEditMouseReleaseEvent = self.replEdit.mouseReleaseEvent
 self.replEdit.mouseReleaseEvent = self.__replEditMouseReleaseEvent
 self.replEdit.customContextMenuRequested.connect(self.__showContextMenu)
 self.__ui.preferencesChanged.connect(self.__handlePreferencesChanged)
-self.__ui.preferencesChanged.connect(self.__interface.handlePreferencesChanged)
 self.__handlePreferencesChanged()
 charFormat = self.replEdit.currentCharFormat()
 self.DefaultForeground = charFormat.foreground()
 )
 self.deviceTypeComboBox.setItemData(index, vid, self.DeviceVidRole)
 self.deviceTypeComboBox.setItemData(index, pid, self.DevicePidRole)
 self.deviceTypeComboBox.setItemData(
 index, serialNumber, self.DeviceSerNoRole
+)
+self.deviceTypeComboBox.setItemData(
+index, "serial", self.DeviceInterfaceTypeRole
 )
 else:
 supportedMessage = self.tr("No supported devices detected.")
 if Preferences.getMicroPython("ReplLineWrap"):
 self.replEdit.setLineWrapMode(QTextEdit.LineWrapMode.WidgetWidth)
 else:
 self.replEdit.setLineWrapMode(QTextEdit.LineWrapMode.NoWrap)
+if self.__interface is not None:
+self.__interface.handlePreferencesChanged
 if self.__chartWidget is not None:
 self.__chartWidget.preferencesChanged()
 def deviceInterface(self):
 """
 @param connected connection state
 @type bool
 """
 self.__connected = connected
-self.__linkConnected = self.__interface.isConnected()
+self.__linkConnected = bool(self.__interface) and self.__interface.isConnected()
 self.deviceConnectedLed.setOn(self.__linkConnected)
 if self.__fileManagerWidget:
 self.__fileManagerWidget.deviceConnectedLed.setOn(connected)
 self.__device.setRepl(True)
 self.replEdit.setFocus(Qt.FocusReason.OtherFocusReason)
 else:
 with contextlib.suppress(TypeError):
-self.__interface.dataReceived.disconnect(self.__processData)
+if self.__interface is not None:
+self.__interface.dataReceived.disconnect(self.__processData)
 if not self.chartButton.isChecked() and not self.filesButton.isChecked():
 self.__disconnectFromDevice()
 self.__device.setRepl(False)
 self.replButton.setChecked(checked)
 # return with device path prepended
 return "/dev/{0}".format(portName)
 else:
 return ""
-def getCurrentBoard(self):
-"""
-Public method to get the board name of the selected device.
-@return board name of the selected device
-@rtype str
-"""
-boardName = self.deviceTypeComboBox.currentData(self.DeviceBoardRole)
-return boardName
 def getDevice(self):
 """
 Public method to get a reference to the current device.
 @return reference to the current device
 Private method to connect to the selected device.
 @param withAutostart flag indicating to start the repl and file manager
 automatically
 @type bool
+@exception ValueError raised to indicate an unsupported interface type
 """
 from .ConnectionSelectionDialog import ConnectionSelectionDialog
-port = self.getCurrentPort()
+interfaceType = (
-if not port:
+self.deviceTypeComboBox.currentData(self.DeviceInterfaceTypeRole)
-with EricOverridenCursor():
+or "serial"
-dlg = ConnectionSelectionDialog(
+)  # 'serial' is the default
-self.__unknownPorts, self.__lastPort, self.__lastDeviceType
-)
+if interfaceType not in ("serial", "webrepl"):
-if dlg.exec() == QDialog.DialogCode.Accepted:
+raise ValueError(
-vid, pid, port, deviceType = dlg.getData()
+"Unsupported interface type detected ('{0}')".format(interfaceType)
+)
-self.deviceIconLabel.setPixmap(
-Devices.getDeviceIcon(deviceType, False)
+if interfaceType == "serial":
+port = self.getCurrentPort()
+if not port:
+with EricOverridenCursor():
+dlg = ConnectionSelectionDialog(
+self.__unknownPorts, self.__lastPort, self.__lastDeviceType
 )
-self.__device = Devices.getDevice(deviceType, self, vid, pid)
+if dlg.exec() == QDialog.DialogCode.Accepted:
+vid, pid, port, deviceType = dlg.getData()
-self.__lastPort = port
-self.__lastDeviceType = deviceType
+self.deviceIconLabel.setPixmap(
-else:
+Devices.getDeviceIcon(deviceType, False)
-return
+)
+self.__device = Devices.getDevice(deviceType, self, vid, pid)
+self.__lastPort = port
+self.__lastDeviceType = deviceType
+else:
+return
+self.__interface = MicroPythonSerialDeviceInterface(self)
+elif interfaceType == "webrepl":
+# TODO: not yet implemented
+return
 if self.__interface.connectToDevice(port):
 deviceResponding = self.__interface.probeDevice()
 self.__setConnected(deviceResponding)
 self.__device.setConnected(deviceResponding)
 def __disconnectFromDevice(self):
 """
 Private method to disconnect from the device.
 """
 self.__device and self.__device.setConnected(False)
-self.__interface.disconnectFromDevice()
 self.__setConnected(False)
+if self.__interface is not None:
+self.__interface.disconnectFromDevice()
+self.__interface.deleteLater()
+self.__interface = None
 @pyqtSlot()
 def on_runButton_clicked(self):
 """
 Private slot to execute the script of the active editor on the

Mercurial Repositories > eric / file comparison

comparison: src/eric7/MicroPython/MicroPythonWidget.py

src/eric7/MicroPython/MicroPythonWidget.py