Mercurial Repositories > eric / file diff

--- a/eric7/MicroPython/EspDevices.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/MicroPython/EspDevices.py	Sat May 22 18:51:46 2021 +0200
@@ -13,9 +13,9 @@
 from PyQt6.QtCore import pyqtSlot, QProcess
 from PyQt6.QtWidgets import QDialog
 
-from E5Gui import E5MessageBox
-from E5Gui.E5ProcessDialog import E5ProcessDialog
-from E5Gui.E5Application import e5App
+from E5Gui import EricMessageBox
+from E5Gui.EricProcessDialog import EricProcessDialog
+from E5Gui.EricApplication import ericApp
 
 from .MicroPythonDevices import MicroPythonDevice
 from .MicroPythonWidget import HAS_QTCHART
@@ -172,7 +172,7 @@
         """
         Private slot to erase the device flash memory.
         """
-        ok = E5MessageBox.yesNo(
+        ok = EricMessageBox.yesNo(
             self.microPython,
             self.tr("Erase Flash"),
             self.tr("""Shall the flash of the selected device really be"""
@@ -184,7 +184,7 @@
                 "--port", self.microPython.getCurrentPort(),
                 "erase_flash",
             ]
-            dlg = E5ProcessDialog(self.tr("'esptool erase_flash' Output"),
+            dlg = EricProcessDialog(self.tr("'esptool erase_flash' Output"),
                                   self.tr("Erase Flash"),
                                   showProgress=True)
             res = dlg.startProcess(sys.executable, flashArgs)
@@ -230,7 +230,7 @@
                 flashAddress,
                 firmware,
             ]
-            dlg = E5ProcessDialog(self.tr("'esptool write_flash' Output"),
+            dlg = EricProcessDialog(self.tr("'esptool write_flash' Output"),
                                   self.tr("Flash MicroPython Firmware"),
                                   showProgress=True)
             res = dlg.startProcess(sys.executable, flashArgs)
@@ -265,7 +265,7 @@
                 flashAddress.lower(),
                 firmware,
             ]
-            dlg = E5ProcessDialog(self.tr("'esptool write_flash' Output"),
+            dlg = EricProcessDialog(self.tr("'esptool write_flash' Output"),
                                   self.tr("Flash Additional Firmware"),
                                   showProgress=True)
             res = dlg.startProcess(sys.executable, flashArgs)
@@ -292,7 +292,7 @@
                 "0x0", flashSize,
                 firmware,
             ]
-            dlg = E5ProcessDialog(self.tr("'esptool read_flash' Output"),
+            dlg = EricProcessDialog(self.tr("'esptool read_flash' Output"),
                                   self.tr("Backup Firmware"),
                                   showProgress=True)
             res = dlg.startProcess(sys.executable, flashArgs)
@@ -326,7 +326,7 @@
                 "0x0",
                 firmware,
             ])
-            dlg = E5ProcessDialog(self.tr("'esptool write_flash' Output"),
+            dlg = EricProcessDialog(self.tr("'esptool write_flash' Output"),
                                   self.tr("Restore Firmware"),
                                   showProgress=True)
             res = dlg.startProcess(sys.executable, flashArgs)
@@ -344,7 +344,7 @@
             "--port", self.microPython.getCurrentPort(),
             "chip_id"
         ]
-        dlg = E5ProcessDialog(self.tr("'esptool chip_id' Output"),
+        dlg = EricProcessDialog(self.tr("'esptool chip_id' Output"),
                               self.tr("Show Chip ID"))
         res = dlg.startProcess(sys.executable, args)
         if res:
@@ -361,7 +361,7 @@
             "--port", self.microPython.getCurrentPort(),
             "flash_id"
         ]
-        dlg = E5ProcessDialog(self.tr("'esptool flash_id' Output"),
+        dlg = EricProcessDialog(self.tr("'esptool flash_id' Output"),
                               self.tr("Show Flash ID"))
         res = dlg.startProcess(sys.executable, args)
         if res:
@@ -378,7 +378,7 @@
             "--port", self.microPython.getCurrentPort(),
             "read_mac"
         ]
-        dlg = E5ProcessDialog(self.tr("'esptool read_mac' Output"),
+        dlg = EricProcessDialog(self.tr("'esptool read_mac' Output"),
                               self.tr("Show MAC Address"))
         res = dlg.startProcess(sys.executable, args)
         if res:
@@ -414,7 +414,7 @@
         """
         Private slot to install the esptool package via pip.
         """
-        pip = e5App().getObject("Pip")
+        pip = ericApp().getObject("Pip")
         pip.installPackages(["esptool"], interpreter=sys.executable)
     
     def getDocumentationUrl(self):