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

Document changes to sysid and component id #26

Merged
merged 2 commits into from
Apr 24, 2018
Merged

Document changes to sysid and component id #26

merged 2 commits into from
Apr 24, 2018

Conversation

hamishwillee
Copy link
Collaborator

This updates docs with changes resulting from Dronecode/camera-manager#166

@@ -16,7 +16,7 @@ CSD supports the following key features:
* Automatically attaches [compatible cameras](#supported_cameras) connected to the Linux computer when it is started.
* RTSP video streaming from *all* connected cameras (for consumption by GCS or other video players).
* RTSP video stream advertising/discovery using Avahi.
* [MAVLink Camera Protocol](#mavlink_support) support for up to 5 cameras, enabling image/video capture and storage, and querying/setting camera options.
* [MAVLink Camera Protocol](#mavlink_support) support for up to 6 cameras, enabling image/video capture and storage, and querying/setting camera options.
Copy link

Choose a reason for hiding this comment

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

Should image capture, video capture be part of key feature of CM?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes. They are, but they are part of "MAVLink support". That is why the doc says "... support for up to 6 cameras, enabling image/video capture and storage, and querying/setting camera options."

Component IDs for each camera are allocated automatically and sequentially from [MAV_COMP_ID_CAMERA2](https://mavlink.io/en/messages/common.html#MAV_COMP_ID_CAMERA2) to [MAV_COMP_ID_CAMERA6](https://mavlink.io/en/messages/common.html#MAV_COMP_ID_CAMERA6) (inclusive) as cameras are connected (once all component ids are allocated further cameras are not addressable).
All cameras share the same MAVLink system ID. This can (optionally) be defined in the configuration file to match the id of the associated autopilot. If the system id is not defined in the configuration file then CSD will initially use the default PX4 vehicle system ID (1) and then change to the id of the first autopilot it detects.

Component IDs for each camera are allocated automatically and sequentially from [MAV_COMP_ID_CAMERA](https://mavlink.io/en/messages/common.html#MAV_COMP_ID_CAMERA) as cameras are connected (once all component ids are allocated further cameras are not addressable). For Gazebo-enabled CSD builds the first ID is allocated to the Gazebo plugin camera.
Copy link

@lbegani lbegani Apr 24, 2018

Choose a reason for hiding this comment

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

For Gazebo-enabled CSD builds the first ID is allocated to the Gazebo plugin camera

Not sure, what it means

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks. I re-wrote as "When the CSD is built with Gazebo enabled, the Gazebo camera has component ID MAV_COMP_ID_CAMERA."

@hamishwillee hamishwillee merged commit e7af131 into Dronecode:master Apr 24, 2018
@hamishwillee hamishwillee deleted the sys_comp_ids branch April 24, 2018 04:31
@hamishwillee
Copy link
Collaborator Author

Thanks @lbegani . I have fixed the main issue and merged. If you think not well enough done, let me know and we can fix in a separate PR.

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.

2 participants