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

AP_Camera/AP_Mount: send camera info and settings messages to GCS #24034

Merged
merged 4 commits into from
Jun 16, 2023

Conversation

rmackay9
Copy link
Contributor

This adds basic support for AP_Camera and AP_Mount to send CAMERA_INFORMATION and CAMERA_SETTINGS messages to the ground station. This is important for the QGC custom camera/gimbal interface development.

The support is "basic" because only two of the camera drivers fill in the message details to any useful extent:

  • Siyi driver provides the vendor and model names, firmware version, capability flags, recording mode and zoom percentage (see testing image below)
  • MAVLinkCamV2 fully provides the CAMERA_INFORMATION message details but does not provide CAMERA_SETTINGS

Still, this is useful because the GCS work is being tested using a Siyi A8 and a follow-up PR will add support to the other drivers.

A small drive-by change is also made to the Siyi driver to display the camera firmware version (previously it only displayed the gimbal firmware version)

This has been bench tested on real hardware (Siyi A8 + CubeOrange)
testing-screenshot

Copy link
Contributor

@peterbarker peterbarker left a comment

Choose a reason for hiding this comment

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

Looks like these suggestions are move of an "if you're in the neighborhood thing, except for the default values thing.

libraries/AP_Mount/AP_Mount_Siyi.cpp Outdated Show resolved Hide resolved
libraries/AP_Mount/AP_Mount_Siyi.cpp Outdated Show resolved Hide resolved
libraries/AP_Mount/AP_Mount_Siyi.cpp Outdated Show resolved Hide resolved
libraries/AP_Mount/AP_Mount_Siyi.cpp Outdated Show resolved Hide resolved
libraries/AP_Camera/AP_Camera_Backend.cpp Show resolved Hide resolved
@rmackay9 rmackay9 dismissed peterbarker’s stale review June 15, 2023 05:16

Thanks for the reivew, I've addressed these issues I think.

Copy link
Contributor

@peterbarker peterbarker left a comment

Choose a reason for hiding this comment

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

LGTM

@rmackay9 rmackay9 merged commit c4c073e into ArduPilot:master Jun 16, 2023
@rmackay9 rmackay9 deleted the camera-info branch June 16, 2023 04:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants