Skip to content

Commit 6884eaf

Browse files
PX4BuildBotPX4BuildBot
authored
New Crowdin updates (#682)
* New translations traffic_management.md (Korean) * New translations xml_schema.md (Korean) * New translations index.md (Korean) * New translations image_transmission.md (Korean) * New translations manual_control.md (Korean) * New translations mavlink_id_assignment.md (Korean) * New translations mission.md (Korean) * New translations parameter.md (Korean) * New translations parameter_ext.md (Korean) * New translations camera.md (Korean) * New translations gimbal_v2.md (Korean) * New translations high_latency.md (Korean) * New translations traffic_management.md (Chinese Simplified) * New translations xml_schema.md (Chinese Simplified) * New translations index.md (Chinese Simplified) * New translations image_transmission.md (Chinese Simplified) * New translations manual_control.md (Chinese Simplified) * New translations mavlink_id_assignment.md (Chinese Simplified) * New translations mission.md (Chinese Simplified) * New translations parameter.md (Chinese Simplified) * New translations parameter_ext.md (Chinese Simplified) * New translations camera.md (Chinese Simplified) * New translations ftp.md (Chinese Simplified) * New translations gimbal_v2.md (Chinese Simplified) * New translations high_latency.md (Chinese Simplified) * New translations development.md (Korean) * New translations all.md (Korean) * New translations development.md (Chinese Simplified) * New translations all.md (Chinese Simplified)
1 parent d9091e7 commit 6884eaf

29 files changed

+187
-81
lines changed

‎ko/guide/xml_schema.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The main tags are listed below (all are optional):
4242
- You can include multiple files using separate tags.
4343
- The path to included files can be relative to your dialect file.
4444
Note however that the project tests only cover the case where dialects are in the same folder.
45-
- Nested `include` of files is not supported (only files specified in the top level `include` are imported).
45+
- Nested `include` of files are supported (mavgen permits up to 5 levels of nesting).
4646
- When building, generator toolchains will merge/append enums in all files, and report duplicate enum entries and messages.
4747

4848
- `version`: The minor version number for the release, as included in the [HEARTBEAT](../messages/common.md#HEARTBEAT message) `mavlink_version` field.

‎ko/mavgen_python/index.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,19 @@ where:
194194
- `protocol` (optional):
195195
The IP protocol.
196196
If not specified pymavlink will attempt to determine if the address is a serial port (e.g. USB) or a file, and if not will default to a UDP address.
197+
197198
- `tcp`: Initiate a TCP connection on the specified `address` and `port`.
198199
- `tcpin`: Listen for a TCP connection on the specified `address` and `port`.
199200
- `udpin`: Listen for a UDP connection on the specified `address` and `port`.
200201
- `udpout`: Initiate a UDP connection on the specified `address` and `port`.
202+
- `udpbcast`: Broadcast UDP address and port. This is the same as `udp` with `mavlink_connection()` parameters `input=False` and `broadcast=True`.
203+
204+
For legacy purposes we accept the following syntax and let the caller to specify direction:
205+
201206
- `udp`: By default, same as `udpin`. Set `mavlink_connection` parameter `input=False` to make same as `udpout`.
202-
- `udpcast`: Broadcast UDP address and port. This is the same as `udp` with `mavlink_connection()` parameters `input=False` and `broadcast=True`.
207+
203208
- `address`: IP address, serial port name, or file name
209+
204210
- `port`: IP port (only if address is an IP address)
205211

206212
Some of the strings you can use for different types of connections are listed below.

‎ko/messages/all.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ span.warning {
6262

6363
| Type | Defined | Included |
6464
| -------------------------- | ------- | -------- |
65-
| [Messages](#messages) | 0 | 388 |
65+
| [Messages](#messages) | 0 | 389 |
6666
| [Enums](#enumerated-types) | 0 | 252 |
6767
| [Commands](#mav_commands) | 223 | 0 |
6868

‎ko/messages/development.md‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ span.warning {
3737

3838
| Type | Defined | Included |
3939
| -------------------------- | ------- | -------- |
40-
| [Messages](#messages) | 11 | 234 |
40+
| [Messages](#messages) | 12 | 234 |
4141
| [Enums](#enumerated-types) | 12 | 155 |
4242
| [Commands](#mav_commands) | 177 | 0 |
4343

@@ -175,6 +175,21 @@ Note: The RC channels fields are extensions to ensure that they are located at t
175175
| count | `uint8_t` | | | Total number of RC channels being received. This can be larger than 32, indicating that more channels are available but not given in this message. |
176176
| <span class='ext'>channels</span> <a href='#mav2_extension_field'>++</a> | `int16_t[32]` | | min:-4096 max:4096 | RC channels.<br>Channel values are in centered 13 bit format. Range is -4096 to 4096, center is 0. Conversion to PWM is x \* 5/32 + 1500.<br>Channels with indexes equal or above count should be set to 0, to benefit from MAVLink's trailing-zero trimming. |
177177

178+
### RC_CHANNELS_OVERRIDE_V2 (421) — [WIP] {#RC_CHANNELS_OVERRIDE_V2}
179+
180+
<span class="warning">**WORK IN PROGRESS**: Do not use in stable production environments (it may change).</span>
181+
182+
Highly bandwidth-efficient RC override message for professional networked operations (LTE, Zigbee, GCP).
183+
Supersedes [RC_CHANNELS_OVERRIDE](#RC_CHANNELS_OVERRIDE) by adding 32-channel support and a bitmask for multi-master conflict avoidance.
184+
Uses centered-at-zero values and extension-field placement to maximize MAVLink 2 trailing-zero truncation.
185+
186+
| Field Name | Type | Description |
187+
| ------------------------------------------------------------------------ | ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
188+
| target_system | `uint8_t` | System ID. |
189+
| target_component | `uint8_t` | Component ID. |
190+
| active_mask | `uint32_t` | Bitmap of included channels (bit 0 = CH1). 1: Valid/Override, 0: Ignore. |
191+
| <span class='ext'>channels</span> <a href='#mav2_extension_field'>++</a> | `int16_t[32]` | RC channels in centered 13-bit format. Range: -4096 to 4096, Center: 0.<br>Conversion to PWM: (x \* 5/32) + 1500.<br>Unused channels must be set to 0 to enable MAVLink 2 trailing-zero trimming. |
192+
178193
### GNSS_INTEGRITY (441) — [WIP] {#GNSS_INTEGRITY}
179194

180195
<span class="warning">**WORK IN PROGRESS**: Do not use in stable production environments (it may change).</span>

‎ko/services/camera.md‎

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ These cameras have inbuilt support for MAVLink (but not necessarily camera proto
3333

3434
MAVLink cameras are identified and addressed by their system and component id.
3535

36-
Components that have non-MAVLink cameras attached, such as companion computers, are expected expose each of them as a separate MAVLink camera component with its own `HEARTBEAT`.
36+
Components that have non-MAVLink cameras attached, such as companion computers, are expected to expose each of them as a separate MAVLink camera component with its own `HEARTBEAT`.
3737

3838
The exception is the _autopilot_ component, which can "proxy" up to 6 attached non-MAVLink cameras: these are identified by a `camera_device_id` field in messages and `Target Camera ID` label in commands.
3939

@@ -235,7 +235,7 @@ For formatting (or erasing depending on your implementation), the GCS will send
235235

236236
### Camera Capture Status
237237

238-
In addition to querying about storage status, the GCS should also stream the _Camera Capture Status_ in order to provide the user with proper UI indicators.
238+
In addition to querying about storage status, the GCS should also request a stream of `CAMERA_CAPTURE_STATUS` messages in order to provide the user with proper UI indicators.
239239

240240
This can be done by sending a [MAV_CMD_SET_MESSAGE_INTERVAL](../messages/common.md#MAV_CMD_SET_MESSAGE_INTERVAL) command asking for [CAMERA_CAPTURE_STATUS](../messages/common.md#CAMERA_CAPTURE_STATUS).
241241
The command it expects a [COMMAND_ACK](../messages/common.md#COMMAND_ACK) message back and then [CAMERA_CAPTURE_STATUS](../messages/common.md#CAMERA_CAPTURE_STATUS) should be streamed at the specified rate.
@@ -282,7 +282,7 @@ The message sequence for _interactive user-initiated image capture_ through a GU
282282
In this case the GCS should:
283283

284284
- Confirm that the camera is _ready_ to take images before allowing the user to request image capture.
285-
- It does this by by sending [MAV_CMD_REQUEST_MESSAGE](../messages/common.md#MAV_CMD_REQUEST_MESSAGE) asking for [CAMERA_CAPTURE_STATUS](../messages/common.md#CAMERA_CAPTURE_STATUS).
285+
- It does this by sending [MAV_CMD_REQUEST_MESSAGE](../messages/common.md#MAV_CMD_REQUEST_MESSAGE) asking for [CAMERA_CAPTURE_STATUS](../messages/common.md#CAMERA_CAPTURE_STATUS).
286286
- The camera should return a `MAV_RESULT` and then [CAMERA_CAPTURE_STATUS](../messages/common.md#CAMERA_CAPTURE_STATUS).
287287
- The GCS should check that the status is "Idle" before enabling camera capture in the GUI.
288288
- Send [MAV_CMD_IMAGE_START_CAPTURE](../messages/common.md#MAV_CMD_IMAGE_START_CAPTURE) specifying a single image (only).
@@ -426,7 +426,39 @@ The GCS should already have identified all connected cameras by their heartbeat
426426

427427
The sequence for tracking a point is shown below (tracking a rectangle is the same sequence but a different tracking command).
428428

429-
[![Mermaid Sequence: tracking info](https://mermaid.ink/img/pako:eNqlVGFvmzAQ_SuWP6USi5ZKWyW2RLIIYWgBIkz7CQm54CTWgs2M2VRV_e8zmCyobaImAQkd9t299853foa5KCi0YU1_N5TndM7IRpLyW8qBfioiFctZRbgCnoPfLjqkpJKY9VAoCsQfKltXy-zYwF8ABwVujDIHrbLFEnk4-4FwlsTI-emHXraK_DD5_ihnjO89_XARxQFK_Cgcr3dkU7fboFYaGChJ8l-Mb0AlGFcGWeN9ms32iAF6yJxgnvXJOiCDMgIp7MIA42shS6KY4CkENyaNSaAz6XwmTezi-2WSIcdxV4k7b91Sbt43im2AqdIkJSVly08SRVveQxqtXj9AnpvhBCX3-BR97CZZ4GLcemvubvyAliNde1JOprd3X6zOvJ1OPhvrbjo5R8YHyIPXzD036nm3ukZ1U1VCnwirAanrpqRgSyW9uVzT16s0vVZlQqwuwNi9vvrQQ4M2AJpHrbcE2LDykezeBT51lmA0-VDMoYqHCPBe4Hg8Pjcfv4B1G3OqdvqjCyeqQdkILwa98ndLOdA_xdOxsxpMI06i1X8mx0p2tGevmpRLB-WqVj4fFFpQe5SEFfpafu6uHKi2tKQptLVZ0DVpdiqFKX_Rrk1V6FF1C6aEhPaa7GpqQdIogZ94Dm0lG7p36q_23uvlH-Jn1w4?type=png)](https://mermaid-js.github.io/mermaid-live-editor/edit#pako:eNqlVGFvmzAQ_SuWP6USi5ZKWyW2RLIIYWgBIkz7CQm54CTWgs2M2VRV_e8zmCyobaImAQkd9t299853foa5KCi0YU1_N5TndM7IRpLyW8qBfioiFctZRbgCnoPfLjqkpJKY9VAoCsQfKltXy-zYwF8ABwVujDIHrbLFEnk4-4FwlsTI-emHXraK_DD5_ihnjO89_XARxQFK_Cgcr3dkU7fboFYaGChJ8l-Mb0AlGFcGWeN9ms32iAF6yJxgnvXJOiCDMgIp7MIA42shS6KY4CkENyaNSaAz6XwmTezi-2WSIcdxV4k7b91Sbt43im2AqdIkJSVly08SRVveQxqtXj9AnpvhBCX3-BR97CZZ4GLcemvubvyAliNde1JOprd3X6zOvJ1OPhvrbjo5R8YHyIPXzD036nm3ukZ1U1VCnwirAanrpqRgSyW9uVzT16s0vVZlQqwuwNi9vvrQQ4M2AJpHrbcE2LDykezeBT51lmA0-VDMoYqHCPBe4Hg8Pjcfv4B1G3OqdvqjCyeqQdkILwa98ndLOdA_xdOxsxpMI06i1X8mx0p2tGevmpRLB-WqVj4fFFpQe5SEFfpafu6uHKi2tKQptLVZ0DVpdiqFKX_Rrk1V6FF1C6aEhPaa7GpqQdIogZ94Dm0lG7p36q_23uvlH-Jn1w4)
429+
[![Mermaid Sequence: tracking info](https://mermaid.ink/img/pako:eNqlVNuOmzAQ_RXLT1mJImDJhtAmEiIkRc1Ngd2HKhLyBoegDTY1Zts0yr_XQG5Kd6NceEBjz5w5Z8Zjr-GMhhiaMMO_ckxmuBOjiKHk65QA8aWI8XgWp4hw0LO9_zdtlGCGqv0h5RjQd8yKUKnymMDtAtsaOBMrsK1x0O1bPS_4bnmBP7HsH-6wF4xH7tD_9sraMdlFusPuaDKwfHc0lOdLFGWFG2RcEAPO0OwtJhFIaUx4xSz4vrTbO8aB9RLYg06wTVYSVSw1MIUlDMRkTlmCeEzJFIKHKk2VQGQS-ao0E8d77vuBZdvO2Hc6RdgHtZrAw1zIYxglhTKGOC4UHwsoKnUHVs8JPN_yn71zwj3HDwaO5xXRQrUzebH6NdF1lKgtrVGXSlNrqUplNVrqNQVcIB6cKu85o63uoq5alqcpFWcRZwBlWZ5gsMAMP9xe09NdNZ1WVUGkElDZ2_qyw_QcDQAQOjLhoiCKk1e0_JD43FmCmnoR5tDFAwJ8BJRl-dp85AbVBeZc78RPNI6mR21DJDyald8LTIBYhKsL7qHnj8Z7JZ-17NOZveum3HpR7hrl60mhBCMWh9DkLMcSFNEJKpZwXT48kC9wgqfQFGaI2NsUTslGYMRD_JPSZAdjNI8W0JyjZSZWeRqKC7191U92nTDmlO03Uc6ptyKzfSJMQsxsmhMOTU0tiaC5hn-gqat1uanrj7pqNBRD14xHCa6gqepN2ag3Na1hNA1dUfSNBP-W0hS5UVd0Q6sLr6Krivq0-QcBRvlk?type=png)](https://mermaid.live/edit#pako:eNqlVNuOmzAQ_RXLT1mJImDJhtAmEiIkRc1Ngd2HKhLyBoegDTY1Zts0yr_XQG5Kd6NceEBjz5w5Z8Zjr-GMhhiaMMO_ckxmuBOjiKHk65QA8aWI8XgWp4hw0LO9_zdtlGCGqv0h5RjQd8yKUKnymMDtAtsaOBMrsK1x0O1bPS_4bnmBP7HsH-6wF4xH7tD_9sraMdlFusPuaDKwfHc0lOdLFGWFG2RcEAPO0OwtJhFIaUx4xSz4vrTbO8aB9RLYg06wTVYSVSw1MIUlDMRkTlmCeEzJFIKHKk2VQGQS-ao0E8d77vuBZdvO2Hc6RdgHtZrAw1zIYxglhTKGOC4UHwsoKnUHVs8JPN_yn71zwj3HDwaO5xXRQrUzebH6NdF1lKgtrVGXSlNrqUplNVrqNQVcIB6cKu85o63uoq5alqcpFWcRZwBlWZ5gsMAMP9xe09NdNZ1WVUGkElDZ2_qyw_QcDQAQOjLhoiCKk1e0_JD43FmCmnoR5tDFAwJ8BJRl-dp85AbVBeZc78RPNI6mR21DJDyald8LTIBYhKsL7qHnj8Z7JZ-17NOZveum3HpR7hrl60mhBCMWh9DkLMcSFNEJKpZwXT48kC9wgqfQFGaI2NsUTslGYMRD_JPSZAdjNI8W0JyjZSZWeRqKC7191U92nTDmlO03Uc6ptyKzfSJMQsxsmhMOTU0tiaC5hn-gqat1uanrj7pqNBRD14xHCa6gqepN2ag3Na1hNA1dUfSNBP-W0hS5UVd0Q6sLr6Krivq0-QcBRvlk)
430+
431+
<!-- Original sequence
432+
sequenceDiagram;
433+
participant GCS
434+
participant Camera
435+
Note over GCS,Camera: IF CAMERA_CAP_FLAGS_HAS_TRACKING_POINT<br>in CAMERA_INFORMATION.flags<br> start tracking point
436+
GCS->>Camera: MAV_CMD_CAMERA_TRACK_POINT( "point information" )
437+
Camera->>GCS: MAV_RESULT_ACCEPTED
438+
439+
Note over GCS: Set streaming rate<br>CAMERA_TRACKING_IMAGE_STATUS
440+
GCS->>Camera: MAV_CMD_SET_MESSAGE_INTERVAL(param1=275,param2=10,param7=1)
441+
Camera->>GCS: MAV_RESULT_ACCEPTED
442+
Note over GCS: Set streaming rate CAMERA_TRACKING_GEO_STATUS<br>(support is assume here)
443+
GCS->>Camera: MAV_CMD_SET_MESSAGE_INTERVAL(param1=276,param2=10,param7=1)
444+
Camera->>GCS: MAV_RESULT_ACCEPTED
445+
446+
Note over Camera,GCS: Camera streams tracking information (pass to gimbal)
447+
Camera->>GCS: CAMERA_TRACKING_IMAGE_STATUS (1)
448+
Camera->>GCS: CAMERA_TRACKING_GEO_STATUS (1)
449+
450+
Camera->>GCS: ...
451+
Camera->>GCS: CAMERA_TRACKING_GEO_STATUS (n)
452+
Camera->>GCS: CAMERA_TRACKING_IMAGE_STATUS (n)
453+
454+
Note over Camera,GCS: GCS stops tracking and streaming when ready
455+
GCS->>Camera: MAV_CMD_CAMERA_STOP_TRACKING (1)
456+
Camera->>GCS: MAV_RESULT_ACCEPTED
457+
GCS->>Camera: MAV_CMD_SET_MESSAGE_INTERVAL(param1=275,param2=0,param7=1)
458+
Camera->>GCS: MAV_RESULT_ACCEPTED
459+
GCS->>Camera: MAV_CMD_SET_MESSAGE_INTERVAL(param1=276,param2=0,param7=1)
460+
Camera->>GCS: MAV_RESULT_ACCEPTED
461+
-->
430462

431463
The steps are:
432464

@@ -458,7 +490,7 @@ Other components like a GCS will typically only use the camera `BATTERY_STATUS.b
458490
| <a id="VIDEO_STREAM_STATUS"></a>[VIDEO_STREAM_STATUS](../messages/common.md#VIDEO_STREAM_STATUS) | Information updating a video stream configuration. <!-- TBD? --> |
459491
| <a id="storage_information"></a>[STORAGE_INFORMATION](../messages/common.md#STORAGE_INFORMATION) | Storage information (e.g. number and type of storage devices, total/used/available capacity, read/write speeds). |
460492
| <a id="CAMERA_CAPTURE_STATUS"></a>[CAMERA_CAPTURE_STATUS](../messages/common.md#CAMERA_CAPTURE_STATUS) | Camera capture status, including current capture type (if any), capture interval, available capacity. |
461-
| <a id="CAMERA_IMAGE_CAPTURED"></a>[CAMERA_IMAGE_CAPTURED](../messages/common.md#CAMERA_IMAGE_CAPTURED) | Information about image captured (returned to GPS every time an image is captured). |
493+
| <a id="CAMERA_IMAGE_CAPTURED"></a>[CAMERA_IMAGE_CAPTURED](../messages/common.md#CAMERA_IMAGE_CAPTURED) | Information about image captured (returned to GCS every time an image is captured). |
462494
| <a id="CAMERA_FOV_STATUS"></a>[CAMERA_FOV_STATUS](../messages/common.md#CAMERA_FOV_STATUS) | Information about the field of view of a camera. Requested using [MAV_CMD_REQUEST_MESSAGE](#MAV_CMD_REQUEST_MESSAGE). |
463495
| <a id="CAMERA_TRACKING_IMAGE_STATUS"></a>[CAMERA_TRACKING_IMAGE_STATUS](../messages/common.md#CAMERA_TRACKING_IMAGE_STATUS) | Camera tracking status, sent while in active tracking. Use [MAV_CMD_SET_MESSAGE_INTERVAL](../messages/common.md#MAV_CMD_SET_MESSAGE_INTERVAL) to define message interval. |
464496
| <a id="CAMERA_TRACKING_GEO_STATUS"></a>[CAMERA_TRACKING_GEO_STATUS](../messages/common.md#CAMERA_TRACKING_GEO_STATUS) | Camera tracking status, sent while in active tracking. Use [MAV_CMD_SET_MESSAGE_INTERVAL](../messages/common.md#MAV_CMD_SET_MESSAGE_INTERVAL) to define message interval. |
@@ -518,4 +550,4 @@ The transition works like this:
518550

519551
1. Cameras need to handle both approaches for now (i.e. support both new generic and old specific commands).
520552
2. Ground stations will move from using the old specific commands to using both. They can try the new one and if they don't get an answer within a timeout they need to fall back to the previous command.
521-
3. After the new commands have been established in server and ground stations, the old specific commands may be removed from the implementations.
553+
3. After the new commands have been established in servers and ground stations, the old specific commands may be removed from the implementations.

‎ko/services/gimbal_v2.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ graph LR
7777

7878
[![](https://mermaid.ink/img/eyJjb2RlIjoiZ3JhcGggTFJcblx0YXBbXCJBdXRvcGlsb3RcIl1cblx0Z1tcIkNhbWVyYSAvIEdpbWJhbCAoR2ltYmFsIE1hbmFnZXIpXCJdXG5cdGdjc1tcIkdyb3VuZCBTdGF0aW9uXCJdXG5cdGFwIC0tLXxcIkdpbWJhbCBtYW5hZ2VyIG1lc3NhZ2VzXCJ8IGdcblx0Z2NzIC0tLXxcIkdpbWJhbCBtYW5hZ2VyIG1lc3NhZ2VzXCJ8ZyIsIm1lcm1haWQiOnsidGhlbWUiOiJkZWZhdWx0In0sInVwZGF0ZUVkaXRvciI6ZmFsc2V9)](https://mermaid-js.github.io/mermaid-live-editor/#/edit/eyJjb2RlIjoiZ3JhcGggTFJcblx0YXBbXCJBdXRvcGlsb3RcIl1cblx0Z1tcIkNhbWVyYSAvIEdpbWJhbCAoR2ltYmFsIE1hbmFnZXIpXCJdXG5cdGdjc1tcIkdyb3VuZCBTdGF0aW9uXCJdXG5cdGFwIC0tLXxcIkdpbWJhbCBtYW5hZ2VyIG1lc3NhZ2VzXCJ8IGdcblx0Z2NzIC0tLXxcIkdpbWJhbCBtYW5hZ2VyIG1lc3NhZ2VzXCJ8ZyIsIm1lcm1haWQiOnsidGhlbWUiOiJkZWZhdWx0In0sInVwZGF0ZUVkaXRvciI6ZmFsc2V9)
7979

80-
#### Onboard Computer with Camera and Gimbal Connected to Autopilot
80+
#### Onboard Computer with Gimbal Connected to Autopilot
8181

8282
In this set-up the _Gimbal Manager_ can be on the onboard computer.
8383

0 commit comments

Comments
 (0)