Mercurial Repositories > eric / file comparison
comparison: src/eric7/MicroPython/Devices/EspDevices.py
src/eric7/MicroPython/Devices/EspDevices.py
- branch
- eric7
- changeset 11263
- 28f0ead11a82
- parent 11236
- 75c26fe1d1c7
- child 11270
- 0e220c26e60e
equal
deleted
inserted
replaced
| 11262:07d9cc8d773c | 11263:28f0ead11a82 |
|---|---|
| 745 wifi = network.WLAN(network.STA_IF) | 745 wifi = network.WLAN(network.STA_IF) |
| 746 station = { | 746 station = { |
| 747 'active': wifi.active(), | 747 'active': wifi.active(), |
| 748 'connected': wifi.isconnected(), | 748 'connected': wifi.isconnected(), |
| 749 'status': wifi.status(), | 749 'status': wifi.status(), |
| 750 'ifconfig': wifi.ifconfig(), | |
| 751 'mac': ubinascii.hexlify(wifi.config('mac'), ':').decode(), | 750 'mac': ubinascii.hexlify(wifi.config('mac'), ':').decode(), |
| 751 'channel': wifi.config('channel'), | |
| 752 'essid': wifi.config('essid'), | |
| 752 } | 753 } |
| 754 try: | |
| 755 station['ifconfig'] = ( | |
| 756 wifi.ipconfig('addr4') + (wifi.ipconfig('gw4'), network.ipconfig('dns')) | |
| 757 ) | |
| 758 except AttributeError: | |
| 759 station['ifconfig'] = wifi.ifconfig() | |
| 760 try: | |
| 761 station['ipv6_addr'] = [a[0] for a in wifi.ipconfig('addr6')] | |
| 762 except ValueError: | |
| 763 station['ipv6_addr'] = [] | |
| 753 if wifi.active(): | 764 if wifi.active(): |
| 754 try: | 765 try: |
| 755 station['txpower'] = wifi.config('txpower') | 766 station['txpower'] = wifi.config('txpower') |
| 756 except ValueError: | 767 except ValueError: |
| 757 pass | 768 pass |
| 760 wifi = network.WLAN(network.AP_IF) | 771 wifi = network.WLAN(network.AP_IF) |
| 761 ap = { | 772 ap = { |
| 762 'active': wifi.active(), | 773 'active': wifi.active(), |
| 763 'connected': wifi.isconnected(), | 774 'connected': wifi.isconnected(), |
| 764 'status': wifi.status(), | 775 'status': wifi.status(), |
| 765 'ifconfig': wifi.ifconfig(), | |
| 766 'mac': ubinascii.hexlify(wifi.config('mac'), ':').decode(), | 776 'mac': ubinascii.hexlify(wifi.config('mac'), ':').decode(), |
| 767 'channel': wifi.config('channel'), | 777 'channel': wifi.config('channel'), |
| 768 'essid': wifi.config('essid'), | 778 'essid': wifi.config('essid'), |
| 769 'ap_security': security_str(wifi.config('security')), | 779 'ap_security': security_str(wifi.config('security')), |
| 770 } | 780 } |
| 781 try: | |
| 782 ap['ifconfig'] = ( | |
| 783 wifi.ipconfig('addr4') + (wifi.ipconfig('gw4'), network.ipconfig('dns')) | |
| 784 ) | |
| 785 except AttributeError: | |
| 786 ap['ifconfig'] = wifi.ifconfig() | |
| 787 try: | |
| 788 ap['ipv6_addr'] = [a[0] for a in wifi.ipconfig('addr6')] | |
| 789 except ValueError: | |
| 790 ap['ipv6_addr'] = [] | |
| 771 if wifi.active(): | 791 if wifi.active(): |
| 772 try: | 792 try: |
| 773 ap['txpower'] = wifi.config('txpower') | 793 ap['txpower'] = wifi.config('txpower') |
| 774 except ValueError: | 794 except ValueError: |
| 775 pass | 795 pass |
| 784 pass | 804 pass |
| 785 try: | 805 try: |
| 786 overall['country'] = network.country() | 806 overall['country'] = network.country() |
| 787 except AttributeError: | 807 except AttributeError: |
| 788 pass | 808 pass |
| 809 try: | |
| 810 overall['prefer'] = network.ipconfig('prefer') | |
| 811 except ValueError: | |
| 812 overall['prefer'] = 4 | |
| 789 print(ujson.dumps(overall)) | 813 print(ujson.dumps(overall)) |
| 790 | 814 |
| 791 wifi_status() | 815 wifi_status() |
| 792 del wifi_status | 816 del wifi_status |
| 793 """ | 817 """ |
