Mercurial Repositories > eric / file comparison
comparison: src/eric7/MicroPython/Devices/EspDevices.py
src/eric7/MicroPython/Devices/EspDevices.py
- branch
- mpy_network
- changeset 9827
- 21803aa6c3e2
- parent 9820
- 67597e003373
- child 9828
- 32c8a5b57332
equal
deleted
inserted
replaced
| 9826:9340ce7fb12f | 9827:21803aa6c3e2 |
|---|---|
| 634 | 634 |
| 635 wifi_status() | 635 wifi_status() |
| 636 del wifi_status | 636 del wifi_status |
| 637 """ | 637 """ |
| 638 | 638 |
| 639 out, err = self._interface.execute(command, mode=self.submitMode) | 639 out, err = self._interface.execute(command, mode=self._submitMode) |
| 640 if err: | 640 if err: |
| 641 raise OSError(self._shortError(err)) | 641 raise OSError(self._shortError(err)) |
| 642 | 642 |
| 643 stationStr, apStr, overallStr = out.decode("utf-8").splitlines() | 643 stationStr, apStr, overallStr = out.decode("utf-8").splitlines() |
| 644 station = json.loads(stationStr) | 644 station = json.loads(stationStr) |
| 689 repr(password if password else ""), | 689 repr(password if password else ""), |
| 690 ) | 690 ) |
| 691 | 691 |
| 692 with EricOverrideCursor(): | 692 with EricOverrideCursor(): |
| 693 out, err = self._interface.execute( | 693 out, err = self._interface.execute( |
| 694 command, mode=self.submitMode, timeout=15000 | 694 command, mode=self._submitMode, timeout=15000 |
| 695 ) | 695 ) |
| 696 if err: | 696 if err: |
| 697 return False, err | 697 return False, err |
| 698 | 698 |
| 699 result = json.loads(out.decode("utf-8").strip()) | 699 result = json.loads(out.decode("utf-8").strip()) |
| 727 | 727 |
| 728 disconnect_wifi() | 728 disconnect_wifi() |
| 729 del disconnect_wifi | 729 del disconnect_wifi |
| 730 """ | 730 """ |
| 731 | 731 |
| 732 out, err = self._interface.execute(command, mode=self.submitMode) | 732 out, err = self._interface.execute(command, mode=self._submitMode) |
| 733 if err: | 733 if err: |
| 734 return False, err | 734 return False, err |
| 735 | 735 |
| 736 return out.decode("utf-8").strip() == "True", "" | 736 return out.decode("utf-8").strip() == "True", "" |
| 737 | 737 |
| 779 | 779 |
| 780 modify_boot() | 780 modify_boot() |
| 781 del modify_boot | 781 del modify_boot |
| 782 """ | 782 """ |
| 783 | 783 |
| 784 out, err = self._interface.execute(nvsCommand, mode=self.submitMode) | 784 out, err = self._interface.execute(nvsCommand, mode=self._submitMode) |
| 785 if err: | 785 if err: |
| 786 return False, self.tr("Error saving credentials: {0}").format(err) | 786 return False, self.tr("Error saving credentials: {0}").format(err) |
| 787 | 787 |
| 788 try: | 788 try: |
| 789 # copy auto-connect file | 789 # copy auto-connect file |
| 794 "/wifi_connect.py", | 794 "/wifi_connect.py", |
| 795 ) | 795 ) |
| 796 except OSError as err: | 796 except OSError as err: |
| 797 return False, self.tr("Error saving auto-connect script: {0}").format(err) | 797 return False, self.tr("Error saving auto-connect script: {0}").format(err) |
| 798 | 798 |
| 799 out, err = self._interface.execute(bootCommand, mode=self.submitMode) | 799 out, err = self._interface.execute(bootCommand, mode=self._submitMode) |
| 800 if err: | 800 if err: |
| 801 return False, self.tr("Error modifying 'boot.py': {0}").format(err) | 801 return False, self.tr("Error modifying 'boot.py': {0}").format(err) |
| 802 | 802 |
| 803 return True, "" | 803 return True, "" |
| 804 | 804 |
| 823 | 823 |
| 824 delete_wifi_creds() | 824 delete_wifi_creds() |
| 825 del delete_wifi_creds | 825 del delete_wifi_creds |
| 826 """ | 826 """ |
| 827 | 827 |
| 828 out, err = self._interface.execute(nvsCommand, mode=self.submitMode) | 828 out, err = self._interface.execute(nvsCommand, mode=self._submitMode) |
| 829 if err: | 829 if err: |
| 830 return False, self.tr("Error deleting credentials: {0}").format(err) | 830 return False, self.tr("Error deleting credentials: {0}").format(err) |
| 831 | 831 |
| 832 return True, "" | 832 return True, "" |
| 833 | 833 |
| 857 | 857 |
| 858 check_internet() | 858 check_internet() |
| 859 del check_internet | 859 del check_internet |
| 860 """ | 860 """ |
| 861 | 861 |
| 862 out, err = self._interface.execute(command, mode=self.submitMode) | 862 out, err = self._interface.execute(command, mode=self._submitMode) |
| 863 if err: | 863 if err: |
| 864 return False, err | 864 return False, err |
| 865 | 865 |
| 866 return out.decode("utf-8").strip() == "True", "" | 866 return out.decode("utf-8").strip() == "True", "" |
| 867 | 867 |
| 888 | 888 |
| 889 scan_networks() | 889 scan_networks() |
| 890 del scan_networks | 890 del scan_networks |
| 891 """ | 891 """ |
| 892 | 892 |
| 893 out, err = self._interface.execute(command, mode=self.submitMode, timeout=15000) | 893 out, err = self._interface.execute(command, mode=self._submitMode, timeout=15000) |
| 894 if err: | 894 if err: |
| 895 return [], err | 895 return [], err |
| 896 | 896 |
| 897 networksList = ast.literal_eval(out.decode("utf-8")) | 897 networksList = ast.literal_eval(out.decode("utf-8")) |
| 898 networks = [] | 898 networks = [] |
| 940 del deactivate | 940 del deactivate |
| 941 """.format( | 941 """.format( |
| 942 interface | 942 interface |
| 943 ) | 943 ) |
| 944 | 944 |
| 945 out, err = self._interface.execute(command, mode=self.submitMode) | 945 out, err = self._interface.execute(command, mode=self._submitMode) |
| 946 if err: | 946 if err: |
| 947 return False, err | 947 return False, err |
| 948 else: | 948 else: |
| 949 return out.decode("utf-8").strip() == "True", "" | 949 return out.decode("utf-8").strip() == "True", "" |
| 950 | 950 |
| 988 del start_ap | 988 del start_ap |
| 989 """.format( | 989 """.format( |
| 990 repr(ssid), security, repr(password), ifconfig | 990 repr(ssid), security, repr(password), ifconfig |
| 991 ) | 991 ) |
| 992 | 992 |
| 993 out, err = self._interface.execute(command, mode=self.submitMode, timeout=15000) | 993 out, err = self._interface.execute(command, mode=self._submitMode, timeout=15000) |
| 994 if err: | 994 if err: |
| 995 return False, err | 995 return False, err |
| 996 else: | 996 else: |
| 997 return True, "" | 997 return True, "" |
| 998 | 998 |
| 1023 | 1023 |
| 1024 get_stations() | 1024 get_stations() |
| 1025 del get_stations | 1025 del get_stations |
| 1026 """ | 1026 """ |
| 1027 | 1027 |
| 1028 out, err = self._interface.execute(command, mode=self.submitMode, timeout=10000) | 1028 out, err = self._interface.execute(command, mode=self._submitMode, timeout=10000) |
| 1029 if err: | 1029 if err: |
| 1030 return [], err | 1030 return [], err |
| 1031 | 1031 |
| 1032 clientsList = ast.literal_eval(out.decode("utf-8")) | 1032 clientsList = ast.literal_eval(out.decode("utf-8")) |
| 1033 return clientsList, "" | 1033 return clientsList, "" |
