Upload bootloader first on custom-tab as well

vedderb · Jul 24, 2024 · 85fc61f · 85fc61f
1 parent 517c845
commit 85fc61f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/pages/pagefirmware.cpp b/pages/pagefirmware.cpp
@@ -553,6 +553,14 @@ void PageFirmware::uploadFw(bool allOverCan)
                                       tr("The selected file name seems to be invalid."));
                 return;
             }
+
+            if (ui->fwCustomBlBox->isChecked() && mVesc->commands()->getLimitedSupportsEraseBootloader()) {
+                QListWidgetItem *item = ui->blList->currentItem();
+
+                if (item) {
+                    fileBl.setFileName(item->data(Qt::UserRole).toString());
+                }
+            }
         } else {
             QListWidgetItem *item = ui->blList->currentItem();
 

diff --git a/pages/pagefirmware.ui b/pages/pagefirmware.ui
@@ -41,7 +41,6 @@
                <widget class="QLabel" name="label">
                 <property name="font">
                  <font>
-                  <weight>75</weight>
                   <bold>true</bold>
                  </font>
                 </property>
@@ -64,7 +63,6 @@
                <widget class="QLabel" name="label_2">
                 <property name="font">
                  <font>
-                  <weight>75</weight>
                   <bold>true</bold>
                  </font>
                 </property>
@@ -283,6 +281,19 @@
             </property>
            </spacer>
           </item>
+          <item>
+           <widget class="QCheckBox" name="fwCustomBlBox">
+            <property name="toolTip">
+             <string>Upload bootloader before uploading firmware</string>
+            </property>
+            <property name="text">
+             <string>Upload Bootloader</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
         <widget class="QWidget" name="tab_3">
@@ -329,7 +340,6 @@
                <widget class="QLabel" name="label_3">
                 <property name="font">
                  <font>
-                  <weight>75</weight>
                   <bold>true</bold>
                  </font>
                 </property>
@@ -352,7 +362,6 @@
                <widget class="QLabel" name="label_4">
                 <property name="font">
                  <font>
-                  <weight>75</weight>
                   <bold>true</bold>
                  </font>
                 </property>