Mercurial Repositories > eric / changeset

--- a/src/eric7/MicroPython/Devices/DeviceBase.py	Fri Oct 06 15:52:33 2023 +0200
+++ b/src/eric7/MicroPython/Devices/DeviceBase.py	Fri Oct 06 17:57:36 2023 +0200
@@ -159,7 +159,6 @@
                         self._deviceData["ethernet"],
                         self._deviceData["ethernet_type"],
                     ) = self.hasEthernet()
-                    self._deviceData["ntp"] = self.hasNetworkTime()
                 else:
                     self._deviceData = {}
         else:

--- a/src/eric7/MicroPython/EthernetDialogs/EthernetController.py	Fri Oct 06 15:52:33 2023 +0200
+++ b/src/eric7/MicroPython/EthernetDialogs/EthernetController.py	Fri Oct 06 17:57:36 2023 +0200
@@ -317,7 +317,7 @@
         from ..NtpParametersDialog import NtpParametersDialog
 
         device = self.__mpy.getDevice()
-        if not device.getDeviceData("ntp"):
+        if not device.hasNetworkTime():
             if device.hasCircuitPython():
                 if device.getDeviceData("ethernet"):
                     moduleName = "adafruit_wiznet5k"

--- a/src/eric7/MicroPython/MicroPythonSerialDeviceInterface.py	Fri Oct 06 15:52:33 2023 +0200
+++ b/src/eric7/MicroPython/MicroPythonSerialDeviceInterface.py	Fri Oct 06 17:57:36 2023 +0200
@@ -394,7 +394,7 @@
             out, err = b"", b"Timeout while processing commands."
         else:
             # get rid of any OSD string and send it
-            if result.startswith(b"\x1b]0;"):
+            while result.startswith(b"\x1b]0;"):
                 osd, result = result.split(b"\x1b\\", 1)
                 self.osdInfo.emit(osd[4:].decode("utf-8"))
 

--- a/src/eric7/MicroPython/MicroPythonWebreplDeviceInterface.py	Fri Oct 06 15:52:33 2023 +0200
+++ b/src/eric7/MicroPython/MicroPythonWebreplDeviceInterface.py	Fri Oct 06 17:57:36 2023 +0200
@@ -225,7 +225,7 @@
             out, err = b"", b"Timeout while processing commands."
         else:
             # get rid of any OSD string and send it
-            if result.startswith(b"\x1b]0;"):
+            while result.startswith(b"\x1b]0;"):
                 osd, result = result.split(b"\x1b\\", 1)
                 self.osdInfo.emit(osd[4:].decode("utf-8"))
 

--- a/src/eric7/MicroPython/MicroPythonWidget.py	Fri Oct 06 15:52:33 2023 +0200
+++ b/src/eric7/MicroPython/MicroPythonWidget.py	Fri Oct 06 17:57:36 2023 +0200
@@ -1211,13 +1211,13 @@
                             "wifi",
                             "bluetooth",
                             "ethernet",
-                            "ntp",
                             "mip",
                             "upip",
                             "local_mip",
                         ]
                     )
                 )
+                boardInfo["ntp"] = self.__device.hasNetworkTime()
 
             dlg = BoardDataDialog(boardInfo)
             dlg.exec()

--- a/src/eric7/MicroPython/WifiDialogs/WifiController.py	Fri Oct 06 15:52:33 2023 +0200
+++ b/src/eric7/MicroPython/WifiDialogs/WifiController.py	Fri Oct 06 17:57:36 2023 +0200
@@ -412,7 +412,7 @@
         from ..NtpParametersDialog import NtpParametersDialog
 
         device = self.__mpy.getDevice()
-        if not device.getDeviceData("ntp"):
+        if not device.hasNetworkTime():
             if device.hasCircuitPython():
                 EricMessageBox.warning(
                     None,