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

FIX: update & clean configuration #12451

Merged
merged 5 commits into from Mar 6, 2023
Merged

FIX: update & clean configuration #12451

merged 5 commits into from Mar 6, 2023

Conversation

haslinghuis
Copy link
Member

@haslinghuis haslinghuis commented Mar 4, 2023 •
edited

Fixes: MATEKF722HD

  • gyro's not working
  • no uarts in ports tab

MATEKF722HD tested by @bw1129

  • fixes naming of some variables (MATEKH743 and SPRACINGH7RF)
  • updates latest configuration changes from unified targets repo.
  • Add configuration for RX_SPI_PROTOCOL and DEFAULT_RX_FEATURE (EXPRESSLRS)

Needs #12453

@haslinghuis haslinghuis added this to the 4.5 milestone Mar 4, 2023
@haslinghuis haslinghuis self-assigned this Mar 4, 2023
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@blckmn
Copy link
Member

blckmn commented Mar 4, 2023 •
edited

AUTOMERGE: (FAIL)

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

@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@haslinghuis haslinghuis changed the title Fix MATEKF722HD Fix MATEKF722HD. Update & clean configuration Mar 5, 2023
@github-actions

This comment has been minimized.

Sign in to view
@haslinghuis haslinghuis changed the title Fix MATEKF722HD. Update & clean configuration Update & clean configuration Mar 5, 2023
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@github-actions

This comment has been minimized.

Sign in to view
@haslinghuis haslinghuis changed the title Update & clean configuration FIX: update & clean configuration Mar 5, 2023
@blckmn
Copy link
Member

blckmn commented Mar 5, 2023

@haslinghuis good to rebase now, and then can be merged.

@haslinghuis
Copy link
Member Author

@blckmn rebased

@github-actions

This comment has been minimized.

Sign in to view
blckmn
blckmn requested changes Mar 5, 2023
View reviewed changes
src/config/FLYWOOF405S_AIO/config.h Outdated
@@ -28,10 +28,15 @@

#define USE_ACC
#define USE_ACC_SPI_MPU6000
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

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

Remnants?

Copy link
Member Author

Choose a reason for hiding this comment

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

Solved.

Copy link
Member Author

Choose a reason for hiding this comment

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

Solved again :)

@blckmn
Copy link
Member

blckmn commented Mar 5, 2023

@blckmn rebased

Some remnants from conflict resolution exist.

@github-actions

This comment has been minimized.

Sign in to view
@github-actions
Copy link

github-actions bot commented Mar 5, 2023

Do you want to test this code? Here you have an automated build:
Assets
WARNING: It may be unstable. Use only for testing! See: https://www.youtube.com/watch?v=I1uN9CN30gw for instructions for unified targets!

@haslinghuis haslinghuis requested a review from blckmn March 6, 2023 00:09
@blckmn blckmn merged commit 5834641 into betaflight:master Mar 6, 2023
@haslinghuis haslinghuis deleted the fix-matekf722hd branch March 6, 2023 00:11
haslinghuis added a commit to haslinghuis/betaflight that referenced this pull request Mar 7, 2023
@haslinghuis
FIX: update & clean configuration (betaflight#12451)
93dd6ef
haslinghuis added a commit to haslinghuis/betaflight that referenced this pull request Mar 7, 2023
@haslinghuis
FIX: update & clean configuration (betaflight#12451)
bab77af
davidbitton pushed a commit to davidbitton/betaflight that referenced this pull request Feb 5, 2024
@haslinghuis @davidbitton
FIX: update & clean configuration (betaflight#12451)
f8f873a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@blckmn blckmn blckmn approved these changes

@klutvott123 klutvott123 klutvott123 approved these changes

@KarateBrot KarateBrot Awaiting requested review from KarateBrot

Assignees

@haslinghuis haslinghuis

Labels
RN: TARGET UPDATE Tested
Projects
Finalizing Firmware 4.5 Release
Status: COMPLETED
Milestone
4.5
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@haslinghuis @blckmn @klutvott123