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

-:df9520c864f2
+:5d409223cf3f
 self.__interface = MicroPythonCommandsInterface(self)
 else:
 self.__interface = None
 self.__device = None
 self.__connected = False
+self.__linkConnected = False
 self.__setConnected(False)
 if not HAS_QTSERIALPORT:
 self.replEdit.setHtml(
 self.tr(
 currentDevice, Qt.MatchFlag.MatchExactly
 )
 if index == -1:
 # entry is no longer present
 index = 0
-if self.__connected:
+if self.__linkConnected:
 # we are still connected, so disconnect
 self.on_connectButton_clicked()
 self.on_deviceTypeComboBox_activated(index)
 self.deviceTypeComboBox.setCurrentIndex(index)
 @keyparam kwargs keyword arguments containg the enabled states (keys
 are 'run', 'repl', 'files', 'chart', 'open', 'save'
 @type dict
 """
 if "open" in kwargs:
-self.openButton.setEnabled(kwargs["open"])
+self.openButton.setEnabled(kwargs["open"] and self.__connected)
 if "save" in kwargs:
-self.saveButton.setEnabled(kwargs["save"])
+self.saveButton.setEnabled(kwargs["save"] and self.__connected)
 if "run" in kwargs:
-self.runButton.setEnabled(kwargs["run"])
+self.runButton.setEnabled(kwargs["run"] and self.__connected)
 if "repl" in kwargs:
-self.replButton.setEnabled(kwargs["repl"])
+self.replButton.setEnabled(kwargs["repl"] and self.__linkConnected)
 if "files" in kwargs:
-self.filesButton.setEnabled(kwargs["files"])
+self.filesButton.setEnabled(kwargs["files"] and self.__connected)
 if "chart" in kwargs:
-self.chartButton.setEnabled(kwargs["chart"] and HAS_QTCHART)
+self.chartButton.setEnabled(
+kwargs["chart"] and HAS_QTCHART and self.__connected
+)
 @pyqtSlot(QPoint)
 def __showContextMenu(self, pos):
 """
 Private slot to show the REPL context menu.
 copyKeys = QKeySequence("Ctrl+Shift+C")
 pasteKeys = QKeySequence("Ctrl+Shift+V")
 selectAllKeys = QKeySequence("Ctrl+Shift+A")
 menu = QMenu(self)
-act = menu.addAction(
+menu.addAction(
 EricPixmapCache.getIcon("editDelete"), self.tr("Clear"), self.__clear
-)
+).setEnabled(bool(self.replEdit.toPlainText()))
-act.setEnabled(bool(self.replEdit.toPlainText()))
 menu.addSeparator()
-act = menu.addAction(
+menu.addAction(
 EricPixmapCache.getIcon("editCopy"),
 self.tr("Copy"),
 copyKeys,
 self.replEdit.copy,
-)
+).setEnabled(self.replEdit.textCursor().hasSelection())
-act.setEnabled(self.replEdit.textCursor().hasSelection())
+menu.addAction(
-act = menu.addAction(
 EricPixmapCache.getIcon("editPaste"),
 self.tr("Paste"),
 pasteKeys,
 self.__paste,
-)
+).setEnabled(self.replEdit.canPaste() and self.__connected)
-act.setEnabled(self.replEdit.canPaste() and self.__interface.isConnected())
 menu.addSeparator()
-act = menu.addAction(
+menu.addAction(
 EricPixmapCache.getIcon("editSelectAll"),
 self.tr("Select All"),
 selectAllKeys,
 self.replEdit.selectAll,
-)
+).setEnabled(bool(self.replEdit.toPlainText()))
-act.setEnabled(bool(self.replEdit.toPlainText()))
 menu.exec(self.replEdit.mapToGlobal(pos))
 def __setConnected(self, connected):
 """
 @param connected connection state
 @type bool
 """
 self.__connected = connected
+self.__linkConnected = self.__interface.isConnected()
-self.deviceConnectedLed.setOn(connected)
+self.deviceConnectedLed.setOn(self.__linkConnected)
 if self.__fileManagerWidget:
 self.__fileManagerWidget.deviceConnectedLed.setOn(connected)
-self.deviceTypeComboBox.setEnabled(not connected)
+self.deviceTypeComboBox.setEnabled(not self.__linkConnected)
-if connected:
+if self.__linkConnected:
 self.connectButton.setIcon(EricPixmapCache.getIcon("linkDisconnect"))
 self.connectButton.setToolTip(
 self.tr("Press to disconnect the current device")
 )
 else:
 self.tr("Press to connect the selected device")
 )
 def isConnected(self):
 """
-Public method to get the connection state.
+Public method to get the MicroPython device connection state.
 @return connection state
 @rtype bool
 """
 return self.__connected
+def isLinkConnected(self):
+"""
+Public method to get the link connection state.
+@return connection state
+@rtype bool
+"""
+return self.__linkConnected
 def __showNoDeviceMessage(self):
 """
 Private method to show a message dialog indicating a missing device.
 """
 def on_connectButton_clicked(self):
 """
 Private slot to connect to the selected device or disconnect from the
 currently connected device.
 """
-if self.__connected:
+if self.__linkConnected:
 with EricOverrideCursor():
 self.__disconnectFromDevice()
 if self.replButton.isChecked():
 self.on_replButton_clicked(False)
 MicroPythonDevices.getDeviceIcon(deviceType, False)
 )
 self.__device = MicroPythonDevices.getDevice(
 deviceType, self, vid, pid
 )
-self.__device.setButtons()
 self.__lastPort = port
 self.__lastDeviceType = deviceType
 else:
 return
 if self.__interface.connectToDevice(port):
-self.__setConnected(True)
+deviceResponding = self.__interface.probeDevice()
+self.__setConnected(deviceResponding)
-if (
+if deviceResponding:
-Preferences.getMicroPython("SyncTimeAfterConnect")
+if (
-and self.__device.hasTimeCommands()
+Preferences.getMicroPython("SyncTimeAfterConnect")
-):
+and self.__device.hasTimeCommands()
-self.__synchronizeTime(quiet=True)
+):
+self.__synchronizeTime(quiet=True)
+else:
+with EricOverridenCursor():
+EricMessageBox.warning(
+self,
+self.tr("Serial Device Connect"),
+self.tr(
+"""<p>The device at serial port <b>{0}</b> does not"""
+""" respond. It may not have a MicroPython firmware"""
+""" flashed.</p>"""
+).format(port),
+)
 else:
 with EricOverridenCursor():
 EricMessageBox.warning(
 self,
 self.tr("Serial Device Connect"),
 self.tr(
 """<p>Cannot connect to device at serial"""
 """ port <b>{0}</b>.</p>"""
 ).format(port),
 )
+self.__device.setButtons()
 def __disconnectFromDevice(self):
 """
 Private method to disconnect from the device.
 """
 Private slot to show a list of builtin modules.
 """
 from .ShowModulesDialog import ShowModulesDialog
 if self.__connected:
-moduleNames = self.__interface.getModules()
+try:
-dlg = ShowModulesDialog(
+moduleNames = self.__interface.getModules()
-moduleNames,
+dlg = ShowModulesDialog(
-info=self.tr("Plus any modules on the filesystem."),
+moduleNames,
-parent=self,
+info=self.tr("Plus any modules on the filesystem."),
-)
+parent=self,
-dlg.show()
+)
+dlg.show()
+except Exception as exc:
+self.__showError("getModules()", str(exc))

Mercurial Repositories > eric / file comparison

comparison: src/eric7/MicroPython/MicroPythonWidget.py

src/eric7/MicroPython/MicroPythonWidget.py