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

-:4958dd72c937
+:606ac0e26533
 Module implementing some utility functions and the MicroPythonDevice base
 class.
 """
 import contextlib
+import copy
 import importlib
 import logging
 import os
 from PyQt6.QtCore import QCoreApplication, QObject, pyqtSlot
 from PyQt6.QtSerialPort import QSerialPortInfo
 from PyQt6.QtWidgets import QInputDialog
 from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 SupportedBoards = {
 "esp": {
 "ids": [
 port.description(),
 SupportedBoards[board]["description"],
 port.portName(),
 vid,
 pid,
+port.serialNumber(),
 )
 )
 supported = True
 if not supported and (vid, pid) in manualDevices:
 # check the locally added ones next
 port.description(),
 SupportedBoards[board]["description"],
 port.portName(),
 vid,
 pid,
+port.serialNumber(),
 )
 )
 supported = True
 if not supported:
 if vid and pid:
 return EricPixmapCache.getIcon(iconName)
 else:
 return EricPixmapCache.getPixmap(iconName)
-def getDevice(deviceType, microPythonWidget, vid, pid, boardName=""):
+def getDevice(deviceType, microPythonWidget, vid, pid, boardName="", serialNumber=""):
 """
 Public method to instantiate a specific MicroPython device interface.
 @param deviceType type of the device interface
 @type str
 @type int
 @param pid product ID (only used for deviceType 'generic')
 @type int
 @param boardName name of the board (defaults to "")
 @type str (optional)
+@param serialNumber serial number of the board (defaults to "")
+@type str (optional)
 @return instantiated device interface
 @rtype MicroPythonDevice
 """
 deviceMapping = {
 "bbc_microbit": ".MicrobitDevices",
 }
 with contextlib.suppress(KeyError):
 mod = importlib.import_module(deviceMapping[deviceType], __package__)
 if mod:
-return mod.createDevice(microPythonWidget, deviceType, vid, pid, boardName)
+return mod.createDevice(
+microPythonWidget, deviceType, vid, pid, boardName, serialNumber
+)
 # nothing specific requested or specific one failed or is not supported yet
 return MicroPythonDevice(microPythonWidget, deviceType)
 """
 super().__init__(parent)
 self._deviceType = deviceType
 self.microPython = microPythonWidget
+self._deviceData = {}  # dictionary with essential device data
+def setConnected(self, connected):
+"""
+Public method to set the connection state.
+Note: This method can be overwritten to perform actions upon connect
+or disconnect of the device.
+@param connected connection state
+@type bool
+"""
+self._deviceData = {}
+if connected:
+with contextlib.suppress(OSError):
+self._deviceData = self.microPython.commandsInterface().getDeviceData()
 def getDeviceType(self):
 """
 Public method to get the device type.
 @return type of the device
 @rtype str
 """
 return self._deviceType
+def getDeviceData(self):
+"""
+Public method to get a copy of the determined device data.
+@return dictionary containing the essential device data
+@rtype dict
+"""
+return copy.deepcopy(self._deviceData)
+def checkDeviceData(self):
+"""
+Public method to check the validity of the device data determined during
+connecting the device.
+@return flag indicating valid device data
+@rtype bool
+"""
+if bool(self._deviceData):
+return True
+else:
+EricMessageBox.critical(
+None,
+self.tr("Show MicroPython Versions"),
+self.tr(
+"""<p>The device data is not available. Try to connect to the"""
+""" device again. Aborting...</p>"""
+).format(self.getDeviceType()),
+)
+return False
 def setButtons(self):
 """
 Public method to enable the supported action buttons.
 """

Mercurial Repositories > eric / file comparison

comparison: src/eric7/MicroPython/MicroPythonDevices.py

src/eric7/MicroPython/MicroPythonDevices.py