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

CONFIG: Add CAMERA_CONTROL if PIN defined #12516

Merged
merged 1 commit into from Mar 15, 2023
Merged

CONFIG: Add CAMERA_CONTROL if PIN defined #12516

merged 1 commit into from Mar 15, 2023

Conversation

haslinghuis
Copy link
Member

No description provided.

@haslinghuis haslinghuis added this to the 4.5 milestone Mar 14, 2023
@haslinghuis haslinghuis self-assigned this Mar 14, 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 14, 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

ctzsnooze
ctzsnooze reviewed Mar 14, 2023
View reviewed changes
src/main/target/common_post.h Outdated
@@ -121,6 +121,10 @@

#endif // defined(USE_RX_CC2500)

#if defined(CAMERA_CONTROL_PIN) && defined(USE_OSD_SD) && !defined(USE_CAMERA_CONTROL)
Copy link
Member

Choose a reason for hiding this comment

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

Curious as to why && defined(USE_OSD_SD) is necessary?

Copy link
Member Author

Choose a reason for hiding this comment

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

Added in last push as it would only be needed when using analog - so it should be USE_VTX instead?

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

@ctzsnooze
Copy link
Member

As I understand it, the intent of this PR is that if the config.h file includes a defined camera control pin, and the default cloud build defines are used to build the firmware, then the firmware will contain the code to provide the camera control feature.

That makes sense to me, especially since a manufacturer may otherwise get support requests about their camera control pin not working.

Users of boards without defined camera control pins would have to manually enable the camera control build option, and probably would have to manually configure a suitable resource pin in the CLI to use for this purpose.

@blckmn blckmn merged commit 7d27328 into betaflight:master Mar 15, 2023
@haslinghuis haslinghuis deleted the use-camera-control branch March 15, 2023 22:05
davidbitton pushed a commit to davidbitton/betaflight that referenced this pull request Feb 5, 2024
@haslinghuis @davidbitton
CONFIG: Add CAMERA_CONTROL if PIN defined (betaflight#12516)
0ad48e0
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

@ctzsnooze ctzsnooze ctzsnooze approved these changes

Assignees

@haslinghuis haslinghuis

Labels
RN: BUGFIX
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 @ctzsnooze