Tue, 30 Mar 2021 19:59:24 +0200
MicroPython: fixed a few bugs introduced by the flash speed enhancement for ESP devices.
# -*- coding: utf-8 -*- # Copyright (c) 2019 - 2021 Detlev Offenbach <detlev@die-offenbachs.de> # """ Module implementing a dialog to select the ESP chip type and the firmware to be flashed. """ import os from PyQt5.QtCore import pyqtSlot, QRegularExpression from PyQt5.QtGui import QRegularExpressionValidator from PyQt5.QtWidgets import QDialog, QDialogButtonBox from E5Gui.E5PathPicker import E5PathPickerModes from .Ui_EspFirmwareSelectionDialog import Ui_EspFirmwareSelectionDialog class EspFirmwareSelectionDialog(QDialog, Ui_EspFirmwareSelectionDialog): """ Class implementing a dialog to select the ESP chip type and the firmware to be flashed. """ FlashModes = ( ("", ""), ("Quad I/O", "qio"), ("Quad Output", "qout"), ("Dual I/O", "dio"), ("Dual Output", "dout"), ) def __init__(self, addon=False, parent=None): """ Constructor @param addon flag indicating an addon firmware @type bool @param parent reference to the parent widget @type QWidget """ super(EspFirmwareSelectionDialog, self).__init__(parent) self.setupUi(self) self.__addon = addon self.firmwarePicker.setMode(E5PathPickerModes.OpenFileMode) self.firmwarePicker.setFilters( self.tr("Firmware Files (*.bin);;All Files (*)")) self.espComboBox.addItems(["", "ESP32", "ESP8266"]) self.baudRateComboBox.addItems([ "74.880", "115.200", "230.400", "460.800", "921.600", "1.500.000"]) self.baudRateComboBox.setCurrentIndex(1) for text, mode in self.FlashModes: self.modeComboBox.addItem(text, mode) if addon: self.__validator = QRegularExpressionValidator( QRegularExpression(r"[0-9a-fA-F]{0,4}") ) self.addressEdit.setValidator(self.__validator) else: self.addressLabel.hide() self.addressEdit.hide() msh = self.minimumSizeHint() self.resize(max(self.width(), msh.width()), msh.height()) def __updateOkButton(self): """ Private method to update the state of the OK button. """ firmwareFile = self.firmwarePicker.text() enable = (bool(self.espComboBox.currentText()) and bool(firmwareFile) and os.path.exists(firmwareFile)) if self.__addon: enable &= bool(self.addressEdit.text()) self.buttonBox.button( QDialogButtonBox.StandardButton.Ok).setEnabled(enable) @pyqtSlot(str) def on_espComboBox_currentTextChanged(self, chip): """ Private slot to handle the selection of a chip type. @param chip selected chip type @type str """ self.__updateOkButton() @pyqtSlot(str) def on_firmwarePicker_textChanged(self, firmware): """ Private slot handling a change of the firmware path. @param firmware path to the firmware @type str """ self.__updateOkButton() def getData(self): """ Public method to get the entered data. @return tuple containing the selected chip type, the path of the firmware file, the baud rate, the flash mode and the flash address @rtype tuple of (str, str, str, str, str) """ if self.__addon: address = self.addressEdit.text() else: address = "" return ( self.espComboBox.currentText().lower(), self.firmwarePicker.text(), self.baudRateComboBox.currentText().replace(".", ""), self.modeComboBox.currentData(), address, )