Mercurial Repositories > eric / file diff

--- a/src/eric7/MicroPython/Devices/EspDevices.py	Mon May 05 10:17:49 2025 +0200
+++ b/src/eric7/MicroPython/Devices/EspDevices.py	Mon May 05 17:40:08 2025 +0200
@@ -747,9 +747,20 @@
         'active': wifi.active(),
         'connected': wifi.isconnected(),
         'status': wifi.status(),
-        'ifconfig': wifi.ifconfig(),
         'mac': ubinascii.hexlify(wifi.config('mac'), ':').decode(),
+        'channel': wifi.config('channel'),
+        'essid': wifi.config('essid'),
     }
+    try:
+        station['ifconfig'] = (
+            wifi.ipconfig('addr4') + (wifi.ipconfig('gw4'), network.ipconfig('dns'))
+        )
+    except AttributeError:
+        station['ifconfig'] = wifi.ifconfig()
+    try:
+        station['ipv6_addr'] = [a[0] for a in wifi.ipconfig('addr6')]
+    except ValueError:
+        station['ipv6_addr'] = []
     if wifi.active():
         try:
             station['txpower'] = wifi.config('txpower')
@@ -762,12 +773,21 @@
         'active': wifi.active(),
         'connected': wifi.isconnected(),
         'status': wifi.status(),
-        'ifconfig': wifi.ifconfig(),
         'mac': ubinascii.hexlify(wifi.config('mac'), ':').decode(),
         'channel': wifi.config('channel'),
         'essid': wifi.config('essid'),
         'ap_security': security_str(wifi.config('security')),
     }
+    try:
+        ap['ifconfig'] = (
+            wifi.ipconfig('addr4') + (wifi.ipconfig('gw4'), network.ipconfig('dns'))
+        )
+    except AttributeError:
+        ap['ifconfig'] = wifi.ifconfig()
+    try:
+        ap['ipv6_addr'] = [a[0] for a in wifi.ipconfig('addr6')]
+    except ValueError:
+        ap['ipv6_addr'] = []
     if wifi.active():
         try:
             ap['txpower'] = wifi.config('txpower')
@@ -786,6 +806,10 @@
         overall['country'] = network.country()
     except AttributeError:
         pass
+    try:
+        overall['prefer'] = network.ipconfig('prefer')
+    except ValueError:
+        overall['prefer'] = 4
     print(ujson.dumps(overall))
 
 wifi_status()