Mercurial Repositories > eric / file diff

--- a/eric7/MicroPython/EspDevices.py	Tue Feb 08 16:22:59 2022 +0100
+++ b/eric7/MicroPython/EspDevices.py	Sat Feb 12 13:02:35 2022 +0100
@@ -271,12 +271,13 @@
         )
         dlg = EspBackupRestoreFirmwareDialog(backupMode=True)
         if dlg.exec() == QDialog.DialogCode.Accepted:
-            chip, flashSize, flashMode, firmware = dlg.getData()
+            chip, flashSize, baudRate, flashMode, firmware = dlg.getData()
             flashArgs = [
                 "-u",
                 "-m", "esptool",
                 "--chip", chip,
                 "--port", self.microPython.getCurrentPort(),
+                "--baud", baudRate,
                 "read_flash",
                 "0x0", flashSize,
                 firmware,
@@ -298,15 +299,19 @@
         )
         dlg = EspBackupRestoreFirmwareDialog(backupMode=False)
         if dlg.exec() == QDialog.DialogCode.Accepted:
-            chip, flashSize, flashMode, firmware = dlg.getData()
+            chip, flashSize, baudRate, flashMode, firmware = dlg.getData()
             flashArgs = [
                 "-u",
                 "-m", "esptool",
                 "--chip", chip,
                 "--port", self.microPython.getCurrentPort(),
+                "--baud", baudRate,
                 "write_flash",
-                "--flash_mode", flashMode,
             ]
+            if flashMode:
+                flashArgs.extend([
+                    "--flash_mode", flashMode,
+                ])
             if bool(flashSize):
                 flashArgs.extend([
                     "--flash_size", flashSize,