--- a/src/eric7/MicroPython/EspFirmwareSelectionDialog.ui Thu Feb 09 09:55:57 2023 +0100 +++ b/src/eric7/MicroPython/EspFirmwareSelectionDialog.ui Sat Feb 11 16:59:50 2023 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>500</width> - <height>198</height> + <height>228</height> </rect> </property> <property name="windowTitle"> @@ -19,13 +19,77 @@ <layout class="QVBoxLayout" name="verticalLayout"> <item> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label"> + <item row="3" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Baud Rate:</string> + </property> + </widget> + </item> + <item row="4" column="2"> + <widget class="QLabel" name="label_4"> <property name="text"> - <string>ESP Chip Type:</string> + <string>Leave empty to use the default mode.</string> + </property> + </widget> + </item> + <item row="5" column="0"> + <widget class="QLabel" name="addressLabel"> + <property name="text"> + <string>Address:</string> + </property> + </widget> + </item> + <item row="5" column="1" colspan="2"> + <widget class="QLineEdit" name="addressEdit"> + <property name="toolTip"> + <string>Enter the flash addres in the hexadecimal form</string> + </property> + <property name="maxLength"> + <number>7</number> + </property> + <property name="clearButtonEnabled"> + <bool>true</bool> </property> </widget> </item> + <item row="4" column="1"> + <widget class="QComboBox" name="modeComboBox"> + <property name="toolTip"> + <string>Select the flash mode</string> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_3"> + <property name="toolTip"> + <string/> + </property> + <property name="text"> + <string>Flash Mode:</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Firmware:</string> + </property> + </widget> + </item> + <item row="3" column="2"> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>298</width> + <height>20</height> + </size> + </property> + </spacer> + </item> <item row="0" column="1"> <widget class="QComboBox" name="espComboBox"> <property name="toolTip"> @@ -36,23 +100,10 @@ </property> </widget> </item> - <item row="0" column="2"> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>318</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Firmware:</string> + <item row="3" column="1"> + <widget class="QComboBox" name="baudRateComboBox"> + <property name="toolTip"> + <string>Select the baud rate to be used for flashing (default: 115.200 bps)</string> </property> </widget> </item> @@ -72,74 +123,33 @@ </property> </widget> </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_5"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> <property name="text"> - <string>Baud Rate:</string> + <string>ESP Chip Type:</string> </property> </widget> </item> - <item row="2" column="1"> - <widget class="QComboBox" name="baudRateComboBox"> - <property name="toolTip"> - <string>Select the baud rate to be used for flashing (default: 115.200 bps)</string> - </property> - </widget> - </item> - <item row="2" column="2"> - <spacer name="horizontalSpacer_2"> + <item row="0" column="2"> + <spacer name="horizontalSpacer"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>298</width> + <width>318</width> <height>20</height> </size> </property> </spacer> </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_3"> + <item row="2" column="0" colspan="3"> + <widget class="QCheckBox" name="cpyCheckBox"> <property name="toolTip"> - <string/> + <string>Check this, if the firware to be loaded is CircuitPython (changes the flash address for some chips).</string> </property> <property name="text"> - <string>Flash Mode:</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QComboBox" name="modeComboBox"> - <property name="toolTip"> - <string>Select the flash mode</string> - </property> - </widget> - </item> - <item row="3" column="2"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>Leave empty to use the default mode.</string> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="addressLabel"> - <property name="text"> - <string>Address:</string> - </property> - </widget> - </item> - <item row="4" column="1" colspan="2"> - <widget class="QLineEdit" name="addressEdit"> - <property name="toolTip"> - <string>Enter the flash addres in the hexadecimal form</string> - </property> - <property name="maxLength"> - <number>7</number> - </property> - <property name="clearButtonEnabled"> - <bool>true</bool> + <string>Firmware is CircuitPython</string> </property> </widget> </item> @@ -168,6 +178,7 @@ <tabstops> <tabstop>espComboBox</tabstop> <tabstop>firmwarePicker</tabstop> + <tabstop>cpyCheckBox</tabstop> <tabstop>baudRateComboBox</tabstop> <tabstop>modeComboBox</tabstop> <tabstop>addressEdit</tabstop>