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

Fix flash M25P16 ID with QUADSPI #12670

Merged
merged 1 commit into from Apr 14, 2023

Conversation

mluessi
Copy link
Contributor

@mluessi mluessi commented Apr 12, 2023

Fixes the M25P16 flash identification when used with QUADSPI

@github-actions
Copy link

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 added this to the 4.5 milestone Apr 13, 2023
@blckmn
Copy link
Member

blckmn commented Apr 13, 2023

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 -> PASS
  • Don't merge label NOT found -> PASS
  • at least one RN: label found -> PASS
  • Tested label found -> FAIL
  • assigned to an approver -> FAIL
  • approver count at least three -> FAIL

@blckmn blckmn merged commit 3bfbac4 into betaflight:master Apr 14, 2023
18 checks passed
@hydra
Copy link
Contributor

hydra commented Apr 14, 2023

The code in master prior to this commit should have caused a compilation error, but is seems there is no automated build that compiles in both QUADSPI and the M25P16 flash chip.

The issue stemmed from two PR's making changes to the same code, one or the other of the PR's should have had a failing build at the time they were merged. See #11825 and #12103.

@haslinghuis @blckmn This situation can be avoided if there is a pre-merge check that builds all the targets and that at least one target exists for the QUADSPI/M25P16 combination. The development Nucleo board targets used to cover many of the combinations prior to their removal.

Currently the code-base cannot be relied on to even compile.

@haslinghuis
Copy link
Member

@blckmn Would like to restore the NUCLEO F446RE target as I ordered this board.

@blckmn
Copy link
Member

blckmn commented Apr 14, 2023

@haslinghuis lets restore that target, and add it to the checks.

AkankshaJjw pushed a commit to AkankshaJjw/betaflight that referenced this pull request May 29, 2023
davidbitton pushed a commit to davidbitton/betaflight that referenced this pull request Feb 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: COMPLETED
Development

Successfully merging this pull request may close these issues.

None yet

5 participants