Mercurial Repositories > eric / changeset

--- a/src/eric7/MicroPython/Devices/DeviceBase.py	Tue Feb 28 10:12:46 2023 +0100
+++ b/src/eric7/MicroPython/Devices/DeviceBase.py	Tue Feb 28 10:14:12 2023 +0100
@@ -95,7 +95,7 @@
         self.microPython = microPythonWidget
         self._deviceData = {}  # dictionary with essential device data
 
-        self.submitMode = "raw"  # default is 'raw' mode to submit commands
+        self._submitMode = "raw"  # default is 'raw' mode to submit commands
 
     def setConnected(self, connected):
         """
@@ -179,6 +179,15 @@
             and self._deviceData["mpy_name"].lower() == "circuitpython"
         )
 
+    def submitMode(self):
+        """
+        Public method to get the submit mode of the device.
+
+        @return submit mode
+        @rtype str (one of 'raw', 'paste')
+        """
+        return self._submitMode
+
     def setButtons(self):
         """
         Public method to enable the supported action buttons.
@@ -335,7 +344,7 @@
         @param commandsList list of commands to be sent to the device
         @type list of str
         """
-        if self.submitMode == "raw":
+        if self._submitMode == "raw":
             rawOn = [  # sequence of commands to enter raw mode
                 b"\x02",  # Ctrl-B: exit raw repl (just in case)
                 b"\r\x03\x03\x03",  # Ctrl-C three times: interrupt any running program
@@ -350,7 +359,7 @@
             rawOff = [b"\x02", b"\x02"]
             commandSequence = rawOn + newLine + commands + rawOff
             self._interface.executeAsync(commandSequence)
-        elif self.submitMode == "paste":
+        elif self._submitMode == "paste":
             commands = b"\n".join([c.encode("utf-8)") for c in commandsList])
             commandSequence = ["@PasteOn@", commands]
             self._interface.executeAsyncPaste(commandSequence)
@@ -486,7 +495,7 @@
 """.format(
             dirname
         )
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             raise OSError(self._shortError(err))
         return ast.literal_eval(out.decode("utf-8"))
@@ -538,7 +547,7 @@
 """.format(
             dirname, showHidden
         )
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             raise OSError(self._shortError(err))
         fileslist = ast.literal_eval(out.decode("utf-8"))
@@ -566,7 +575,7 @@
 """.format(
                 dirname
             )
-            out, err = self._interface.execute(command, mode=self.submitMode)
+            out, err = self._interface.execute(command, mode=self._submitMode)
             if err:
                 raise OSError(self._shortError(err))
 
@@ -583,7 +592,7 @@
 print(__os_.getcwd())
 del __os_
 """
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             raise OSError(self._shortError(err))
         return out.decode("utf-8").strip()
@@ -608,7 +617,7 @@
 """.format(
                 filename
             )
-            out, err = self._interface.execute(command, mode=self.submitMode)
+            out, err = self._interface.execute(command, mode=self._submitMode)
             if err:
                 raise OSError(self._shortError(err))
 
@@ -655,7 +664,7 @@
 """.format(
                 name, recursive, force
             )
-            out, err = self._interface.execute(command, mode=self.submitMode)
+            out, err = self._interface.execute(command, mode=self._submitMode)
             if err:
                 raise OSError(self._shortError(err))
             return ast.literal_eval(out.decode("utf-8"))
@@ -678,7 +687,7 @@
 """.format(
                 dirname
             )
-            out, err = self._interface.execute(command, mode=self.submitMode)
+            out, err = self._interface.execute(command, mode=self._submitMode)
             if err:
                 raise OSError(self._shortError(err))
 
@@ -705,7 +714,7 @@
 """.format(
                 dirname
             )
-            out, err = self._interface.execute(command, mode=self.submitMode)
+            out, err = self._interface.execute(command, mode=self._submitMode)
             if err:
                 raise OSError(self._shortError(err))
 
@@ -767,7 +776,7 @@
         )
         command = "\n".join(commands)
 
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             raise OSError(self._shortError(err))
         return True
@@ -836,7 +845,7 @@
 """.format(
             deviceFileName
         )
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             raise OSError(self._shortError(err))
 
