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 CONFIG #12480

Merged

blckmn merged 3 commits into betaflight:master from haslinghuis:update-config

Mar 9, 2023

Member

haslinghuis commented Mar 8, 2023 •

edited

Add some resource updates MAMBAG4
Add DPS310 to FLYWOOF405NANO
Add DPS310 to FOXEERF722V4
MATEKF405TE was using FLASH instead of SDCARD
Fixes wrong resources (MATEK and H7RF):
VBAT_ADC_PIN => ADC_VBAT_PIN
RSSI_ADC_PIN => ADC_RSSI_PIN
CURRENT_METER_ADC_PIN => ADC_CURR_PIN

haslinghuis added the RN: TARGET UPDATE label

haslinghuis added this to the 4.5 milestone

haslinghuis self-assigned this

This comment has been minimized.

Sign in to view

haslinghuis force-pushed the update-config branch from 1d5f452 to 6caf3a1 Compare

March 8, 2023 15:06

This comment has been minimized.

Sign in to view

haslinghuis force-pushed the update-config branch from 6caf3a1 to efcf63a Compare

March 8, 2023 15:21

This comment has been minimized.

Sign in to view

haslinghuis force-pushed the update-config branch from efcf63a to 7cfa82f Compare

March 8, 2023 15:32

This comment has been minimized.

Sign in to view

Member

blckmn commented Mar 8, 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 -> 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

haslinghuis force-pushed the update-config branch from 7cfa82f to 990cf84 Compare

March 8, 2023 19:32

This comment has been minimized.

Sign in to view

blckmn approved these changes

View reviewed changes

haslinghuis force-pushed the update-config branch 2 times, most recently from 58edf6c to 3c6de54 Compare

March 8, 2023 20:29

This comment has been minimized.

Sign in to view

nerdCopter approved these changes

View reviewed changes

haslinghuis requested review from ctzsnooze, KarateBrot and klutvott123

March 8, 2023 23:00

Member

blckmn commented Mar 9, 2023

@haslinghuis can you move the adding of a new target to a separate PR please. Need to configure github actions for completing the tasks for new targets.

haslinghuis force-pushed the update-config branch from 3c6de54 to 06f37b9 Compare

March 9, 2023 10:53

haslinghuis changed the title ~~FIX CONFIG and Add AOCODARCF722~~ FIX CONFIG

This comment has been minimized.

Sign in to view

haslinghuis added the Ready to Merge label

haslinghuis force-pushed the update-config branch from 06f37b9 to 9da677d Compare

March 9, 2023 11:02

This comment has been minimized.

Sign in to view

KarateBrot requested changes

View reviewed changes

src/config/MATEKH743/config.h Outdated Show resolved Hide resolved


          FIX CONFIG and Add AOCODARCF722

e0a4ff9

haslinghuis force-pushed the update-config branch from 9da677d to e0a4ff9 Compare

March 9, 2023 13:39

This comment has been minimized.

Sign in to view

KarateBrot approved these changes

View reviewed changes

TheIsotopes suggested changes

View reviewed changes

src/config/MATEKH743/config.h Outdated Show resolved Hide resolved

src/config/SPRACINGH7RF/config.h Outdated Show resolved Hide resolved

src/config/SPRACINGH7RF/config.h Outdated Show resolved Hide resolved

src/config/SPRACINGH7RF/config.h Outdated Show resolved Hide resolved


          Fixes per review

1c92942

This comment has been minimized.

Sign in to view

TheIsotopes approved these changes

View reviewed changes


          Remove more non-existent settings

33aac5a

This comment has been minimized.

Sign in to view

haslinghuis force-pushed the update-config branch from c50f4b8 to 33aac5a Compare

March 9, 2023 19:31

Member Author

haslinghuis commented Mar 9, 2023

Thanks @TheIsotopes, found even more and guess got in after rebases :)

github-actions bot commented Mar 9, 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!

blckmn merged commit ccffbbb into betaflight:master

haslinghuis deleted the update-config branch

March 9, 2023 19:37

davidbitton pushed a commit to davidbitton/betaflight that referenced this pull request


          FIX CONFIG (betaflight#12480)

f6cc40e

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

Reviewers

KarateBrot KarateBrot approved these changes

blckmn blckmn approved these changes

TheIsotopes TheIsotopes approved these changes

nerdCopter nerdCopter approved these changes

ctzsnooze Awaiting requested review from ctzsnooze

klutvott123 Awaiting requested review from klutvott123