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

-:2eb7b5516a60
+:0cf5dda5512f
 from eric7.SystemUtilities import PythonUtilities
 from ..MicroPythonWidget import HAS_QTCHART
 from . import FirmwareGithubUrls
 from .DeviceBase import BaseDevice
+from .CircuitPythonDevices import CircuitPythonDevice
 class EspDevice(BaseDevice):
 """
 Class implementing the device for ESP32 and ESP8266 based boards.
 @type QObject
 """
 super().__init__(microPythonWidget, deviceType, parent)
 self.__createEsp32Submenu()
+self.__cpyDevice = None
+# needed to delegate some methods to a CircuitPython variant
 self.__statusTranslations = {
 200: self.tr("beacon timeout"),
 201: self.tr("no matching access point found"),
 202: self.tr("authentication failed"),
 4: "WPA/WPA2",
 5: "WPA2 (CCMP)",
 6: "WPA3",
 7: "WPA2/WPA3",
 }
+def __createCpyDevice(self):
+"""
+Private method to create a CircuitPython device interface.
+"""
+if self.hasCircuitPython() and self.__cpyDevice is None:
+self.__cpyDevice = CircuitPythonDevice(
+self.microPython,
+"esp32_circuitpython",
+"esp32",
+hasWorkspace=False,
+parent=self.parent(),
+)
+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
+"""
+super().setConnected(connected)
+if self.hasCircuitPython():
+self._submitMode = "paste"
+self.__createCpyDevice()
 def setButtons(self):
 """
 Public method to enable the supported action buttons.
 """
 def __showFirmwareVersions(self):
 """
 Private slot to show the firmware version of the connected device and the
 available firmware version.
 """
+if self.hasCircuitPython():
+return self.__cpyDevice.showCircuitPythonVersions()
 if self.microPython.isConnected():
 if self._deviceData["mpy_name"] == "micropython":
 url = QUrl(FirmwareGithubUrls["micropython"])
 elif self._deviceData["mpy_name"] == "circuitpython":
 url = QUrl(FirmwareGithubUrls["circuitpython"])
 @pyqtSlot()
 def __resetDevice(self):
 """
 Private slot to reset the connected device.
 """
-if self.microPython.isConnected():
+if self.microPython.isConnected() and not self.hasCircuitPython():
 self.microPython.deviceInterface().execute(
 "import machine\nmachine.reset()\n", mode=self._submitMode
 )
 else:
 # perform a reset via esptool using flash_id command ignoring
 Public method to get the device documentation URL.
 @return documentation URL of the device
 @rtype str
 """
+if self.hasCircuitPython():
+return self.__cpyDevice.getDocumentationUrl()
 return Preferences.getMicroPython("MicroPythonDocuUrl")
 def getFirmwareUrl(self):
 """
 Public method to get the device firmware download URL.
 @return firmware download URL of the device
 @rtype str
 """
+if self.hasCircuitPython():
+return self.__cpyDevice.getFirmwareUrl()
 return Preferences.getMicroPython("MicroPythonFirmwareUrl")
 ##################################################################
 ## time related methods below
 ##################################################################
 # (year, month, day, weekday, hour, minute, second, subseconds)
 # __IGNORE_WARNING_M891__
 # https://docs.micropython.org/en/latest/library/machine.RTC.html#machine-rtc
 #
 # LoBo variant of MPy deviates.
+if self.hasCircuitPython():
+return super()._getSetTimeCode()
 return """
 def set_time(rtc_time):
 import machine
 rtc = machine.RTC()
 try:
 @return tuple containing a flag indicating the availability of WiFi
 and the WiFi type (esp32)
 @rtype tuple of (bool, str)
 """
+if self.hasCircuitPython():
+self.__createCpyDevice()
+return self.__cpyDevice.hasWifi()
 return True, "esp32"
 def getWifiData(self):
 """
 Public method to get data related to the current WiFi status.
 @return tuple of three dictionaries containing the WiFi status data
 for the WiFi client, access point and overall data
 @rtype tuple of (dict, dict, dict)
 @exception OSError raised to indicate an issue with the device
 """
+if self.hasCircuitPython():
+return self.__cpyDevice.getWifiData()
 command = """
 def wifi_status():
 import ubinascii
 import ujson
 import network
 @param password password needed to connect
 @type str
 @return tuple containing the connection status and an error string
 @rtype tuple of (bool, str)
 """
+if self.hasCircuitPython():
+return self.__cpyDevice.connectWifi(ssid, password)
 command = """
 def connect_wifi(ssid, password):
 import network
 import ujson
 from time import sleep
 Public method to disconnect a device from the WiFi network.
 @return tuple containing a flag indicating success and an error string
 @rtype tuple of (bool, str)
 """
