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

Add support for using MSP build options #3780

Merged
merged 2 commits into from
Apr 19, 2024
Merged

Add support for using MSP build options #3780

merged 2 commits into from
Apr 19, 2024

Conversation

haslinghuis
Copy link
Member

@haslinghuis haslinghuis commented Feb 1, 2024 •
edited
Loading

  • Details and depends on: Extend build info with defined flags betaflight#13333
  • Reduces cloud build API requests
  • Works for local builds and offline
  • Firmware flasher keeps using cloud build API request for easy transition
  • This only affects next firmware. So nothing to test here.

@haslinghuis haslinghuis self-assigned this Feb 1, 2024
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@haslinghuis haslinghuis force-pushed the use-msp-for-build-options branch from 2631404 to 8ef3197 Compare February 1, 2024 00:29
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@haslinghuis haslinghuis force-pushed the use-msp-for-build-options branch from 8ef3197 to 1dc5004 Compare February 1, 2024 01:33
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@haslinghuis haslinghuis marked this pull request as draft February 1, 2024 16:05
@haslinghuis haslinghuis force-pushed the use-msp-for-build-options branch from 1dc5004 to 22088f5 Compare February 1, 2024 18:32
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@haslinghuis haslinghuis marked this pull request as ready for review February 1, 2024 18:43
@haslinghuis haslinghuis mentioned this pull request Feb 1, 2024
Merged
@haslinghuis haslinghuis force-pushed the use-msp-for-build-options branch from 22088f5 to 426cccd Compare February 1, 2024 19:33
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@haslinghuis haslinghuis force-pushed the use-msp-for-build-options branch from 426cccd to aeb0fa9 Compare February 1, 2024 19:41
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@haslinghuis haslinghuis force-pushed the use-msp-for-build-options branch from aeb0fa9 to 8b30e30 Compare February 1, 2024 19:56
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@haslinghuis haslinghuis force-pushed the use-msp-for-build-options branch 2 times, most recently from 892e86d to f23bab8 Compare February 1, 2024 20:17
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@haslinghuis haslinghuis force-pushed the use-msp-for-build-options branch 3 times, most recently from e1c1103 to f1e96d1 Compare February 1, 2024 21:14
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@haslinghuis haslinghuis force-pushed the use-msp-for-build-options branch from f1e96d1 to 7208eef Compare February 1, 2024 22:41
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@haslinghuis haslinghuis requested a review from blckmn February 1, 2024 23:39
@blckmn
Copy link
Member

blckmn commented Feb 4, 2024

@blckmn has to decide inclusion in current or next release.

Next release. We have to start focusing on bug fixes only during RC phases.

@haslinghuis haslinghuis modified the milestones: 10.10.0, 11.0 Feb 4, 2024
@HThuren
Copy link
Member

HThuren commented Feb 4, 2024

... and we change betaflight/betaflight#13333 to API 1.47

@nerdCopter
Copy link
Member

test result of 180d141b

# version
# Betaflight / STM32F405 (S405) 4.5.0 Apr 18 2024 / 13:15:29 (71776a852) MSP API: 1.46
# config rev: 7556c8e
# board: manufacturer_id: FOXE, board_name: FOXEERF405

2024-04-18 @15:35:22 -- Board: FOXE/FOXEERF405(STM32F405), version: 0
2024-04-18 @15:35:22 -- Build Key: 5c236ba9739999abaf794d4215fda4a5

image
image
image

off subject:
image

nerdCopter
nerdCopter approved these changes Apr 18, 2024
View reviewed changes
Copy link
Member

@nerdCopter nerdCopter left a comment

Choose a reason for hiding this comment

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

  • i'll approve now in effort to get it started. request that others test.
  • maybe needs "deep testing"

@haslinghuis haslinghuis force-pushed the use-msp-for-build-options branch from 180d141 to c6d2aaa Compare April 18, 2024 22:48
@netlify Netlify
Copy link

netlify bot commented Apr 18, 2024 •
edited
Loading

