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_Mount: Siyi ZT6 hardware id and set-lens fix #27890

Merged
merged 2 commits into from
Aug 27, 2024

Conversation

rmackay9
Copy link
Contributor

This fixes two problems with the AP_Mount Siyi driver to improve support for the ZT6

  1. corrects the Hardware ID. The manual says it should be '8', '2' but when testing with real hardware it appears to actually be '8','3'
    image
  2. fixes the set-lens method (used when the pilot selects the active lens using an Aux switch or the MP AuxFunctions tab). The order is now:
    • low: RGB
    • mid: Thermal
    • high: Picture-in-picture RGB / Thermal

This has been tested on real hardware (a ZT6 only, I do not have a ZT30). Below is a screen shot of MP's messages tab. Before this change the "Mount: Siyi ZT6" message did not appear.

image

I think we should backport this to 4.5 because we claimed that we had ZT6 support in an earlier point release. The ZT6 actually does partially work without this fix in that the gimbal can be moved around. It's just that set-len doesn't work properly.

@rmackay9
Copy link
Contributor Author

Siyi has confirmed that there was a mistake in the documentation so I think this is safe to merge

@tridge tridge merged commit 5bcbf56 into ArduPilot:master Aug 27, 2024
93 checks passed
@rmackay9 rmackay9 deleted the siyi-zt6-lens-fix branch August 27, 2024 01:05
@rmackay9
Copy link
Contributor Author

this could not be included in 4.5.7-beta1 due to a merge conflict

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: merge conflict
Development

Successfully merging this pull request may close these issues.

3 participants