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.xml: add recommendations for "unknown" values for CAMERA_INFOR… #321

Merged

Conversation

peterbarker
Copy link

…MATION and CAMERA_SETTINGS

<field type="uint16_t" name="cam_definition_version">Camera definition version (iteration)</field>
<field type="char[140]" name="cam_definition_uri">Camera definition URI (if any, otherwise only basic functions will be available). HTTP- (http://) and MAVLink FTP- (mavlinkftp://) formatted URIs are allowed (and both must be supported by any GCS that implements the Camera Protocol).</field>
<field type="uint16_t" name="cam_definition_version">Camera definition version (iteration). Use 0 if not known.</field>
<field type="char[140]" name="cam_definition_uri">Camera definition URI (if any, otherwise only basic functions will be available). HTTP- (http://) and MAVLink FTP- (mavlinkftp://) formatted URIs are allowed (and both must be supported by any GCS that implements the Camera Protocol). Use a zero-length string if not known.</field>

Choose a reason for hiding this comment

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

Yes. Is this the normal way to describe a zero length string? i.e. don't we usually use something like "null terminated"?

Copy link
Author

Choose a reason for hiding this comment

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

zero-length is the value; the encoding of a string in mavlink is "null terminated or the length of the field", so I think this is fine :-)

@hamishwillee
Copy link

Looks good to me. Note though, I'll have to get it reviewed upstream as well, which might result in changes.

@peterbarker peterbarker force-pushed the pr/camera-message-unknown-values branch from 5420f37 to cead995 Compare June 15, 2023 01:02
@rmackay9
Copy link

Thanks for this..

@hamishwillee
Copy link

Thanks for this..

Yes, thanks @peterbarker . The suggestion to tidy up yet another part of the spec that isn't very clear is most welcome.

@auturgy
Copy link

auturgy commented Jun 15, 2023

Upstream mirrored PR: mavlink#2007

@auturgy
Copy link

auturgy commented Jun 15, 2023

Merged upstream

…MATION and CAMERA_SETTINGS

Co-authored-by: Hamish Willee <[email protected]>
@peterbarker peterbarker force-pushed the pr/camera-message-unknown-values branch from b24c7bf to a3c69f2 Compare June 16, 2023 10:39
@peterbarker
Copy link
Author

I've freshened this from the upstream merge to make sure we're in sync, and intend to merge after this has passed CI.

@peterbarker peterbarker merged commit 2da25b0 into ArduPilot:master Jun 16, 2023
8 checks passed
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.

4 participants