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

-:7367a211d865
+:9c64ac720853
 self._deviceData = {}
 if connected:
 self._interface = self.microPython.deviceInterface()
 with contextlib.suppress(OSError):
-self._deviceData = self.__getDeviceData()
+data = self.__getDeviceData()
-self._deviceData["local_mip"] = (
+if "mpy_name" in data:
-not self._deviceData["mip"]
+self._deviceData = data
-and not self._deviceData["upip"]
+self._deviceData["local_mip"] = (
-and not self.hasCircuitPython()
+not self._deviceData["mip"]
-)
+and not self._deviceData["upip"]
-self._deviceData["wifi"], self._deviceData["wifi_type"] = self.hasWifi()
+and not self.hasCircuitPython()
-self._deviceData["bluetooth"] = self.hasBluetooth()
+)
 (
-self._deviceData["ethernet"],
+self._deviceData["wifi"],
-self._deviceData["ethernet_type"],
+self._deviceData["wifi_type"],
-) = self.hasEthernet()
+) = self.hasWifi()
-self._deviceData["ntp"] = self.hasNetworkTime()
+self._deviceData["bluetooth"] = self.hasBluetooth()
+(
+self._deviceData["ethernet"],
+self._deviceData["ethernet_type"],
+) = self.hasEthernet()
+self._deviceData["ntp"] = self.hasNetworkTime()
+else:
+self._deviceData = {}
 else:
 self._interface = None
 def getDeviceType(self):
 """
 Public method to check, if the connected device is flashed with CircuitPython.
 @return flag indicating CircuitPython
 @rtype bool
 """
-return (
+try:
-self.checkDeviceData()
+return (
-and self._deviceData["mpy_name"].lower() == "circuitpython"
+self.checkDeviceData()
-)
+and self._deviceData["mpy_name"].lower() == "circuitpython"
+)
+except KeyError:
+return False
 def submitMode(self):
 """
 Public method to get the submit mode of the device.
 @return dictionary containing the determined data
 @rtype dict
 @exception OSError raised to indicate an issue with the device
 """
-command = """
+commands = [  # needs to be splitted for boards with low memory
-def get_board_info():
+"""def get_board_info():
 res = {}
 import gc
 gc.enable()
 gc.collect()
 res['mem_used_kb'] = mem_alloc / 1024.0
 res['mem_used_pc'] = mem_alloc / mem_total * 100.0
 res['mem_free_kb'] = mem_free / 1024.0
 res['mem_free_pc'] = mem_free / mem_total * 100.0
 del gc, mem_alloc, mem_free, mem_total
+return res
+print(get_board_info())
+del get_board_info
+""",
+"""def get_board_info():
+res = {}
 try:
 import os
 uname = os.uname()
 res['sysname'] = uname.sysname
 res['sysname'] = sys.platform
 res['nodename'] = sys.platform
 res['release'] = '.'.join(str(v) for v in sys.implementation.version)
 res['version'] = sys.version.split(';', 1)[-1].strip()
 res['machine'] = sys.implementation._machine
+return res
+print(get_board_info())
+del get_board_info
+""",
+"""def get_board_info():
+res = {}
 import sys
 res['py_platform'] = sys.platform
 res['py_version'] = sys.version
 except ImportError:
 res['mpy_variant'] = ''
 res['mpy_variant_info'] = ''
 res['mpy_variant_version'] = ''
+return res
+print(get_board_info())
+del get_board_info
+""",
+"""def get_board_info():
+res = {}
 try:
+import os
 stat_ = os.statvfs('/flash')
 res['flash_info_available'] = True
 res['flash_total_kb'] = stat_[2] * stat_[0] / 1024.0
 res['flash_free_kb'] = stat_[3] * stat_[0] / 1024.0
 res['flash_used_kb'] = res['flash_total_kb'] - res['flash_free_kb']
 res['flash_free_pc'] = res['flash_free_kb'] / res['flash_total_kb'] * 100.0
 res['flash_used_pc'] = res['flash_used_kb'] / res['flash_total_kb'] * 100.0
 except (AttributeError, OSError):
 res['flash_info_available'] = False
+return res
+print(get_board_info())
+del get_board_info
+""",
+"""def get_board_info():
+res = {}
 try:
 import machine as mc
 if isinstance(mc.freq(), tuple):
 res['mc_frequency_mhz'] = mc.freq()[0] / 1000000.0
 res['mc_frequency'] = None
 res['mc_temp'] = None
 if 'mc_id' in res:
 res['mc_id'] = ':'.join('{0:02X}'.format(x) for x in res['mc_id'])
+return res
+print(get_board_info())
+del get_board_info
+""",
+"""def get_board_info():
+res = {}
 try:
 import ulab
 res['ulab'] = ulab.__version__
 except ImportError:
 res['ulab'] = None
 return res
 print(get_board_info())
 del get_board_info
-"""
+""",
-out, err = self.executeCommands(command, mode=self._submitMode)
+]
-if err:
+res = {}
-raise OSError(self._shortError(err))
+for command in commands:
-return ast.literal_eval(out.decode("utf-8"))
+out, err = self.executeCommands(command, mode=self._submitMode)
+if err:
+raise OSError(self._shortError(err))
+res.update(ast.literal_eval(out.decode("utf-8")))
+return res
 def getModules(self):
 """
 Public method to show a list of modules built into the firmware.

Mercurial Repositories > eric / file comparison

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

src/eric7/MicroPython/Devices/DeviceBase.py