Merge pull request #2904 from klutvott123/reboot-options

Make "Activate bootloader" button use bootloader in flash if it exists

src/js/fc.js

@@ -824,6 +824,15 @@ const FC = {
         return hasVcp;
     },
 
+    boardHasFlashBootloader() {
+        let hasFlashBootloader = false;
+        if (semver.gte(this.CONFIG.apiVersion, API_VERSION_1_42)) {
+            hasFlashBootloader = bit_check(this.CONFIG.targetCapabilities, this.TARGET_CAPABILITIES_FLAGS.HAS_FLASH_BOOTLOADER);
+        }
+
+        return hasFlashBootloader;
+    },
+
     FILTER_TYPE_FLAGS: {
         PT1: 0,
         BIQUAD: 1,

src/js/msp/MSPHelper.js

@@ -40,6 +40,7 @@ function MspHelper() {
         BOOTLOADER: 1,
         MSC: 2,
         MSC_UTC: 3,
+        BOOTLOADER_FLASH: 4,
     };
 
     self.RESET_TYPES = {

src/js/tabs/setup.js

@@ -93,7 +93,7 @@ TABS.setup.initialize = function (callback) {
 
             $('a.rebootBootloader').click(function () {
                 const buffer = [];
-                buffer.push(mspHelper.REBOOT_TYPES.BOOTLOADER);
+                buffer.push(FC.boardHasFlashBootloader() ? mspHelper.REBOOT_TYPES.BOOTLOADER_FLASH : mspHelper.REBOOT_TYPES.BOOTLOADER);
                 MSP.send_message(MSPCodes.MSP_SET_REBOOT, buffer, false);
             });
         } else {