Mercurial Repositories > eric / file comparison
comparison: src/eric7/MicroPython/Devices/EspDevices.py
src/eric7/MicroPython/Devices/EspDevices.py
- branch
- mpy_network
- changeset 9989
- 286c2a21f36f
- parent 9870
- 0399d3607829
- child 10019
- e56089d00750
equal
deleted
inserted
replaced
| 9988:1ba9d07ba9da | 9989:286c2a21f36f |
|---|---|
| 506 def __resetDevice(self): | 506 def __resetDevice(self): |
| 507 """ | 507 """ |
| 508 Private slot to reset the connected device. | 508 Private slot to reset the connected device. |
| 509 """ | 509 """ |
| 510 if self.microPython.isConnected() and not self.hasCircuitPython(): | 510 if self.microPython.isConnected() and not self.hasCircuitPython(): |
| 511 self.microPython.deviceInterface().execute( | 511 self.executeCommands( |
| 512 "import machine\nmachine.reset()\n", mode=self._submitMode | 512 "import machine\nmachine.reset()\n", mode=self._submitMode |
| 513 ) | 513 ) |
| 514 else: | 514 else: |
| 515 # perform a reset via esptool using flash_id command ignoring | 515 # perform a reset via esptool using flash_id command ignoring |
| 516 # the output | 516 # the output |
| 686 | 686 |
| 687 wifi_status() | 687 wifi_status() |
| 688 del wifi_status | 688 del wifi_status |
| 689 """ | 689 """ |
| 690 | 690 |
| 691 out, err = self._interface.execute(command, mode=self._submitMode) | 691 out, err = self.executeCommands(command, mode=self._submitMode) |
| 692 if err: | 692 if err: |
| 693 raise OSError(self._shortError(err)) | 693 raise OSError(self._shortError(err)) |
| 694 | 694 |
| 695 stationStr, apStr, overallStr = out.decode("utf-8").splitlines() | 695 stationStr, apStr, overallStr = out.decode("utf-8").splitlines() |
| 696 station = json.loads(stationStr) | 696 station = json.loads(stationStr) |
| 743 repr(ssid), | 743 repr(ssid), |
| 744 repr(password if password else ""), | 744 repr(password if password else ""), |
| 745 ) | 745 ) |
| 746 | 746 |
| 747 with EricOverrideCursor(): | 747 with EricOverrideCursor(): |
| 748 out, err = self._interface.execute( | 748 out, err = self.executeCommands( |
| 749 command, mode=self._submitMode, timeout=15000 | 749 command, mode=self._submitMode, timeout=15000 |
| 750 ) | 750 ) |
| 751 if err: | 751 if err: |
| 752 return False, err | 752 return False, err |
| 753 | 753 |
| 785 | 785 |
| 786 disconnect_wifi() | 786 disconnect_wifi() |
| 787 del disconnect_wifi | 787 del disconnect_wifi |
| 788 """ | 788 """ |
| 789 | 789 |
| 790 out, err = self._interface.execute(command, mode=self._submitMode) | 790 out, err = self.executeCommands(command, mode=self._submitMode) |
| 791 if err: | 791 if err: |
| 792 return False, err | 792 return False, err |
| 793 | 793 |
| 794 return out.decode("utf-8").strip() == "True", "" | 794 return out.decode("utf-8").strip() == "True", "" |
| 795 | 795 |
| 840 | 840 |
| 841 modify_boot() | 841 modify_boot() |
| 842 del modify_boot | 842 del modify_boot |
| 843 """ | 843 """ |
| 844 | 844 |
| 845 out, err = self._interface.execute(nvsCommand, mode=self._submitMode) | 845 out, err = self.executeCommands(nvsCommand, mode=self._submitMode) |
| 846 if err: | 846 if err: |
| 847 return False, self.tr("Error saving credentials: {0}").format(err) | 847 return False, self.tr("Error saving credentials: {0}").format(err) |
| 848 | 848 |
| 849 try: | 849 try: |
| 850 # copy auto-connect file | 850 # copy auto-connect file |
| 855 "/wifi_connect.py", | 855 "/wifi_connect.py", |
| 856 ) | 856 ) |
| 857 except OSError as err: | 857 except OSError as err: |
| 858 return False, self.tr("Error saving auto-connect script: {0}").format(err) | 858 return False, self.tr("Error saving auto-connect script: {0}").format(err) |
| 859 | 859 |
| 860 out, err = self._interface.execute(bootCommand, mode=self._submitMode) | 860 out, err = self.executeCommands(bootCommand, mode=self._submitMode) |
| 861 if err: | 861 if err: |
| 862 return False, self.tr("Error modifying 'boot.py': {0}").format(err) | 862 return False, self.tr("Error modifying 'boot.py': {0}").format(err) |
| 863 | 863 |
| 864 return True, "" | 864 return True, "" |
| 865 | 865 |
| 887 | 887 |
| 888 delete_wifi_creds() | 888 delete_wifi_creds() |
| 889 del delete_wifi_creds | 889 del delete_wifi_creds |
| 890 """ | 890 """ |
| 891 | 891 |
| 892 out, err = self._interface.execute(nvsCommand, mode=self._submitMode) | 892 out, err = self.executeCommands(nvsCommand, mode=self._submitMode) |
| 893 if err: | 893 if err: |
| 894 return False, self.tr("Error deleting credentials: {0}").format(err) | 894 return False, self.tr("Error deleting credentials: {0}").format(err) |
| 895 | 895 |
| 896 return True, "" | 896 return True, "" |
| 897 | 897 |
| 924 | 924 |
| 925 check_internet() | 925 check_internet() |
| 926 del check_internet | 926 del check_internet |
| 927 """ | 927 """ |
| 928 | 928 |
| 929 out, err = self._interface.execute(command, mode=self._submitMode) | 929 out, err = self.executeCommands(command, mode=self._submitMode) |
| 930 if err: | 930 if err: |
| 931 return False, err | 931 return False, err |
| 932 | 932 |
| 933 return out.decode("utf-8").strip() == "True", "" | 933 return out.decode("utf-8").strip() == "True", "" |
| 934 | 934 |
| 958 | 958 |
| 959 scan_networks() | 959 scan_networks() |
| 960 del scan_networks | 960 del scan_networks |
| 961 """ | 961 """ |
| 962 | 962 |
| 963 out, err = self._interface.execute( | 963 out, err = self.executeCommands(command, mode=self._submitMode, timeout=15000) |
| 964 command, mode=self._submitMode, timeout=15000 | |
| 965 ) | |
| 966 if err: | 964 if err: |
| 967 return [], err | 965 return [], err |
| 968 | 966 |
| 969 networksList = ast.literal_eval(out.decode("utf-8")) | 967 networksList = ast.literal_eval(out.decode("utf-8")) |
| 970 networks = [] | 968 networks = [] |
| 1015 del deactivate | 1013 del deactivate |
| 1016 """.format( | 1014 """.format( |
| 1017 interface | 1015 interface |
| 1018 ) | 1016 ) |
| 1019 | 1017 |
| 1020 out, err = self._interface.execute(command, mode=self._submitMode) | 1018 out, err = self.executeCommands(command, mode=self._submitMode) |
| 1021 if err: | 1019 if err: |
| 1022 return False, err | 1020 return False, err |
| 1023 else: | 1021 else: |
| 1024 return out.decode("utf-8").strip() == "True", "" | 1022 return out.decode("utf-8").strip() == "True", "" |
| 1025 | 1023 |
| 1068 del start_ap | 1066 del start_ap |
| 1069 """.format( | 1067 """.format( |
| 1070 repr(ssid), security, repr(password), ifconfig | 1068 repr(ssid), security, repr(password), ifconfig |
| 1071 ) | 1069 ) |
| 1072 | 1070 |
| 1073 out, err = self._interface.execute( | 1071 out, err = self.executeCommands(command, mode=self._submitMode, timeout=15000) |
| 1074 command, mode=self._submitMode, timeout=15000 | |
| 1075 ) | |
| 1076 if err: | 1072 if err: |
| 1077 return False, err | 1073 return False, err |
| 1078 else: | 1074 else: |
| 1079 return True, "" | 1075 return True, "" |
| 1080 | 1076 |
| 1111 | 1107 |
| 1112 get_stations() | 1108 get_stations() |
| 1113 del get_stations | 1109 del get_stations |
| 1114 """ | 1110 """ |
| 1115 | 1111 |
| 1116 out, err = self._interface.execute( | 1112 out, err = self.executeCommands(command, mode=self._submitMode, timeout=10000) |
| 1117 command, mode=self._submitMode, timeout=10000 | |
| 1118 ) | |
| 1119 if err: | 1113 if err: |
| 1120 return [], err | 1114 return [], err |
| 1121 | 1115 |
| 1122 clientsList = ast.literal_eval(out.decode("utf-8")) | 1116 clientsList = ast.literal_eval(out.decode("utf-8")) |
| 1123 return clientsList, "" | 1117 return clientsList, "" |
| 1150 return False | 1144 return False |
| 1151 | 1145 |
| 1152 print(has_bt()) | 1146 print(has_bt()) |
| 1153 del has_bt | 1147 del has_bt |
| 1154 """ | 1148 """ |
| 1155 out, err = self._interface.execute( | 1149 out, err = self.executeCommands(command, mode=self._submitMode, timeout=10000) |
| 1156 command, mode=self._submitMode, timeout=10000 | |
| 1157 ) | |
| 1158 if err: | 1150 if err: |
| 1159 raise OSError(self._shortError(err)) | 1151 raise OSError(self._shortError(err)) |
| 1160 return out.strip() == b"True" | 1152 return out.strip() == b"True" |
| 1161 | 1153 |
| 1162 def getBluetoothStatus(self): | 1154 def getBluetoothStatus(self): |
| 1198 print(ujson.dumps(res)) | 1190 print(ujson.dumps(res)) |
| 1199 | 1191 |
| 1200 ble_status() | 1192 ble_status() |
| 1201 del ble_status | 1193 del ble_status |
| 1202 """ | 1194 """ |
| 1203 out, err = self._interface.execute(command, mode=self._submitMode) | 1195 out, err = self.executeCommands(command, mode=self._submitMode) |
| 1204 if err: | 1196 if err: |
| 1205 raise OSError(self._shortError(err)) | 1197 raise OSError(self._shortError(err)) |
| 1206 | 1198 |
| 1207 status = [] | 1199 status = [] |
| 1208 bleStatus = json.loads(out.decode("utf-8")) | 1200 bleStatus = json.loads(out.decode("utf-8")) |
| 1243 print(ble.active()) | 1235 print(ble.active()) |
| 1244 | 1236 |
| 1245 activate_ble() | 1237 activate_ble() |
| 1246 del activate_ble | 1238 del activate_ble |
| 1247 """ | 1239 """ |
| 1248 out, err = self._interface.execute(command, mode=self._submitMode) | 1240 out, err = self.executeCommands(command, mode=self._submitMode) |
| 1249 if err: | 1241 if err: |
| 1250 raise OSError(self._shortError(err)) | 1242 raise OSError(self._shortError(err)) |
| 1251 | 1243 |
| 1252 return out.strip() == b"True" | 1244 return out.strip() == b"True" |
| 1253 | 1245 |
| 1272 print(ble.active()) | 1264 print(ble.active()) |
| 1273 | 1265 |
| 1274 deactivate_ble() | 1266 deactivate_ble() |
| 1275 del deactivate_ble | 1267 del deactivate_ble |
| 1276 """ | 1268 """ |
| 1277 out, err = self._interface.execute(command, mode=self._submitMode) | 1269 out, err = self.executeCommands(command, mode=self._submitMode) |
| 1278 if err: | 1270 if err: |
| 1279 raise OSError(self._shortError(err)) | 1271 raise OSError(self._shortError(err)) |
| 1280 | 1272 |
| 1281 return out.strip() == b"True" | 1273 return out.strip() == b"True" |
| 1282 | 1274 |
| 1332 ble_scan() | 1324 ble_scan() |
| 1333 del ble_scan | 1325 del ble_scan |
| 1334 """.format( | 1326 """.format( |
| 1335 timeout | 1327 timeout |
| 1336 ) | 1328 ) |
| 1337 out, err = self._interface.execute( | 1329 out, err = self.executeCommands( |
| 1338 command, mode=self._submitMode, timeout=(timeout + 5) * 1000 | 1330 command, mode=self._submitMode, timeout=(timeout + 5) * 1000 |
| 1339 ) | 1331 ) |
| 1340 if err: | 1332 if err: |
| 1341 return {}, err | 1333 return {}, err |
| 1342 | 1334 |
| 1377 return False | 1369 return False |
| 1378 | 1370 |
| 1379 print(has_ntp()) | 1371 print(has_ntp()) |
| 1380 del has_ntp | 1372 del has_ntp |
| 1381 """ | 1373 """ |
| 1382 out, err = self._interface.execute(command, mode=self._submitMode) | 1374 out, err = self.executeCommands(command, mode=self._submitMode) |
| 1383 if err: | 1375 if err: |
| 1384 raise OSError(self._shortError(err)) | 1376 raise OSError(self._shortError(err)) |
| 1385 return out.strip() == b"True" | 1377 return out.strip() == b"True" |
| 1386 | 1378 |
| 1387 def setNetworkTime(self, server="0.pool.ntp.org", tzOffset=0, timeout=10): | 1379 def setNetworkTime(self, server="0.pool.ntp.org", tzOffset=0, timeout=10): |
| 1437 }}) | 1429 }}) |
| 1438 del set_ntp_time | 1430 del set_ntp_time |
| 1439 """.format( | 1431 """.format( |
| 1440 repr(server), tzOffset, timeout | 1432 repr(server), tzOffset, timeout |
| 1441 ) | 1433 ) |
| 1442 out, err = self._interface.execute( | 1434 out, err = self.executeCommands( |
| 1443 command, mode=self._submitMode, timeout=(timeout + 2) * 1000 | 1435 command, mode=self._submitMode, timeout=(timeout + 2) * 1000 |
| 1444 ) | 1436 ) |
| 1445 if err: | 1437 if err: |
| 1446 return False, err | 1438 return False, err |
| 1447 else: | 1439 else: |
