Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Apr 24, 2022

Conversation

klutvott123
Copy link
Member

@klutvott123 klutvott123 commented Apr 23, 2022

There's missing code that causes rebooting into the wrong bootloader when pressing the button.
From the discussion in betaflight/betaflight#11334 it looks like this button should reboot into the bootloader that allows flashing firmware. For targets that have bootloader in flash, this is the one we want.
In addition to this I propose we change the behaviour of the bl command to use the default bootloader.
Edit: Logic in cli code looks like it already behaves as it should

Fixes betaflight/betaflight#11334

@sonarcloud
Copy link

sonarcloud bot commented Apr 23, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@github-actions
Copy link
Contributor

Do you want to test this code? Here you have an automated build:
Betaflight-Configurator-Android
Betaflight-Configurator-Linux
Betaflight-Configurator-macOS
Betaflight-Configurator-Windows
WARNING: It may be unstable and result in corrupted configurations or data loss. Use only for testing!

@klutvott123 klutvott123 added this to Bug Tracker in Finalizing Firmware 4.3 Release via automation Apr 23, 2022
@klutvott123 klutvott123 self-assigned this Apr 23, 2022
@klutvott123 klutvott123 added this to the 10.8.0 milestone Apr 23, 2022
@haslinghuis haslinghuis moved this from Bug Tracker to Firmware in Finalizing Firmware 4.3 Release Apr 23, 2022
@klutvott123
Copy link
Member Author

Removed the for discussion label as this is code that should have been there since the bootloader options and the flag in targetCapabilities was added in the firmware

@haslinghuis haslinghuis moved this from Firmware to Configurator in Finalizing Firmware 4.3 Release Apr 24, 2022
@blckmn
Copy link
Member

blckmn commented Apr 24, 2022

AUTOMERGE: (FAIL)

  • github identifies PR as mergeable -> FAIL
  • assigned to a milestone -> PASS
  • cooling off period lapsed -> FAIL
  • commit count less or equal to three -> PASS
  • Don't merge label NOT found -> PASS
  • at least one RN: label found -> PASS
  • Tested label found -> FAIL
  • assigned to an approver -> PASS
  • approver count at least three -> FAIL

Finalizing Firmware 4.3 Release automation moved this from Configurator to Firmware Apr 24, 2022
@haslinghuis haslinghuis merged commit be4a9e1 into betaflight:master Apr 24, 2022
Finalizing Firmware 4.3 Release automation moved this from Firmware to Finished (Merged) Apr 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

'Reboot to bootloader' boots to wrong bootloader.
4 participants