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

Upstream merge/25 02 03 #280

Open
wants to merge 43 commits into
base: master
Choose a base branch
from
Open

Upstream merge/25 02 03 #280

wants to merge 43 commits into from

Conversation

KonradRudin
Copy link

No description provided.

peterbarker and others added 30 commits July 5, 2024 09:08
* common: add camera_device_id to CAMERA_INFORMATION

By adding a camera_device_id to a CAMERA_INFORMATION message, we allow an
autopilot to be a proxy for a MAVLink or non-MAVLink camera.

The idea is similar to a gimbal manager implemented by an autopilot.

* Update message_definitions/v1.0/common.xml

---------

Co-authored-by: Hamish Willee <[email protected]>
…#2127)

* common.xml: Add "encoding" field to VIDEO_STREAM_INFORMATION

* common.xml: Remove encodings from video stream type
…#2132)

* update how NaN is used for the orbit yaw behavior

* expanded ENUM, removed NAN usage

* Update message_definitions/v1.0/common.xml

---------

Co-authored-by: Hamish Willee <[email protected]>
* Dialects more clearly not necessarily accurate to fork

* Common.xml includes all entities
…avlink#2142)

* common.xml: Add "Target Camera ID" param to MAV_CMD_DO_SET_CAM_TRIGG_DIST

* common.xml: Add "Target Camera ID" param to MAV_CMD_DO_SET_CAM_TRIGG_INTERVAL

* common.xml: Add "Target Camera ID" param to MAV_CMD_RESET_CAMERA_SETTINGS

* common.xml: Add "Target Camera ID" param to MAV_CMD_SET_CAMERA_ZOOM

* common.xml: Add "Target Camera ID" param to MAV_CMD_SET_CAMERA_FOCUS

* common.xml: Add "Target Camera ID" param to MAV_CMD_DO_TRIGGER_CONTROL

* common.xml: Add "Target Camera ID" param to MAV_CMD_CAMERA_TRACK_POINT

* common.xml: Add range metadata to "id" param of MAV_CMD_SET_CAMERA_MODE

* common.xml: Add "Target Camera ID" param to MAV_CMD_CAMERA_TRACK_RECTANGLE

* common.xml: Add "Target Camera ID" param to MAV_CMD_CAMERA_STOP_TRACKING

* common.xml: Add "Target Camera ID" param to MAV_CMD_VIDEO_START_CAPTURE

* common.xml: Add "Target Camera ID" param to MAV_CMD_VIDEO_STOP_CAPTURE

* common.xml: Add "Target Camera ID" param to MAV_CMD_VIDEO_START_STREAMING

* common.xml: Add "Target Camera ID" param to MAV_CMD_VIDEO_STOP_STREAMING

* common.xml: Add "camera_device_id" field to CAMERA_SETTINGS

* common.xml: Add "camera_device_id" field to CAMERA_CAPTURE_STATUS

* common.xml: Add "camera_device_id" field to VIDEO_STREAM_INFORMATION

* common.xml: Add "camera_device_id" field to VIDEO_STREAM_STATUS

* common.xml: Add "camera_device_id" field to CAMERA_FOV_STATUS

* common.xml: Add "camera_device_id" field to CAMERA_TRACKING_IMAGE_STATUS

* common.xml: Add "camera_device_id" field to CAMERA_TRACKING_GEO_STATUS

* common.xml: Update "camera_device_id" field of CAMERA_INFORMATION

For consistency with other messages with the same field.

* common.xml: Rename MAV_CMD_IMAGE_START_CAPTURE param1 to "Target Camera ID"

* common.xml: Rename MAV_CMD_IMAGE_STOP_CAPTURE param1 to "Target Camera ID"
* common: add camera-thermal-range

* Update message_definitions/v1.0/common.xml

* wip tagging

* Update message_definitions/v1.0/common.xml

* Update message_definitions/v1.0/common.xml

---------

Co-authored-by: Hamish Willee <[email protected]>
* common: add capability flags for camera and gimbal

Having these two capability flags means that ground stations don't have
to ask any discovered components for CAMERA_INFORMATION and
GIMBAL_MANAGER_INFORMATION messages and can instead only do so when they
see this capability flag set.

This means however, that each ground station now needs to request either
AUTOPILOT_VERSION or COMPONENT_INFORMATION_BASIC from any MAVLink
component that it discovers, so it's only slightly better.

The alternative would be to make it explicit that cameras and gimbals
need to send out CAMERA_CAPTURE_STATUS and GIMBAL_MANAGER_STATUS
messages respsectively, to signal implementing a camera/gimbal manager.

* Update message_definitions/v1.0/common.xml

---------

Co-authored-by: Hamish Willee <[email protected]>
* add rc_type_crsf

* Update RX_PAIR to use RC_TYPE and RC_SUB_TYPE to make sense with CRSF binding

* Apply suggestions from code review

* Update message_definitions/v1.0/common.xml

* Update message_definitions/v1.0/common.xml

---------

Co-authored-by: Hamish Willee <[email protected]>
It collides with a new command in Ardupilotmega.xml, in
Ardupilot repo
* common.xml: remove recently added MAV_RESULT_PERMISSION_DENIED:

This was needed for the new in development multi GCS protocol.
It was decided to hold on this new result for the moment, in
order to make the current implementation easier to adopt, and
evaluate again in the future if this is needed.

For the situations meant to use this, we will use RESULT_FAILED

* development.xml: use RESULT_FAILED instead of PERMISSION_DENIED

* development.xml: add request timeout parameter to REQUEST_OPERATOR_CONTROL

* development.xml: In REQUEST_OPERATOR_CONTROL requests revert to takeover not allowed after 10s

* development.xml: fix REQUEST_OPERATOR_CONTROL param4 description

Co-authored-by: Hamish Willee <[email protected]>

---------

Co-authored-by: Hamish Willee <[email protected]>
hamishwillee and others added 13 commits December 4, 2024 10:19
* Keep dialects and tests togehter. Tidy text

* Generate wip text for enum values
* development: Remove parameter transaction proposal added in  mavlink#1693 but never validated
* common: use camera ID for CAMERA_IMAGE_CAPTURED

The message CAMERA_IMAGE_CAPTURED is lacking a camera_device_id but I
think we can just use the unused camera_id instead.

* Update message_definitions/v1.0/common.xml

---------

Co-authored-by: Hamish Willee <[email protected]>
* Standard mode definitions - move from dev to common

* code review - fix types. improve cross linking (not "semantic" changes)
* AVAILALBE modes. Fix descriptive sentence

* More cross linking

* Add links to the standard mode docs

* Update message_definitions/v1.0/common.xml
@KonradRudin KonradRudin force-pushed the upstream-merge/25-02-03 branch from d89bdcb to 142cffd Compare February 3, 2025 15:32
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.

10 participants