+if self.hasCircuitPython():
+return self.__cpyDevice.disconnectWifi()
 command = """
 def disconnect_wifi():
 import network
 from time import sleep
 @param password password needed to authenticate
 @type str
 @return tuple containing a flag indicating success and an error message
 @rtype tuple of (bool, str)
 """
+if self.hasCircuitPython():
+return self.__cpyDevice.writeCredentials(ssid, password)
 nvsCommand = """
 def save_wifi_creds(ssid, password):
 import esp32
 nvs = esp32.NVS('wifi_creds')
 Public method to remove the saved credentials from the connected device.
 @return tuple containing a flag indicating success and an error message
 @rtype tuple of (bool, str)
 """
+if self.hasCircuitPython():
+return self.__cpyDevice.removeCredentials()
 nvsCommand = """
 def delete_wifi_creds():
 import esp32
 nvs = esp32.NVS('wifi_creds')
 Public method to check, if the internet can be reached.
 @return tuple containing a flag indicating reachability and an error string
 @rtype tuple of (bool, str)
 """
+if self.hasCircuitPython():
+return self.__cpyDevice.checkInternet()
 command = """
 def check_internet():
 import network
 import socket
 @return tuple containing the list of available networks as a tuple of 'Name',
 'MAC-Address', 'channel', 'RSSI' and 'security' and an error string
 @rtype tuple of (list of tuple of (str, str, int, int, str), str)
 """
+if self.hasCircuitPython():
+return self.__cpyDevice.scanNetworks()
 command = """
 def scan_networks():
 import network
 wifi = network.WLAN(network.STA_IF)
 if interface not in ("STA", "AP"):
 raise ValueError(
 "interface must be 'AP' or 'STA', got '{0}'".format(interface)
 )
+if self.hasCircuitPython():
+return self.__cpyDevice.deactivateInterface(interface)
 command = """
 def deactivate():
 import network
 from time import sleep
 (IPv4 address, netmask, gateway address, DNS server address)
 @type tuple of (str, str, str, str)
 @return tuple containing a flag indicating success and an error message
 @rtype tuple of (bool, str)
 """
+if self.hasCircuitPython():
+return self.__cpyDevice.startAccessPoint(
+ssid, security=security, password=password, ifconfig=ifconfig
+)
 if security is None or password is None:
 security = 0
 password = ""
 if security > 4:
 security = 4  # security >4 cause an error thrown by the ESP32
 Public method to stop the access point interface.
 @return tuple containg a flag indicating success and an error message
 @rtype tuple of (bool, str)
 """
+if self.hasCircuitPython():
+return self.__cpyDevice.stopAccessPoint()
 return self.deactivateInterface("AP")
 def getConnectedClients(self):
 """
 Public method to get a list of connected clients.
 @return a tuple containing a list of tuples containing the client MAC-Address
 and the RSSI (if supported and available) and an error message
 @rtype tuple of ([(bytes, int)], str)
 """
+if self.hasCircuitPython():
+return self.__cpyDevice.getConnectedClients()
 command = """
 def get_stations():
 import network
 ap = network.WLAN(network.AP_IF)
 @return flag indicating the availability of Bluetooth
 @rtype bool
 @exception OSError raised to indicate an issue with the device
 """
+if self.hasCircuitPython():
+self.__createCpyDevice()
+return self.__cpyDevice.hasBluetooth()
 command = """
 def has_bt():
 try:
 import bluetooth
 if hasattr(bluetooth, 'BLE'):
 @return list of tuples containing the translated status data label and
 the associated value
 @rtype list of tuples of (str, str)
 @exception OSError raised to indicate an issue with the device
 """
+if self.hasCircuitPython():
+return self.__cpyDevice.getBluetoothStatus()
 command = """
 def ble_status():
 import bluetooth
 import ubinascii
 import ujson
 @return flag indicating the new state of the Bluetooth interface
 @rtype bool
 @exception OSError raised to indicate an issue with the device
 """
+if self.hasCircuitPython():
+return self.__cpyDevice.activateBluetoothInterface()
 command = """
 def activate_ble():
 import bluetooth
 ble = bluetooth.BLE()
 @return flag indicating the new state of the Bluetooth interface
 @rtype bool
 @exception OSError raised to indicate an issue with the device
 """
+if self.hasCircuitPython():
+return self.__cpyDevice.deactivateBluetoothInterface()
 command = """
 def deactivate_ble():
 import bluetooth
 ble = bluetooth.BLE()
 @return tuple containing a dictionary with the scan results and
 an error string
 @rtype tuple of (dict, str)
 """
 from ..BluetoothDialogs.BluetoothAdvertisement import BluetoothAdvertisement
+if self.hasCircuitPython():
+return self.__cpyDevice.getDeviceScan(timeout)
 command = """
 def ble_scan():
 import bluetooth
 import time

Mercurial Repositories > eric / file comparison

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

src/eric7/MicroPython/Devices/EspDevices.py