✅ Deploy Preview for origin-betaflight-app ready!

Name Link
🔨 Latest commit 44f42c3
🔍 Latest deploy log https://app.netlify.com/sites/origin-betaflight-app/deploys/6621a7dbd71d250008d15dda
😎 Deploy Preview https://deploy-preview-3780--origin-betaflight-app.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@haslinghuis haslinghuis force-pushed the use-msp-for-build-options branch from ff71f13 to 44f42c3 Compare April 18, 2024 23:08
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@github-actions 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!

@nerdCopter
Copy link
Member

44f42c3e -- retested with local build, no key:

make FOXEERF405 EXTRA_FLAGS="-D'RELEASE_NAME=4.5.0-dev' -DCLOUD_BUILD -DUSE_CAMERA_CONTROL -DUSE_DSHOT -DUSE_EMFAT_AUTORUN -DUSE_EMFAT_ICON -DUSE_EMFAT_TOOLS -DUSE_GPS -DUSE_GPS_PLUS_CODES -DUSE_LED_STRIP -DUSE_OSD -DUSE_OSD_SD -DUSE_PINIO -DUSE_SERIALRX -DUSE_SERIALRX_CRSF -DUSE_TELEMETRY -DUSE_TELEMETRY_CRSF -DUSE_VTX"

did not produce auto-detect results i expected (no MSP?):
image

but did produce this as Discord comments alluded:
image

@haslinghuis
Copy link
Member Author

Currently MSP build options is supported for 4.6 firmware. See second commit.
Firmware part was merged for 4.5.
Should we change it to 4.5 here too?

@nerdCopter
Copy link
Member

nerdCopter commented Apr 19, 2024 •
edited
Loading

[...] Should we change it to 4.5 here too?

I would vote yes, but maybe ask @blckmn .

@haslinghuis
Copy link
Member Author

Done a lot of testing on 4.5 in a new commit (not pushed)

  • configurator works faster without cloud queries.
  • one thing is missing from firmware: telemetry defines.

This PR (tested using 4.5)
image

Master:

image

@HThuren
Copy link
Member

HThuren commented Apr 19, 2024

we have lot of logic for defines in src/main/target/common_pre.h , maybe a help

@ledvinap
Copy link
Contributor

I can imagine passing requested features as list (single define) and then using a bit of boost-pp magic to derive actual defines used. I will help some of current build system problems (define both from build system and config) and will be easier to refactor in future.

Ping me if there is interest

@haslinghuis
Copy link
Member Author

haslinghuis commented Apr 19, 2024 •
edited
Loading

See earlier comment here: betaflight/betaflight#13333 (comment)

@atomgomba @blckmn We just need to add missing defines to cloud API and run the auto-generated code script again.

EDIT: Added them now in follow up PR for CRSF, GHST and FPORT.

@haslinghuis haslinghuis merged commit 939b88d into betaflight:master Apr 19, 2024
12 checks passed
@haslinghuis haslinghuis deleted the use-msp-for-build-options branch April 19, 2024 19:43
@haslinghuis haslinghuis mentioned this pull request Apr 19, 2024
Merged
@haslinghuis haslinghuis modified the milestones: 11.0, 10.10.0 Apr 19, 2024
chmelevskij pushed a commit to chmelevskij/betaflight-configurator that referenced this pull request Apr 27, 2024
@haslinghuis @chmelevskij
Add support for using MSP build options (betaflight#3780)
765d21b 
* Add buildOptions from MSP

* Fixup semver
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@HThuren HThuren HThuren approved these changes

@nerdCopter nerdCopter nerdCopter approved these changes

@blckmn blckmn blckmn approved these changes

Assignees

@haslinghuis haslinghuis

Labels
RN: IMPROVEMENT
Projects
Finalizing Firmware 4.5 Release
Status: COMPLETED
Milestone
10.10.0
Development

Successfully merging this pull request may close these issues.
5 participants
@haslinghuis @nerdCopter @HThuren @blckmn @ledvinap