Mercurial Repositories > eric / file diff

--- a/src/eric7/MicroPython/Devices/EspDevices.py	Mon Apr 24 17:51:11 2023 +0200
+++ b/src/eric7/MicroPython/Devices/EspDevices.py	Thu Apr 27 17:59:09 2023 +0200
@@ -508,7 +508,7 @@
         Private slot to reset the connected device.
         """
         if self.microPython.isConnected() and not self.hasCircuitPython():
-            self.microPython.deviceInterface().execute(
+            self.executeCommands(
                 "import machine\nmachine.reset()\n", mode=self._submitMode
             )
         else:
@@ -688,7 +688,7 @@
 del wifi_status
 """
 
-        out, err = self._interface.execute(command, mode=self._submitMode)
+        out, err = self.executeCommands(command, mode=self._submitMode)
         if err:
             raise OSError(self._shortError(err))
 
@@ -745,7 +745,7 @@
         )
 
         with EricOverrideCursor():
-            out, err = self._interface.execute(
+            out, err = self.executeCommands(
                 command, mode=self._submitMode, timeout=15000
             )
         if err:
@@ -787,7 +787,7 @@
 del disconnect_wifi
 """
 
-        out, err = self._interface.execute(command, mode=self._submitMode)
+        out, err = self.executeCommands(command, mode=self._submitMode)
         if err:
             return False, err
 
@@ -842,7 +842,7 @@
 del modify_boot
 """
 
-        out, err = self._interface.execute(nvsCommand, mode=self._submitMode)
+        out, err = self.executeCommands(nvsCommand, mode=self._submitMode)
         if err:
             return False, self.tr("Error saving credentials: {0}").format(err)
 
@@ -857,7 +857,7 @@
         except OSError as err:
             return False, self.tr("Error saving auto-connect script: {0}").format(err)
 
-        out, err = self._interface.execute(bootCommand, mode=self._submitMode)
+        out, err = self.executeCommands(bootCommand, mode=self._submitMode)
         if err:
             return False, self.tr("Error modifying 'boot.py': {0}").format(err)
 
@@ -889,7 +889,7 @@
 del delete_wifi_creds
 """
 
-        out, err = self._interface.execute(nvsCommand, mode=self._submitMode)
+        out, err = self.executeCommands(nvsCommand, mode=self._submitMode)
         if err:
             return False, self.tr("Error deleting credentials: {0}").format(err)
 
@@ -926,7 +926,7 @@
 del check_internet
 """
 
-        out, err = self._interface.execute(command, mode=self._submitMode)
+        out, err = self.executeCommands(command, mode=self._submitMode)
         if err:
             return False, err
 
@@ -960,9 +960,7 @@
 del scan_networks
 """
 
-        out, err = self._interface.execute(
-            command, mode=self._submitMode, timeout=15000
-        )
+        out, err = self.executeCommands(command, mode=self._submitMode, timeout=15000)
         if err:
             return [], err
 
@@ -1017,7 +1015,7 @@
             interface
         )
 
-        out, err = self._interface.execute(command, mode=self._submitMode)
+        out, err = self.executeCommands(command, mode=self._submitMode)
         if err:
             return False, err
         else:
@@ -1070,9 +1068,7 @@
             repr(ssid), security, repr(password), ifconfig
         )
 
-        out, err = self._interface.execute(
-            command, mode=self._submitMode, timeout=15000
-        )
+        out, err = self.executeCommands(command, mode=self._submitMode, timeout=15000)
         if err:
             return False, err
         else:
@@ -1113,9 +1109,7 @@
 del get_stations
 """
 
-        out, err = self._interface.execute(
-            command, mode=self._submitMode, timeout=10000
-        )
+        out, err = self.executeCommands(command, mode=self._submitMode, timeout=10000)
         if err:
             return [], err
 
@@ -1152,9 +1146,7 @@
 print(has_bt())
 del has_bt
 """
-        out, err = self._interface.execute(
-            command, mode=self._submitMode, timeout=10000
-        )
+        out, err = self.executeCommands(command, mode=self._submitMode, timeout=10000)
         if err:
             raise OSError(self._shortError(err))
         return out.strip() == b"True"
@@ -1200,7 +1192,7 @@
 ble_status()
 del ble_status
 """
-        out, err = self._interface.execute(command, mode=self._submitMode)
+        out, err = self.executeCommands(command, mode=self._submitMode)
         if err:
             raise OSError(self._shortError(err))
 
@@ -1245,7 +1237,7 @@
 activate_ble()
 del activate_ble
 """
-        out, err = self._interface.execute(command, mode=self._submitMode)
+        out, err = self.executeCommands(command, mode=self._submitMode)
         if err:
             raise OSError(self._shortError(err))
 
@@ -1274,7 +1266,7 @@
 deactivate_ble()
 del deactivate_ble
 """
-        out, err = self._interface.execute(command, mode=self._submitMode)
+        out, err = self.executeCommands(command, mode=self._submitMode)
         if err:
             raise OSError(self._shortError(err))
 
@@ -1334,7 +1326,7 @@
 """.format(
             timeout
         )
-        out, err = self._interface.execute(
+        out, err = self.executeCommands(
             command, mode=self._submitMode, timeout=(timeout + 5) * 1000
         )
         if err:
@@ -1379,7 +1371,7 @@
 print(has_ntp())
 del has_ntp
 """
-        out, err = self._interface.execute(command, mode=self._submitMode)
+        out, err = self.executeCommands(command, mode=self._submitMode)
         if err:
             raise OSError(self._shortError(err))
         return out.strip() == b"True"
@@ -1439,7 +1431,7 @@
 """.format(
             repr(server), tzOffset, timeout
         )
-        out, err = self._interface.execute(
+        out, err = self.executeCommands(
             command, mode=self._submitMode, timeout=(timeout + 2) * 1000
         )
         if err: