diff -r dd54d33d21d2 -r 51aa6c6b66f7 eric6/MicroPython/EspDevices.py
--- a/eric6/MicroPython/EspDevices.py Mon Oct 05 19:51:55 2020 +0200
+++ b/eric6/MicroPython/EspDevices.py Tue Oct 06 17:52:44 2020 +0200
@@ -179,7 +179,7 @@
showProgress=True)
res = dlg.startProcess(sys.executable, flashArgs)
if res:
- dlg.exec_()
+ dlg.exec()
@pyqtSlot()
def __flashMicroPython(self):
@@ -190,7 +190,7 @@
"""
from .EspFirmwareSelectionDialog import EspFirmwareSelectionDialog
dlg = EspFirmwareSelectionDialog()
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
chip, firmware, flashMode, _ = dlg.getData()
if chip == "esp8266":
flashAddress = "0x0000"
@@ -219,7 +219,7 @@
showProgress=True)
res = dlg.startProcess(sys.executable, flashArgs)
if res:
- dlg.exec_()
+ dlg.exec()
@pyqtSlot()
def __flashAddons(self):
@@ -228,7 +228,7 @@
"""
from .EspFirmwareSelectionDialog import EspFirmwareSelectionDialog
dlg = EspFirmwareSelectionDialog(addon=True)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
chip, firmware, flashMode, flashAddress = dlg.getData()
flashArgs = [
"-u",
@@ -250,7 +250,7 @@
showProgress=True)
res = dlg.startProcess(sys.executable, flashArgs)
if res:
- dlg.exec_()
+ dlg.exec()
@pyqtSlot()
def __backupFlash(self):
@@ -261,7 +261,7 @@
EspBackupRestoreFirmwareDialog
)
dlg = EspBackupRestoreFirmwareDialog(backupMode=True)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
chip, flashSize, flashMode, firmware = dlg.getData()
flashArgs = [
"-u",
@@ -277,7 +277,7 @@
showProgress=True)
res = dlg.startProcess(sys.executable, flashArgs)
if res:
- dlg.exec_()
+ dlg.exec()
@pyqtSlot()
def __restoreFlash(self):
@@ -288,7 +288,7 @@
EspBackupRestoreFirmwareDialog
)
dlg = EspBackupRestoreFirmwareDialog(backupMode=False)
- if dlg.exec_() == QDialog.Accepted:
+ if dlg.exec() == QDialog.Accepted:
chip, flashSize, flashMode, firmware = dlg.getData()
flashArgs = [
"-u",
@@ -311,7 +311,7 @@
showProgress=True)
res = dlg.startProcess(sys.executable, flashArgs)
if res:
- dlg.exec_()
+ dlg.exec()
@pyqtSlot()
def __showChipID(self):
@@ -328,7 +328,7 @@
self.tr("Show Chip ID"))
res = dlg.startProcess(sys.executable, args)
if res:
- dlg.exec_()
+ dlg.exec()
@pyqtSlot()
def __showFlashID(self):
@@ -345,7 +345,7 @@
self.tr("Show Flash ID"))
res = dlg.startProcess(sys.executable, args)
if res:
- dlg.exec_()
+ dlg.exec()
@pyqtSlot()
def __showMACAddress(self):
@@ -362,7 +362,7 @@
self.tr("Show MAC Address"))
res = dlg.startProcess(sys.executable, args)
if res:
- dlg.exec_()
+ dlg.exec()
@pyqtSlot()
def __resetDevice(self):
