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.

Sign up for GitHub

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

Jump to bottom

refactor: bootloader & cmake cleanup #5232

Merged
merged 7 commits into from
Jul 7, 2024
Merged

refactor: bootloader & cmake cleanup #5232

merged 7 commits into from
Jul 7, 2024

Conversation

raphaelcoeffic
Copy link
Member

@raphaelcoeffic raphaelcoeffic commented Jun 30, 2024 •
edited by pfeerick
Loading

Merge after #5233

@richardclli
Copy link
Collaborator

richardclli commented Jun 30, 2024 •
edited
Loading

_ No description provided. _

@raphaelcoeffic See if you can rebase this after my nb4+ PR, I have refactorized Flysky based bootloader in that PR, not sure what you will break.

@raphaelcoeffic raphaelcoeffic force-pushed the bootloader-cleanup branch 2 times, most recently from 90341c5 to 046ced3 Compare June 30, 2024 11:26
@raphaelcoeffic
Copy link
Member Author

See if you can rebase this after my nb4+ PR

Is this #5095 ? I don't see much conflicts there, it should go smooth.

@raphaelcoeffic raphaelcoeffic force-pushed the bootloader-cleanup branch 4 times, most recently from 06601eb to 53b1e25 Compare July 1, 2024 09:36
@pfeerick pfeerick added needs: rebase A git rebase on top of the latest destination branch version is required compilation Related to compiling the firmware and firmware options house keeping 🧹 Cleanup of code and house keeping labels Jul 5, 2024
@pfeerick pfeerick added this to the 2.11 milestone Jul 5, 2024
@raphaelcoeffic raphaelcoeffic force-pushed the bootloader-cleanup branch 2 times, most recently from f561118 to 621ffda Compare July 6, 2024 06:02
@raphaelcoeffic raphaelcoeffic removed the needs: rebase A git rebase on top of the latest destination branch version is required label Jul 6, 2024
@raphaelcoeffic raphaelcoeffic marked this pull request as ready for review July 6, 2024 06:19
pfeerick
pfeerick requested changes Jul 7, 2024
View reviewed changes
Copy link
Member

@pfeerick pfeerick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks nice, but can I have the bootloader back please? I wasn't expecting optimisations to remove the ability to actually enter/use the bootloader 🤪

TX16S actually tries, but just halts on a grey screen.
T20, PL18EV just ignore bootloader request and boot normally
EL18 started, but I can't test bootloader due to failed trim hats

pfeerick
pfeerick reviewed Jul 7, 2024
View reviewed changes
Copy link
Member

@pfeerick pfeerick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TX16S, T20, X9D+2019, TX12, EL18 (the one with non-broken trims 🤭 ) all good now.

NV14 won't boot, but doesn't with main, so unrelated.

PL18EV still skips the bootloader.

pfeerick
pfeerick approved these changes Jul 7, 2024
View reviewed changes
Copy link
Member

@pfeerick pfeerick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PL18EV bootloader trims (and trims generally, thanks for spotting that! 🤦) now working...

@pfeerick pfeerick merged commit d575242 into main Jul 7, 2024
46 checks passed
@pfeerick pfeerick deleted the bootloader-cleanup branch July 7, 2024 11:07
@richardclli richardclli mentioned this pull request Jul 10, 2024
Merged
3djc pushed a commit that referenced this pull request Jul 10, 2024
chore: ws2812 support to comply with #5232 style
a8ae3b3
pfeerick pushed a commit that referenced this pull request Jul 13, 2024
@3djc
chore: ws2812 support to comply with #5232 style (#5276)
fad6f44
@3djc 3djc mentioned this pull request Jul 23, 2024
Merged
@philmoz philmoz mentioned this pull request Aug 1, 2024
Closed
1 task
@philmoz philmoz mentioned this pull request Sep 4, 2024
Closed
1 task
@3djc 3djc mentioned this pull request Sep 5, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pfeerick pfeerick pfeerick approved these changes

Assignees
No one assigned
Labels
compilation Related to compiling the firmware and firmware options house keeping 🧹 Cleanup of code and house keeping
Projects
None yet
Milestone
2.11
Development

Successfully merging this pull request may close these issues.
3 participants
@raphaelcoeffic @richardclli @pfeerick