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

Common: fix siyi cam param instructions #5165

Merged
merged 2 commits into from
Jun 5, 2023

Conversation

rmackay9
Copy link
Contributor

@rmackay9 rmackay9 commented Jun 5, 2023

This fixes the camera setup parameter instructions to clarify that it depends upon the AP version used.

  • 4.3 (and earlier) uses CAM_TRIGG_TYPE
  • 4.4 (and later) use CAM1_TYPE

This PR is in response to this discussion where a user couldn't get the ZR10 camera controls to work.

This has been tested locally and seems OK.

Copy link
Contributor

@Hwurzburg Hwurzburg left a comment

Choose a reason for hiding this comment

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

a few minor nits

common/source/docs/common-siyi-zr10-gimbal.rst Outdated Show resolved Hide resolved
Co-authored-by: Henry Wurzburg <hwurzburg@yahoo.com>
@rmackay9
Copy link
Contributor Author

rmackay9 commented Jun 5, 2023

Great thanks, I've made the suggested fixes..

@Hwurzburg Hwurzburg merged commit b08c6de into ArduPilot:master Jun 5, 2023
3 of 4 checks passed
@rmackay9 rmackay9 deleted the cam-trigg-fix branch June 5, 2023 07:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants