Mercurial Repositories > eric / file diff

--- a/src/eric7/MicroPython/Devices/RP2040Devices.py	Fri Feb 24 14:11:20 2023 +0100
+++ b/src/eric7/MicroPython/Devices/RP2040Devices.py	Fri Feb 24 18:36:43 2023 +0100
@@ -423,9 +423,9 @@
         """
         Public method to get data related to the current WiFi status.
 
-        @return tuple of two dictionaries containing the WiFi status data
-            for the WiFi client and access point
-        @rtype tuple of (dict, dict)
+        @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._deviceData["wifi_type"] == "picow":
@@ -463,6 +463,11 @@
     }
     print(ujson.dumps(ap))
 
+    overall = {
+        'active': station['active'] or ap['active']
+    }
+    print(ujson.dumps(overall))
+
 wifi_status()
 del wifi_status
 """
@@ -476,9 +481,10 @@
         if err:
             raise OSError(self._shortError(err))
 
-        stationStr, apStr = out.decode("utf-8").splitlines()
+        stationStr, apStr, overallStr = out.decode("utf-8").splitlines()
         station = json.loads(stationStr)
         ap = json.loads(apStr)
+        overall = json.loads(overallStr)
         try:
             station["status"] = self.__statusTranslations[
                 self._deviceData["wifi_type"]
@@ -491,7 +497,7 @@
             ]
         except KeyError:
             ap["status"] = str(ap["status"])
-        return station, ap
+        return station, ap, overall
 
     def connectWifi(self, ssid, password):
         """