--- a/src/eric7/MicroPython/Devices/RP2040Devices.py Mon Apr 24 17:51:11 2023 +0200
+++ b/src/eric7/MicroPython/Devices/RP2040Devices.py Thu Apr 27 17:59:09 2023 +0200
@@ -239,7 +239,7 @@
Private slot to switch the board into 'bootloader' mode.
"""
if self.microPython.isConnected():
- self.microPython.deviceInterface().execute(
+ self.executeCommands(
[
"import machine",
"machine.bootloader()",
@@ -338,9 +338,10 @@
"""
Private slot to reset the connected device.
"""
- self.microPython.deviceInterface().execute(
- "import machine\nmachine.reset()\n", mode=self._submitMode
- )
+ if self.microPython.isConnected():
+ self.executeCommands(
+ "import machine\nmachine.reset()\n", mode=self._submitMode
+ )
def getDocumentationUrl(self):
"""
@@ -463,9 +464,7 @@
print(has_wifi())
del has_wifi
"""
- out, err = self._interface.execute(
- command, mode=self._submitMode, timeout=10000
- )
+ out, err = self.executeCommands(command, mode=self._submitMode, timeout=10000)
if err:
if not err.startswith(b"Timeout "):
raise OSError(self._shortError(err))
@@ -584,7 +583,7 @@
else:
return super().getWifiData()
- out, err = self._interface.execute(command, mode=self._submitMode)
+ out, err = self.executeCommands(command, mode=self._submitMode)
if err:
raise OSError(self._shortError(err))
@@ -698,7 +697,7 @@
return super().connectWifi(ssid, password)
with EricOverrideCursor():
- out, err = self._interface.execute(
+ out, err = self.executeCommands(
command, mode=self._submitMode, timeout=15000
)
if err:
@@ -756,7 +755,7 @@
else:
return super().disconnectWifi()
- out, err = self._interface.execute(command, mode=self._submitMode)
+ out, err = self.executeCommands(command, mode=self._submitMode)
if err:
return False, err
@@ -823,7 +822,7 @@
return False, str(err)
# modify boot.py
- out, err = self._interface.execute(command, mode=self._submitMode)
+ out, err = self.executeCommands(command, mode=self._submitMode)
if err:
return False, err
@@ -888,9 +887,7 @@
else:
return super().checkInternet()
- out, err = self._interface.execute(
- command, mode=self._submitMode, timeout=10000
- )
+ out, err = self.executeCommands(command, mode=self._submitMode, timeout=10000)
if err:
return False, err
@@ -953,9 +950,7 @@
else:
return super().scanNetworks()
- 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
@@ -1031,7 +1026,7 @@
else:
return super().deactivateInterface(interface)
- out, err = self._interface.execute(command, mode=self._submitMode)
+ out, err = self.executeCommands(command, mode=self._submitMode)
if err:
return False, err
else:
@@ -1122,9 +1117,7 @@
else:
return super().startAccessPoint(ssid, security=security, password=password)
- 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:
@@ -1172,9 +1165,7 @@
else:
return super().checkInternet()
- 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
@@ -1209,9 +1200,7 @@
del has_eth
"""
- 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))
@@ -1250,7 +1239,7 @@
WiznetUtilities.mpyWiznetInit()
)
- out, err = self._interface.execute(command, mode=self._submitMode)
+ out, err = self.executeCommands(command, mode=self._submitMode)
if err:
raise OSError(self._shortError(err))
@@ -1307,7 +1296,7 @@
)
with EricOverrideCursor():
- out, err = self._interface.execute(
+ out, err = self.executeCommands(
command, mode=self._submitMode, timeout=15000
)
if err:
@@ -1339,7 +1328,7 @@
)
with EricOverrideCursor():
- out, err = self._interface.execute(
+ out, err = self.executeCommands(
command, mode=self._submitMode, timeout=15000
)
if err:
@@ -1378,9 +1367,7 @@
WiznetUtilities.mpyWiznetInit(),
)
- out, err = self._interface.execute(
- command, mode=self._submitMode, timeout=10000
- )
+ out, err = self.executeCommands(command, mode=self._submitMode, timeout=10000)
if err:
return False, err
@@ -1445,7 +1432,7 @@
return False, str(err)
# modify boot.py
- out, err = self._interface.execute(command, mode=self._submitMode)
+ out, err = self.executeCommands(command, mode=self._submitMode)
if err:
return False, err
@@ -1490,7 +1477,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"
@@ -1551,7 +1538,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:
@@ -1586,7 +1573,7 @@
repr(country)
)
- out, err = self._interface.execute(command, mode=self._submitMode)
+ out, err = self.executeCommands(command, mode=self._submitMode)
if err:
self.microPython.showError("rp2.country()", err)