@@ -875,7 +884,7 @@
 print(fsinfo())
 del __os_, fsinfo
 """
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             raise OSError(self._shortError(err))
         infolist = ast.literal_eval(out.decode("utf-8"))
@@ -948,7 +957,7 @@
 print(res)
 del res, uname, __os_, __sys_
 """
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             raise OSError(self._shortError(err))
         return ast.literal_eval(out.decode("utf-8"))
@@ -1057,7 +1066,7 @@
 print(res)
 del res, __os_, __sys_, uname
 """
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             raise OSError(self._shortError(err))
         return ast.literal_eval(out.decode("utf-8"))
@@ -1071,7 +1080,7 @@
         @exception OSError raised to indicate an issue with the device
         """
         commands = ["help('modules')"]
-        out, err = self._interface.execute(commands, mode=self.submitMode)
+        out, err = self._interface.execute(commands, mode=self._submitMode)
         if err:
             raise OSError(self._shortError(err))
 
@@ -1113,7 +1122,7 @@
         del tm
     del __time_
 """
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             if b"NotImplementedError" in err:
                 return "<unsupported> <unsupported>"
@@ -1185,7 +1194,7 @@
                     now.tm_isdst,
                 ),
             )
-            out, err = self._interface.execute(command, mode=self.submitMode)
+            out, err = self._interface.execute(command, mode=self._submitMode)
             if err:
                 raise OSError(self._shortError(err))
 

--- a/src/eric7/MicroPython/Devices/EspDevices.py	Tue Feb 28 10:12:46 2023 +0100
+++ b/src/eric7/MicroPython/Devices/EspDevices.py	Tue Feb 28 10:14:12 2023 +0100
@@ -636,7 +636,7 @@
 del wifi_status
 """
 
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             raise OSError(self._shortError(err))
 
@@ -691,7 +691,7 @@
 
         with EricOverrideCursor():
             out, err = self._interface.execute(
-                command, mode=self.submitMode, timeout=15000
+                command, mode=self._submitMode, timeout=15000
             )
         if err:
             return False, err
@@ -729,7 +729,7 @@
 del disconnect_wifi
 """
 
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             return False, err
 
@@ -781,7 +781,7 @@
 del modify_boot
 """
 
-        out, err = self._interface.execute(nvsCommand, mode=self.submitMode)
+        out, err = self._interface.execute(nvsCommand, mode=self._submitMode)
         if err:
             return False, self.tr("Error saving credentials: {0}").format(err)
 
@@ -796,7 +796,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._interface.execute(bootCommand, mode=self._submitMode)
         if err:
             return False, self.tr("Error modifying 'boot.py': {0}").format(err)
 
@@ -825,7 +825,7 @@
 del delete_wifi_creds
 """
 
-        out, err = self._interface.execute(nvsCommand, mode=self.submitMode)
+        out, err = self._interface.execute(nvsCommand, mode=self._submitMode)
         if err:
             return False, self.tr("Error deleting credentials: {0}").format(err)
 
@@ -859,7 +859,7 @@
 del check_internet
 """
 
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             return False, err
 
@@ -890,7 +890,7 @@
 del scan_networks
 """
 
-        out, err = self._interface.execute(command, mode=self.submitMode, timeout=15000)
+        out, err = self._interface.execute(command, mode=self._submitMode, timeout=15000)
         if err:
             return [], err
 
@@ -942,7 +942,7 @@
             interface
         )
 
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             return False, err
         else:
@@ -990,7 +990,7 @@
             repr(ssid), security, repr(password), ifconfig
         )
 
-        out, err = self._interface.execute(command, mode=self.submitMode, timeout=15000)
+        out, err = self._interface.execute(command, mode=self._submitMode, timeout=15000)
         if err:
             return False, err
         else:
@@ -1025,7 +1025,7 @@
 del get_stations
 """
 
-        out, err = self._interface.execute(command, mode=self.submitMode, timeout=10000)
+        out, err = self._interface.execute(command, mode=self._submitMode, timeout=10000)
         if err:
             return [], err
 

