Skip to content

C
C-Astral dialect C library
Commit e52ea941 authored by PX4BuildBot's avatar PX4BuildBot
Browse files
Options

autogenerated headers for rev... 

autogenerated headers for rev https://github.com/mavlink/mavlink/tree/524f7158181752c2bee2f0666c94051d93d6a6b3
parent 4ecf1687
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 46 deletions
common/mavlink_msg_camera_capture_status.h
View file @ e52ea941
......@@ -8,7 +8,7 @@ typedef struct __mavlink_camera_capture_status_t {
uint32_t time_boot_ms; /*< [ms] Timestamp (time since system boot).*/
float image_interval; /*< [s] Image capture interval*/
uint32_t recording_time_ms; /*< [ms] Time since recording started*/
float available_capacity; /*< [Mibytes] Available storage capacity*/
float available_capacity; /*< [MiB] Available storage capacity.*/
uint8_t image_status; /*< Current status of image capturing (0: idle, 1: capture in progress, 2: interval set but idle, 3: interval set and capture in progress)*/
uint8_t video_status; /*< Current status of video capturing (0: idle, 1: capture in progress)*/
}) mavlink_camera_capture_status_t;
......@@ -61,7 +61,7 @@ typedef struct __mavlink_camera_capture_status_t {
* @param video_status Current status of video capturing (0: idle, 1: capture in progress)
* @param image_interval [s] Image capture interval
* @param recording_time_ms [ms] Time since recording started
* @param available_capacity [Mibytes] Available storage capacity
* @param available_capacity [MiB] Available storage capacity.
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_camera_capture_status_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
......@@ -104,7 +104,7 @@ static inline uint16_t mavlink_msg_camera_capture_status_pack(uint8_t system_id,
* @param video_status Current status of video capturing (0: idle, 1: capture in progress)
* @param image_interval [s] Image capture interval
* @param recording_time_ms [ms] Time since recording started
* @param available_capacity [Mibytes] Available storage capacity
* @param available_capacity [MiB] Available storage capacity.
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_camera_capture_status_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
......@@ -173,7 +173,7 @@ static inline uint16_t mavlink_msg_camera_capture_status_encode_chan(uint8_t sys
* @param video_status Current status of video capturing (0: idle, 1: capture in progress)
* @param image_interval [s] Image capture interval
* @param recording_time_ms [ms] Time since recording started
* @param available_capacity [Mibytes] Available storage capacity
* @param available_capacity [MiB] Available storage capacity.
*/
#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
......@@ -308,7 +308,7 @@ static inline uint32_t mavlink_msg_camera_capture_status_get_recording_time_ms(c
/**
* @brief Get field available_capacity from camera_capture_status message
*
* @return [Mibytes] Available storage capacity
* @return [MiB] Available storage capacity.
*/
static inline float mavlink_msg_camera_capture_status_get_available_capacity(const mavlink_message_t* msg)
{
......
common/mavlink_msg_storage_information.h
View file @ e52ea941
......@@ -6,11 +6,11 @@
MAVPACKED(
typedef struct __mavlink_storage_information_t {
uint32_t time_boot_ms; /*< [ms] Timestamp (time since system boot).*/
float total_capacity; /*< [Mibytes] Total capacity*/
float used_capacity; /*< [Mibytes] Used capacity*/
float available_capacity; /*< [Mibytes] Available capacity*/
float read_speed; /*< [Mibytes/s] Read speed*/
float write_speed; /*< [Mibytes/s] Write speed*/
float total_capacity; /*< [MiB] Total capacity.*/
float used_capacity; /*< [MiB] Used capacity.*/
float available_capacity; /*< [MiB] Available storage capacity.*/
float read_speed; /*< [MiB/s] Read speed.*/
float write_speed; /*< [MiB/s] Write speed.*/
uint8_t storage_id; /*< Storage ID (1 for first, 2 for second, etc.)*/
uint8_t storage_count; /*< Number of storage devices*/
uint8_t status; /*< Status of storage (0 not available, 1 unformatted, 2 formatted)*/
......@@ -69,11 +69,11 @@ typedef struct __mavlink_storage_information_t {
* @param storage_id Storage ID (1 for first, 2 for second, etc.)
* @param storage_count Number of storage devices
* @param status Status of storage (0 not available, 1 unformatted, 2 formatted)
* @param total_capacity [Mibytes] Total capacity
* @param used_capacity [Mibytes] Used capacity
* @param available_capacity [Mibytes] Available capacity
* @param read_speed [Mibytes/s] Read speed
* @param write_speed [Mibytes/s] Write speed
* @param total_capacity [MiB] Total capacity.
* @param used_capacity [MiB] Used capacity.
* @param available_capacity [MiB] Available storage capacity.
* @param read_speed [MiB/s] Read speed.
* @param write_speed [MiB/s] Write speed.
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_storage_information_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
......@@ -121,11 +121,11 @@ static inline uint16_t mavlink_msg_storage_information_pack(uint8_t system_id, u
* @param storage_id Storage ID (1 for first, 2 for second, etc.)
* @param storage_count Number of storage devices
* @param status Status of storage (0 not available, 1 unformatted, 2 formatted)
* @param total_capacity [Mibytes] Total capacity
* @param used_capacity [Mibytes] Used capacity
* @param available_capacity [Mibytes] Available capacity
* @param read_speed [Mibytes/s] Read speed
* @param write_speed [Mibytes/s] Write speed
* @param total_capacity [MiB] Total capacity.
* @param used_capacity [MiB] Used capacity.
* @param available_capacity [MiB] Available storage capacity.
* @param read_speed [MiB/s] Read speed.
* @param write_speed [MiB/s] Write speed.
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_storage_information_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
......@@ -199,11 +199,11 @@ static inline uint16_t mavlink_msg_storage_information_encode_chan(uint8_t syste
* @param storage_id Storage ID (1 for first, 2 for second, etc.)
* @param storage_count Number of storage devices
* @param status Status of storage (0 not available, 1 unformatted, 2 formatted)
* @param total_capacity [Mibytes] Total capacity
* @param used_capacity [Mibytes] Used capacity
* @param available_capacity [Mibytes] Available capacity
* @param read_speed [Mibytes/s] Read speed
* @param write_speed [Mibytes/s] Write speed
* @param total_capacity [MiB] Total capacity.
* @param used_capacity [MiB] Used capacity.
* @param available_capacity [MiB] Available storage capacity.
* @param read_speed [MiB/s] Read speed.
* @param write_speed [MiB/s] Write speed.
*/
#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
......@@ -340,7 +340,7 @@ static inline uint8_t mavlink_msg_storage_information_get_status(const mavlink_m
/**
* @brief Get field total_capacity from storage_information message
*
* @return [Mibytes] Total capacity
* @return [MiB] Total capacity.
*/
static inline float mavlink_msg_storage_information_get_total_capacity(const mavlink_message_t* msg)
{
......@@ -350,7 +350,7 @@ static inline float mavlink_msg_storage_information_get_total_capacity(const mav
/**
* @brief Get field used_capacity from storage_information message
*
* @return [Mibytes] Used capacity
* @return [MiB] Used capacity.
*/
static inline float mavlink_msg_storage_information_get_used_capacity(const mavlink_message_t* msg)
{
......@@ -360,7 +360,7 @@ static inline float mavlink_msg_storage_information_get_used_capacity(const mavl
/**
* @brief Get field available_capacity from storage_information message
*
* @return [Mibytes] Available capacity
* @return [MiB] Available storage capacity.
*/
static inline float mavlink_msg_storage_information_get_available_capacity(const mavlink_message_t* msg)
{
......@@ -370,7 +370,7 @@ static inline float mavlink_msg_storage_information_get_available_capacity(const
/**
* @brief Get field read_speed from storage_information message
*
* @return [Mibytes/s] Read speed
* @return [MiB/s] Read speed.
*/
static inline float mavlink_msg_storage_information_get_read_speed(const mavlink_message_t* msg)
{
......@@ -380,7 +380,7 @@ static inline float mavlink_msg_storage_information_get_read_speed(const mavlink
/**
* @brief Get field write_speed from storage_information message
*
* @return [Mibytes/s] Write speed
* @return [MiB/s] Write speed.
*/
static inline float mavlink_msg_storage_information_get_write_speed(const mavlink_message_t* msg)
{
......
mavlink_helpers.h
View file @ e52ea941
......@@ -819,14 +819,18 @@ MAVLINK_HELPER uint8_t mavlink_frame_char_buffer(mavlink_message_t* rxmsg,
status->packet_rx_success_count++;
}
r_message->len = rxmsg->len; // Provide visibility on how far we are into current msg
r_mavlink_status->parse_state = status->parse_state;
r_mavlink_status->packet_idx = status->packet_idx;
r_mavlink_status->current_rx_seq = status->current_rx_seq+1;
r_mavlink_status->packet_rx_success_count = status->packet_rx_success_count;
r_mavlink_status->packet_rx_drop_count = status->parse_error;
r_mavlink_status->flags = status->flags;
status->parse_error = 0;
if (NULL != r_message) {
r_message->len = rxmsg->len; // Provide visibility on how far we are into current msg
}
if (NULL != r_mavlink_status) {
r_mavlink_status->parse_state = status->parse_state;
r_mavlink_status->packet_idx = status->packet_idx;
r_mavlink_status->current_rx_seq = status->current_rx_seq+1;
r_mavlink_status->packet_rx_success_count = status->packet_rx_success_count;
r_mavlink_status->packet_rx_drop_count = status->parse_error;
r_mavlink_status->flags = status->flags;
}
status->parse_error = 0;
if (status->msg_received == MAVLINK_FRAMING_BAD_CRC) {
/*
......@@ -836,7 +840,9 @@ MAVLINK_HELPER uint8_t mavlink_frame_char_buffer(mavlink_message_t* rxmsg,
mavlink_msg_to_send_buffer() won't overwrite the
checksum
*/
r_message->checksum = rxmsg->ck[0] | (rxmsg->ck[1]<<8);
if (NULL != r_message)
r_message->checksum = rxmsg->ck[0] | (rxmsg->ck[1]<<8);
}
}
return status->msg_received;
......
message_definitions/common.xml
View file @ e52ea941
......@@ -4520,20 +4520,20 @@
<field type="uint8_t" name="storage_id">Storage ID (1 for first, 2 for second, etc.)</field>
<field type="uint8_t" name="storage_count">Number of storage devices</field>
<field type="uint8_t" name="status">Status of storage (0 not available, 1 unformatted, 2 formatted)</field>
<field type="float" name="total_capacity" units="Mibytes">Total capacity</field>
<field type="float" name="used_capacity" units="Mibytes">Used capacity</field>
<field type="float" name="available_capacity" units="Mibytes">Available capacity</field>
<field type="float" name="read_speed" units="Mibytes/s">Read speed</field>
<field type="float" name="write_speed" units="Mibytes/s">Write speed</field>
<field type="float" name="total_capacity" units="MiB">Total capacity.</field>
<field type="float" name="used_capacity" units="MiB">Used capacity.</field>
<field type="float" name="available_capacity" units="MiB">Available storage capacity.</field>
<field type="float" name="read_speed" units="MiB/s">Read speed.</field>
<field type="float" name="write_speed" units="MiB/s">Write speed.</field>
</message>
<message id="262" name="CAMERA_CAPTURE_STATUS">
<description>Information about the status of a capture</description>
<description>Information about the status of a capture.</description>
<field type="uint32_t" name="time_boot_ms" units="ms">Timestamp (time since system boot).</field>
<field type="uint8_t" name="image_status">Current status of image capturing (0: idle, 1: capture in progress, 2: interval set but idle, 3: interval set and capture in progress)</field>
<field type="uint8_t" name="video_status">Current status of video capturing (0: idle, 1: capture in progress)</field>
<field type="float" name="image_interval" units="s">Image capture interval</field>
<field type="uint32_t" name="recording_time_ms" units="ms">Time since recording started</field>
<field type="float" name="available_capacity" units="Mibytes">Available storage capacity</field>
<field type="float" name="available_capacity" units="MiB">Available storage capacity.</field>
</message>
<message id="263" name="CAMERA_IMAGE_CAPTURED">
<description>Information about a captured image</description>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7