diff options
| author | haslinghuis <mark@numloq.nl> | 2022-04-24 05:09:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-24 05:09:23 +0300 |
| commit | be4a9e1ba08b664fca6651aaac05935091bd725e (patch) | |
| tree | 9b163ce526c2cf4503ba833f9f71a81d69e2305c | |
| parent | 58014b21ecdca31d9e9e97a38c3caddd4ed38479 (diff) | |
| parent | 145d567ff9e67238c58279b435f6fa738f56476e (diff) | |
Merge pull request #2904 from klutvott123/reboot-options10.8.0-RC6
Make "Activate bootloader" button use bootloader in flash if it exists
| -rw-r--r-- | src/js/fc.js | 9 | ||||
| -rw-r--r-- | src/js/msp/MSPHelper.js | 1 | ||||
| -rw-r--r-- | src/js/tabs/setup.js | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/js/fc.js b/src/js/fc.js index 2c35af32..0319d377 100644 --- a/src/js/fc.js +++ b/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, diff --git a/src/js/msp/MSPHelper.js b/src/js/msp/MSPHelper.js index 86d40997..89c3686c 100644 --- a/src/js/msp/MSPHelper.js +++ b/src/js/msp/MSPHelper.js @@ -40,6 +40,7 @@ function MspHelper() { BOOTLOADER: 1, MSC: 2, MSC_UTC: 3, + BOOTLOADER_FLASH: 4, }; self.RESET_TYPES = { diff --git a/src/js/tabs/setup.js b/src/js/tabs/setup.js index ba694f34..ab29a516 100644 --- a/src/js/tabs/setup.js +++ b/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 { |