--- a/src/eric7/MicroPython/Devices/MicrobitDevices.py	Tue Feb 28 10:12:46 2023 +0100
+++ b/src/eric7/MicroPython/Devices/MicrobitDevices.py	Tue Feb 28 10:14:12 2023 +0100
@@ -67,7 +67,7 @@
         super().setConnected(connected)
 
         if self.hasCircuitPython():
-            self.submitMode = "paste"
+            self._submitMode = "paste"
 
     def setButtons(self):
         """
@@ -617,7 +617,7 @@
 print(__os_.listdir())
 del __os_
 """
-            out, err = self._interface.execute(command, mode=self.submitMode)
+            out, err = self._interface.execute(command, mode=self._submitMode)
             if err:
                 raise OSError(self._shortError(err))
             return ast.literal_eval(out.decode("utf-8"))
@@ -665,7 +665,7 @@
 """.format(
                 showHidden
             )
-            out, err = self._interface.execute(command, mode=self.submitMode)
+            out, err = self._interface.execute(command, mode=self._submitMode)
             if err:
                 raise OSError(self._shortError(err))
             fileslist = ast.literal_eval(out.decode("utf-8"))

--- a/src/eric7/MicroPython/Devices/RP2040Devices.py	Tue Feb 28 10:12:46 2023 +0100
+++ b/src/eric7/MicroPython/Devices/RP2040Devices.py	Tue Feb 28 10:14:12 2023 +0100
@@ -416,7 +416,7 @@
 print(has_wifi())
 del has_wifi
 """
-        out, err = self._interface.execute(command, mode=self.submitMode, timeout=10000)
+        out, err = self._interface.execute(command, mode=self._submitMode, timeout=10000)
         if err:
             raise OSError(self._shortError(err))
         return ast.literal_eval(out.decode("utf-8"))
@@ -479,7 +479,7 @@
         else:
             return super().getWifiData()
 
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             raise OSError(self._shortError(err))
 
@@ -551,7 +551,7 @@
 
         with EricOverrideCursor():
             out, err = self._interface.execute(
-                command, mode=self.submitMode, timeout=15000
+                command, mode=self._submitMode, timeout=15000
             )
         if err:
             return False, err
@@ -597,7 +597,7 @@
         else:
             return super().disconnectWifi()
 
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             return False, err
 
@@ -661,7 +661,7 @@
             return False, str(err)
 
         # modify boot.py
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             return False, err
 
@@ -715,7 +715,7 @@
         else:
             return super().checkInternet()
 
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             return False, err
 
@@ -759,7 +759,7 @@
         else:
             return super().scanNetworks()
 
-        out, err = self._interface.execute(command, mode=self.submitMode, timeout=15000)
+        out, err = self._interface.execute(command, mode=self._submitMode, timeout=15000)
         if err:
             return [], err
 
@@ -817,7 +817,7 @@
         else:
             return super().deactivateInterface(interface)
 
-        out, err = self._interface.execute(command, mode=self.submitMode)
+        out, err = self._interface.execute(command, mode=self._submitMode)
         if err:
             return False, err
         else:
@@ -878,7 +878,7 @@
         else:
             return super().startAccessPoint(ssid, security=security, password=password)
 
-        out, err = self._interface.execute(command, mode=self.submitMode, timeout=15000)
+        out, err = self._interface.execute(command, mode=self._submitMode, timeout=15000)
         if err:
             return False, err
         else:
@@ -925,7 +925,7 @@
         else:
             return super().checkInternet()
 
-        out, err = self._interface.execute(command, mode=self.submitMode, timeout=10000)
+        out, err = self._interface.execute(command, mode=self._submitMode, timeout=10000)
         if err:
             return [], err
 
@@ -958,7 +958,7 @@
                 repr(country)
             )
 
-            out, err = self._interface.execute(command, mode=self.submitMode)
+            out, err = self._interface.execute(command, mode=self._submitMode)
             if err:
                 self.microPython.showError("rp2.country()", err)