Skip to content

Q
qgroundcontrol
Commit 44d3d10d authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Merged with master

parents f7785989 cffcb346
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2562 additions and 34508 deletions
mavlink/include/mavlink/v0.9/ardupilotmega/mavlink_msg_dcm.h deleted 100644 → 0
View file @ f7785989
// MESSAGE DCM PACKING
#define MAVLINK_MSG_ID_DCM 163
typedef struct __mavlink_dcm_t
{
float omegaIx; ///< X gyro drift estimate rad/s
float omegaIy; ///< Y gyro drift estimate rad/s
float omegaIz; ///< Z gyro drift estimate rad/s
float accel_weight; ///< average accel_weight
float renorm_val; ///< average renormalisation value
float error_rp; ///< average error_roll_pitch value
float error_yaw; ///< average error_yaw value
} mavlink_dcm_t;
#define MAVLINK_MSG_ID_DCM_LEN 28
#define MAVLINK_MSG_ID_163_LEN 28
#define MAVLINK_MESSAGE_INFO_DCM { \
"DCM", \
7, \
{ { "omegaIx", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_dcm_t, omegaIx) }, \
{ "omegaIy", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_dcm_t, omegaIy) }, \
{ "omegaIz", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_dcm_t, omegaIz) }, \
{ "accel_weight", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_dcm_t, accel_weight) }, \
{ "renorm_val", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_dcm_t, renorm_val) }, \
{ "error_rp", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_dcm_t, error_rp) }, \
{ "error_yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_dcm_t, error_yaw) }, \
} \
}
/**
* @brief Pack a dcm message
* @param system_id ID of this system
* @param component_id ID of this component (e.g. 200 for IMU)
* @param msg The MAVLink message to compress the data into
*
* @param omegaIx X gyro drift estimate rad/s
* @param omegaIy Y gyro drift estimate rad/s
* @param omegaIz Z gyro drift estimate rad/s
* @param accel_weight average accel_weight
* @param renorm_val average renormalisation value
* @param error_rp average error_roll_pitch value
* @param error_yaw average error_yaw value
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_dcm_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
float omegaIx, float omegaIy, float omegaIz, float accel_weight, float renorm_val, float error_rp, float error_yaw)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[28];
_mav_put_float(buf, 0, omegaIx);
_mav_put_float(buf, 4, omegaIy);
_mav_put_float(buf, 8, omegaIz);
_mav_put_float(buf, 12, accel_weight);
_mav_put_float(buf, 16, renorm_val);
_mav_put_float(buf, 20, error_rp);
_mav_put_float(buf, 24, error_yaw);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 28);
#else
mavlink_dcm_t packet;
packet.omegaIx = omegaIx;
packet.omegaIy = omegaIy;
packet.omegaIz = omegaIz;
packet.accel_weight = accel_weight;
packet.renorm_val = renorm_val;
packet.error_rp = error_rp;
packet.error_yaw = error_yaw;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 28);
#endif
msg->msgid = MAVLINK_MSG_ID_DCM;
return mavlink_finalize_message(msg, system_id, component_id, 28);
}
/**
* @brief Pack a dcm message on a channel
* @param system_id ID of this system
* @param component_id ID of this component (e.g. 200 for IMU)
* @param chan The MAVLink channel this message was sent over
* @param msg The MAVLink message to compress the data into
* @param omegaIx X gyro drift estimate rad/s
* @param omegaIy Y gyro drift estimate rad/s
* @param omegaIz Z gyro drift estimate rad/s
* @param accel_weight average accel_weight
* @param renorm_val average renormalisation value
* @param error_rp average error_roll_pitch value
* @param error_yaw average error_yaw value
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_dcm_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
mavlink_message_t* msg,
float omegaIx,float omegaIy,float omegaIz,float accel_weight,float renorm_val,float error_rp,float error_yaw)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[28];
_mav_put_float(buf, 0, omegaIx);
_mav_put_float(buf, 4, omegaIy);
_mav_put_float(buf, 8, omegaIz);
_mav_put_float(buf, 12, accel_weight);
_mav_put_float(buf, 16, renorm_val);
_mav_put_float(buf, 20, error_rp);
_mav_put_float(buf, 24, error_yaw);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 28);
#else
mavlink_dcm_t packet;
packet.omegaIx = omegaIx;
packet.omegaIy = omegaIy;
packet.omegaIz = omegaIz;
packet.accel_weight = accel_weight;
packet.renorm_val = renorm_val;
packet.error_rp = error_rp;
packet.error_yaw = error_yaw;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 28);
#endif
msg->msgid = MAVLINK_MSG_ID_DCM;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 28);
}
/**
* @brief Encode a dcm struct into a message
*
* @param system_id ID of this system
* @param component_id ID of this component (e.g. 200 for IMU)
* @param msg The MAVLink message to compress the data into
* @param dcm C-struct to read the message contents from
*/
static inline uint16_t mavlink_msg_dcm_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_dcm_t* dcm)
{
return mavlink_msg_dcm_pack(system_id, component_id, msg, dcm->omegaIx, dcm->omegaIy, dcm->omegaIz, dcm->accel_weight, dcm->renorm_val, dcm->error_rp, dcm->error_yaw);
}
/**
* @brief Send a dcm message
* @param chan MAVLink channel to send the message
*
* @param omegaIx X gyro drift estimate rad/s
* @param omegaIy Y gyro drift estimate rad/s
* @param omegaIz Z gyro drift estimate rad/s
* @param accel_weight average accel_weight
* @param renorm_val average renormalisation value
* @param error_rp average error_roll_pitch value
* @param error_yaw average error_yaw value
*/
#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
static inline void mavlink_msg_dcm_send(mavlink_channel_t chan, float omegaIx, float omegaIy, float omegaIz, float accel_weight, float renorm_val, float error_rp, float error_yaw)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[28];
_mav_put_float(buf, 0, omegaIx);
_mav_put_float(buf, 4, omegaIy);
_mav_put_float(buf, 8, omegaIz);
_mav_put_float(buf, 12, accel_weight);
_mav_put_float(buf, 16, renorm_val);
_mav_put_float(buf, 20, error_rp);
_mav_put_float(buf, 24, error_yaw);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DCM, buf, 28);
#else
mavlink_dcm_t packet;
packet.omegaIx = omegaIx;
packet.omegaIy = omegaIy;
packet.omegaIz = omegaIz;
packet.accel_weight = accel_weight;
packet.renorm_val = renorm_val;
packet.error_rp = error_rp;
packet.error_yaw = error_yaw;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DCM, (const char *)&packet, 28);
#endif
}
#endif
// MESSAGE DCM UNPACKING
/**
* @brief Get field omegaIx from dcm message
*
* @return X gyro drift estimate rad/s
*/
static inline float mavlink_msg_dcm_get_omegaIx(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 0);
}
/**
* @brief Get field omegaIy from dcm message
*
* @return Y gyro drift estimate rad/s
*/
static inline float mavlink_msg_dcm_get_omegaIy(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 4);
}
/**
* @brief Get field omegaIz from dcm message
*
* @return Z gyro drift estimate rad/s
*/
static inline float mavlink_msg_dcm_get_omegaIz(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 8);
}
/**
* @brief Get field accel_weight from dcm message
*
* @return average accel_weight
*/
static inline float mavlink_msg_dcm_get_accel_weight(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 12);
}
/**
* @brief Get field renorm_val from dcm message
*
* @return average renormalisation value
*/
static inline float mavlink_msg_dcm_get_renorm_val(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 16);
}
/**
* @brief Get field error_rp from dcm message
*
* @return average error_roll_pitch value
*/
static inline float mavlink_msg_dcm_get_error_rp(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 20);
}
/**
* @brief Get field error_yaw from dcm message
*
* @return average error_yaw value
*/
static inline float mavlink_msg_dcm_get_error_yaw(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 24);
}
/**
* @brief Decode a dcm message into a struct
*
* @param msg The message to decode
* @param dcm C-struct to decode the message contents into
*/
static inline void mavlink_msg_dcm_decode(const mavlink_message_t* msg, mavlink_dcm_t* dcm)
{
#if MAVLINK_NEED_BYTE_SWAP
dcm->omegaIx = mavlink_msg_dcm_get_omegaIx(msg);
dcm->omegaIy = mavlink_msg_dcm_get_omegaIy(msg);
dcm->omegaIz = mavlink_msg_dcm_get_omegaIz(msg);
dcm->accel_weight = mavlink_msg_dcm_get_accel_weight(msg);
dcm->renorm_val = mavlink_msg_dcm_get_renorm_val(msg);
dcm->error_rp = mavlink_msg_dcm_get_error_rp(msg);
dcm->error_yaw = mavlink_msg_dcm_get_error_yaw(msg);
#else
memcpy(dcm, _MAV_PAYLOAD(msg), 28);
#endif
}
mavlink/include/mavlink/v0.9/ardupilotmega/version.h
View file @ 44d3d10d
......@@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Thu Apr 19 19:46:08 2012"
#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:46 2012"
#define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
......
mavlink/include/mavlink/v0.9/common/common.h
View file @ 44d3d10d
......@@ -43,6 +43,55 @@ extern "C" {
// ENUM DEFINITIONS
/** @brief Commands to be executed by the MAV. They can be executed on user request,
or as part of a mission script. If the action is used in a mission, the parameter mapping
to the waypoint/mission message is as follows:
Param 1, Param 2, Param 3, Param 4, X: Param 5, Y:Param 6, Z:Param 7. This command list is similar what
ARINC 424 is for commercial aircraft: A data format how to interpret waypoint/mission data. */
#ifndef HAVE_ENUM_MAV_CMD
#define HAVE_ENUM_MAV_CMD
enum MAV_CMD
{
MAV_CMD_NAV_WAYPOINT=16, /* Navigate to waypoint. |Hold time in decimal seconds. (ignored by fixed wing, time to stay at waypoint for rotary wing)| Acceptance radius in meters (if the sphere with this radius is hit, the waypoint counts as reached)| 0 to pass through the WP, if > 0 radius in meters to pass by WP. Positive value for clockwise orbit, negative value for counter-clockwise orbit. Allows trajectory control.| Desired yaw angle at waypoint (rotary wing)| Latitude| Longitude| Altitude| */
MAV_CMD_NAV_LOITER_UNLIM=17, /* Loiter around this waypoint an unlimited amount of time |Empty| Empty| Radius around waypoint, in meters. If positive loiter clockwise, else counter-clockwise| Desired yaw angle.| Latitude| Longitude| Altitude| */
MAV_CMD_NAV_LOITER_TURNS=18, /* Loiter around this waypoint for X turns |Turns| Empty| Radius around waypoint, in meters. If positive loiter clockwise, else counter-clockwise| Desired yaw angle.| Latitude| Longitude| Altitude| */
MAV_CMD_NAV_LOITER_TIME=19, /* Loiter around this waypoint for X seconds |Seconds (decimal)| Empty| Radius around waypoint, in meters. If positive loiter clockwise, else counter-clockwise| Desired yaw angle.| Latitude| Longitude| Altitude| */
MAV_CMD_NAV_RETURN_TO_LAUNCH=20, /* Return to launch location |Empty| Empty| Empty| Empty| Empty| Empty| Empty| */
MAV_CMD_NAV_LAND=21, /* Land at location |Empty| Empty| Empty| Desired yaw angle.| Latitude| Longitude| Altitude| */
MAV_CMD_NAV_TAKEOFF=22, /* Takeoff from ground / hand |Minimum pitch (if airspeed sensor present), desired pitch without sensor| Empty| Empty| Yaw angle (if magnetometer present), ignored without magnetometer| Latitude| Longitude| Altitude| */
MAV_CMD_NAV_ROI=80, /* Sets the region of interest (ROI) for a sensor set or the
vehicle itself. This can then be used by the vehicles control
system to control the vehicle attitude and the attitude of various
sensors such as cameras. |Region of intereset mode. (see MAV_ROI enum)| Waypoint index/ target ID. (see MAV_ROI enum)| ROI index (allows a vehicle to manage multiple ROI's)| Empty| x the location of the fixed ROI (see MAV_FRAME)| y| z| */
MAV_CMD_NAV_PATHPLANNING=81, /* Control autonomous path planning on the MAV. |0: Disable local obstacle avoidance / local path planning (without resetting map), 1: Enable local path planning, 2: Enable and reset local path planning| 0: Disable full path planning (without resetting map), 1: Enable, 2: Enable and reset map/occupancy grid, 3: Enable and reset planned route, but not occupancy grid| Empty| Yaw angle at goal, in compass degrees, [0..360]| Latitude/X of goal| Longitude/Y of goal| Altitude/Z of goal| */
MAV_CMD_NAV_LAST=95, /* NOP - This command is only used to mark the upper limit of the NAV/ACTION commands in the enumeration |Empty| Empty| Empty| Empty| Empty| Empty| Empty| */
MAV_CMD_CONDITION_DELAY=112, /* Delay mission state machine. |Delay in seconds (decimal)| Empty| Empty| Empty| Empty| Empty| Empty| */
MAV_CMD_CONDITION_CHANGE_ALT=113, /* Ascend/descend at rate. Delay mission state machine until desired altitude reached. |Descent / Ascend rate (m/s)| Empty| Empty| Empty| Empty| Empty| Finish Altitude| */
MAV_CMD_CONDITION_DISTANCE=114, /* Delay mission state machine until within desired distance of next NAV point. |Distance (meters)| Empty| Empty| Empty| Empty| Empty| Empty| */
MAV_CMD_CONDITION_YAW=115, /* Reach a certain target angle. |target angle: [0-360], 0 is north| speed during yaw change:[deg per second]| direction: negative: counter clockwise, positive: clockwise [-1,1]| relative offset or absolute angle: [ 1,0]| Empty| Empty| Empty| */
MAV_CMD_CONDITION_LAST=159, /* NOP - This command is only used to mark the upper limit of the CONDITION commands in the enumeration |Empty| Empty| Empty| Empty| Empty| Empty| Empty| */
MAV_CMD_DO_SET_MODE=176, /* Set system mode. |Mode, as defined by ENUM MAV_MODE| Empty| Empty| Empty| Empty| Empty| Empty| */
MAV_CMD_DO_JUMP=177, /* Jump to the desired command in the mission list. Repeat this action only the specified number of times |Sequence number| Repeat count| Empty| Empty| Empty| Empty| Empty| */
MAV_CMD_DO_CHANGE_SPEED=178, /* Change speed and/or throttle set points. |Speed type (0=Airspeed, 1=Ground Speed)| Speed (m/s, -1 indicates no change)| Throttle ( Percent, -1 indicates no change)| Empty| Empty| Empty| Empty| */
MAV_CMD_DO_SET_HOME=179, /* Changes the home location either to the current location or a specified location. |Use current (1=use current location, 0=use specified location)| Empty| Empty| Empty| Latitude| Longitude| Altitude| */
MAV_CMD_DO_SET_PARAMETER=180, /* Set a system parameter. Caution! Use of this command requires knowledge of the numeric enumeration value of the parameter. |Parameter number| Parameter value| Empty| Empty| Empty| Empty| Empty| */
MAV_CMD_DO_SET_RELAY=181, /* Set a relay to a condition. |Relay number| Setting (1=on, 0=off, others possible depending on system hardware)| Empty| Empty| Empty| Empty| Empty| */
MAV_CMD_DO_REPEAT_RELAY=182, /* Cycle a relay on and off for a desired number of cyles with a desired period. |Relay number| Cycle count| Cycle time (seconds, decimal)| Empty| Empty| Empty| Empty| */
MAV_CMD_DO_SET_SERVO=183, /* Set a servo to a desired PWM value. |Servo number| PWM (microseconds, 1000 to 2000 typical)| Empty| Empty| Empty| Empty| Empty| */
MAV_CMD_DO_REPEAT_SERVO=184, /* Cycle a between its nominal setting and a desired PWM for a desired number of cycles with a desired period. |Servo number| PWM (microseconds, 1000 to 2000 typical)| Cycle count| Cycle time (seconds)| Empty| Empty| Empty| */
MAV_CMD_DO_CONTROL_VIDEO=200, /* Control onboard camera capturing. |Camera ID (-1 for all)| Transmission: 0: disabled, 1: enabled compressed, 2: enabled raw| Transmission mode: 0: video stream, >0: single images every n seconds (decimal)| Recording: 0: disabled, 1: enabled compressed, 2: enabled raw| Empty| Empty| Empty| */
MAV_CMD_DO_SET_ROI=201, /* Sets the region of interest (ROI) for a sensor set or the
vehicle itself. This can then be used by the vehicles control
system to control the vehicle attitude and the attitude of various
devices such as cameras.
|Region of interest mode. (see MAV_ROI enum)| Waypoint index/ target ID. (see MAV_ROI enum)| ROI index (allows a vehicle to manage multiple cameras etc.)| Empty| x the location of the fixed ROI (see MAV_FRAME)| y| z| */
MAV_CMD_DO_LAST=240, /* NOP - This command is only used to mark the upper limit of the DO commands in the enumeration |Empty| Empty| Empty| Empty| Empty| Empty| Empty| */
MAV_CMD_PREFLIGHT_CALIBRATION=241, /* Trigger calibration. This command will be only accepted if in pre-flight mode. |Gyro calibration: 0: no, 1: yes| Magnetometer calibration: 0: no, 1: yes| Ground pressure: 0: no, 1: yes| Radio calibration: 0: no, 1: yes| Empty| Empty| Empty| */
MAV_CMD_PREFLIGHT_STORAGE=245, /* Request storage of different parameter values and logs. This command will be only accepted if in pre-flight mode. |Parameter storage: 0: READ FROM FLASH/EEPROM, 1: WRITE CURRENT TO FLASH/EEPROM| Mission storage: 0: READ FROM FLASH/EEPROM, 1: WRITE CURRENT TO FLASH/EEPROM| Reserved| Reserved| Empty| Empty| Empty| */
MAV_CMD_ENUM_END=246, /* | */
};
#endif
/** @brief Data stream IDs. A data stream is not a fixed set of messages, but rather a
recommendation to the autopilot software. Individual autopilots may or may not obey
the recommended messages.
......
mavlink/include/mavlink/v0.9/common/version.h
View file @ 44d3d10d
......@@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Thu Apr 19 19:46:08 2012"
#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:54 2012"
#define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
......
mavlink/include/mavlink/v0.9/mavlink_types.h
View file @ 44d3d10d
......@@ -243,6 +243,7 @@ typedef struct __mavlink_message_info {
} mavlink_message_info_t;
#define _MAV_PAYLOAD(msg) ((char *)(&(msg)->payload64[0]))
#define _MAV_PAYLOAD_NON_CONST(msg) ((char *)(&((msg)->payload64[0])))
// checksum is immediately after the payload bytes
#define mavlink_ck_a(msg) *(msg->len + (uint8_t *)_MAV_PAYLOAD(msg))
......
mavlink/include/mavlink/v0.9/minimal/version.h
View file @ 44d3d10d
......@@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Thu Apr 19 19:43:27 2012"
#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:49 2012"
#define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 3
......
mavlink/include/v1.0/pixhawk/mavlink.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink.h
View file @ 44d3d10d
......@@ -6,19 +6,19 @@
#define MAVLINK_H
#ifndef MAVLINK_STX
#define MAVLINK_STX 254
#define MAVLINK_STX 85
#endif
#ifndef MAVLINK_ENDIAN
#define MAVLINK_ENDIAN MAVLINK_LITTLE_ENDIAN
#define MAVLINK_ENDIAN MAVLINK_BIG_ENDIAN
#endif
#ifndef MAVLINK_ALIGNED_FIELDS
#define MAVLINK_ALIGNED_FIELDS 1
#define MAVLINK_ALIGNED_FIELDS 0
#endif
#ifndef MAVLINK_CRC_EXTRA
#define MAVLINK_CRC_EXTRA 1
#define MAVLINK_CRC_EXTRA 0
#endif
#include "version.h"
......
mavlink/include/v1.0/pixhawk/mavlink_msg_attitude_control.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_attitude_control.h
View file @ 44d3d10d
......@@ -4,11 +4,11 @@
typedef struct __mavlink_attitude_control_t
{
uint8_t target; ///< The system to be controlled
float roll; ///< roll
float pitch; ///< pitch
float yaw; ///< yaw
float thrust; ///< thrust
uint8_t target; ///< The system to be controlled
uint8_t roll_manual; ///< roll control enabled auto:0, manual:1
uint8_t pitch_manual; ///< pitch auto:0, manual:1
uint8_t yaw_manual; ///< yaw auto:0, manual:1
......@@ -23,11 +23,11 @@ typedef struct __mavlink_attitude_control_t
#define MAVLINK_MESSAGE_INFO_ATTITUDE_CONTROL { \
"ATTITUDE_CONTROL", \
9, \
{ { "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_attitude_control_t, roll) }, \
{ "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_attitude_control_t, pitch) }, \
{ "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_attitude_control_t, yaw) }, \
{ "thrust", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_attitude_control_t, thrust) }, \
{ "target", NULL, MAVLINK_TYPE_UINT8_T, 0, 16, offsetof(mavlink_attitude_control_t, target) }, \
{ { "target", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_attitude_control_t, target) }, \
{ "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 1, offsetof(mavlink_attitude_control_t, roll) }, \
{ "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 5, offsetof(mavlink_attitude_control_t, pitch) }, \
{ "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 9, offsetof(mavlink_attitude_control_t, yaw) }, \
{ "thrust", NULL, MAVLINK_TYPE_FLOAT, 0, 13, offsetof(mavlink_attitude_control_t, thrust) }, \
{ "roll_manual", NULL, MAVLINK_TYPE_UINT8_T, 0, 17, offsetof(mavlink_attitude_control_t, roll_manual) }, \
{ "pitch_manual", NULL, MAVLINK_TYPE_UINT8_T, 0, 18, offsetof(mavlink_attitude_control_t, pitch_manual) }, \
{ "yaw_manual", NULL, MAVLINK_TYPE_UINT8_T, 0, 19, offsetof(mavlink_attitude_control_t, yaw_manual) }, \
......@@ -58,11 +58,11 @@ static inline uint16_t mavlink_msg_attitude_control_pack(uint8_t system_id, uint
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[21];
_mav_put_float(buf, 0, roll);
_mav_put_float(buf, 4, pitch);
_mav_put_float(buf, 8, yaw);
_mav_put_float(buf, 12, thrust);
_mav_put_uint8_t(buf, 16, target);
_mav_put_uint8_t(buf, 0, target);
_mav_put_float(buf, 1, roll);
_mav_put_float(buf, 5, pitch);
_mav_put_float(buf, 9, yaw);
_mav_put_float(buf, 13, thrust);
_mav_put_uint8_t(buf, 17, roll_manual);
_mav_put_uint8_t(buf, 18, pitch_manual);
_mav_put_uint8_t(buf, 19, yaw_manual);
......@@ -71,11 +71,11 @@ static inline uint16_t mavlink_msg_attitude_control_pack(uint8_t system_id, uint
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 21);
#else
mavlink_attitude_control_t packet;
packet.target = target;
packet.roll = roll;
packet.pitch = pitch;
packet.yaw = yaw;
packet.thrust = thrust;
packet.target = target;
packet.roll_manual = roll_manual;
packet.pitch_manual = pitch_manual;
packet.yaw_manual = yaw_manual;
......@@ -85,7 +85,7 @@ static inline uint16_t mavlink_msg_attitude_control_pack(uint8_t system_id, uint
#endif
msg->msgid = MAVLINK_MSG_ID_ATTITUDE_CONTROL;
return mavlink_finalize_message(msg, system_id, component_id, 21, 254);
return mavlink_finalize_message(msg, system_id, component_id, 21);
}
/**
......@@ -111,11 +111,11 @@ static inline uint16_t mavlink_msg_attitude_control_pack_chan(uint8_t system_id,
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[21];
_mav_put_float(buf, 0, roll);
_mav_put_float(buf, 4, pitch);
_mav_put_float(buf, 8, yaw);
_mav_put_float(buf, 12, thrust);
_mav_put_uint8_t(buf, 16, target);
_mav_put_uint8_t(buf, 0, target);
_mav_put_float(buf, 1, roll);
_mav_put_float(buf, 5, pitch);
_mav_put_float(buf, 9, yaw);
_mav_put_float(buf, 13, thrust);
_mav_put_uint8_t(buf, 17, roll_manual);
_mav_put_uint8_t(buf, 18, pitch_manual);
_mav_put_uint8_t(buf, 19, yaw_manual);
......@@ -124,11 +124,11 @@ static inline uint16_t mavlink_msg_attitude_control_pack_chan(uint8_t system_id,
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 21);
#else
mavlink_attitude_control_t packet;
packet.target = target;
packet.roll = roll;
packet.pitch = pitch;
packet.yaw = yaw;
packet.thrust = thrust;
packet.target = target;
packet.roll_manual = roll_manual;
packet.pitch_manual = pitch_manual;
packet.yaw_manual = yaw_manual;
......@@ -138,7 +138,7 @@ static inline uint16_t mavlink_msg_attitude_control_pack_chan(uint8_t system_id,
#endif
msg->msgid = MAVLINK_MSG_ID_ATTITUDE_CONTROL;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 21, 254);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 21);
}
/**
......@@ -174,30 +174,30 @@ static inline void mavlink_msg_attitude_control_send(mavlink_channel_t chan, uin
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[21];
_mav_put_float(buf, 0, roll);
_mav_put_float(buf, 4, pitch);
_mav_put_float(buf, 8, yaw);
_mav_put_float(buf, 12, thrust);
_mav_put_uint8_t(buf, 16, target);
_mav_put_uint8_t(buf, 0, target);
_mav_put_float(buf, 1, roll);
_mav_put_float(buf, 5, pitch);
_mav_put_float(buf, 9, yaw);
_mav_put_float(buf, 13, thrust);
_mav_put_uint8_t(buf, 17, roll_manual);
_mav_put_uint8_t(buf, 18, pitch_manual);
_mav_put_uint8_t(buf, 19, yaw_manual);
_mav_put_uint8_t(buf, 20, thrust_manual);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ATTITUDE_CONTROL, buf, 21, 254);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ATTITUDE_CONTROL, buf, 21);
#else
mavlink_attitude_control_t packet;
packet.target = target;
packet.roll = roll;
packet.pitch = pitch;
packet.yaw = yaw;
packet.thrust = thrust;
packet.target = target;
packet.roll_manual = roll_manual;
packet.pitch_manual = pitch_manual;
packet.yaw_manual = yaw_manual;
packet.thrust_manual = thrust_manual;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ATTITUDE_CONTROL, (const char *)&packet, 21, 254);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ATTITUDE_CONTROL, (const char *)&packet, 21);
#endif
}
......@@ -213,7 +213,7 @@ static inline void mavlink_msg_attitude_control_send(mavlink_channel_t chan, uin
*/
static inline uint8_t mavlink_msg_attitude_control_get_target(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 16);
return _MAV_RETURN_uint8_t(msg, 0);
}
/**
......@@ -223,7 +223,7 @@ static inline uint8_t mavlink_msg_attitude_control_get_target(const mavlink_mess
*/
static inline float mavlink_msg_attitude_control_get_roll(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 0);
return _MAV_RETURN_float(msg, 1);
}
/**
......@@ -233,7 +233,7 @@ static inline float mavlink_msg_attitude_control_get_roll(const mavlink_message_
*/
static inline float mavlink_msg_attitude_control_get_pitch(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 4);
return _MAV_RETURN_float(msg, 5);
}
/**
......@@ -243,7 +243,7 @@ static inline float mavlink_msg_attitude_control_get_pitch(const mavlink_message
*/
static inline float mavlink_msg_attitude_control_get_yaw(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 8);
return _MAV_RETURN_float(msg, 9);
}
/**
......@@ -253,7 +253,7 @@ static inline float mavlink_msg_attitude_control_get_yaw(const mavlink_message_t
*/
static inline float mavlink_msg_attitude_control_get_thrust(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 12);
return _MAV_RETURN_float(msg, 13);
}
/**
......@@ -305,11 +305,11 @@ static inline uint8_t mavlink_msg_attitude_control_get_thrust_manual(const mavli
static inline void mavlink_msg_attitude_control_decode(const mavlink_message_t* msg, mavlink_attitude_control_t* attitude_control)
{
#if MAVLINK_NEED_BYTE_SWAP
attitude_control->target = mavlink_msg_attitude_control_get_target(msg);
attitude_control->roll = mavlink_msg_attitude_control_get_roll(msg);
attitude_control->pitch = mavlink_msg_attitude_control_get_pitch(msg);
attitude_control->yaw = mavlink_msg_attitude_control_get_yaw(msg);
attitude_control->thrust = mavlink_msg_attitude_control_get_thrust(msg);
attitude_control->target = mavlink_msg_attitude_control_get_target(msg);
attitude_control->roll_manual = mavlink_msg_attitude_control_get_roll_manual(msg);
attitude_control->pitch_manual = mavlink_msg_attitude_control_get_pitch_manual(msg);
attitude_control->yaw_manual = mavlink_msg_attitude_control_get_yaw_manual(msg);
......
mavlink/include/v1.0/pixhawk/mavlink_msg_brief_feature.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_brief_feature.h
View file @ 44d3d10d
......@@ -7,11 +7,11 @@ typedef struct __mavlink_brief_feature_t
float x; ///< x position in m
float y; ///< y position in m
float z; ///< z position in m
float response; ///< Harris operator response at this location
uint8_t orientation_assignment; ///< Orientation assignment 0: false, 1:true
uint16_t size; ///< Size in pixels
uint16_t orientation; ///< Orientation
uint8_t orientation_assignment; ///< Orientation assignment 0: false, 1:true
uint8_t descriptor[32]; ///< Descriptor
float response; ///< Harris operator response at this location
} mavlink_brief_feature_t;
#define MAVLINK_MSG_ID_BRIEF_FEATURE_LEN 53
......@@ -25,11 +25,11 @@ typedef struct __mavlink_brief_feature_t
{ { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_brief_feature_t, x) }, \
{ "y", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_brief_feature_t, y) }, \
{ "z", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_brief_feature_t, z) }, \
{ "response", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_brief_feature_t, response) }, \
{ "size", NULL, MAVLINK_TYPE_UINT16_T, 0, 16, offsetof(mavlink_brief_feature_t, size) }, \
{ "orientation", NULL, MAVLINK_TYPE_UINT16_T, 0, 18, offsetof(mavlink_brief_feature_t, orientation) }, \
{ "orientation_assignment", NULL, MAVLINK_TYPE_UINT8_T, 0, 20, offsetof(mavlink_brief_feature_t, orientation_assignment) }, \
{ "descriptor", NULL, MAVLINK_TYPE_UINT8_T, 32, 21, offsetof(mavlink_brief_feature_t, descriptor) }, \
{ "orientation_assignment", NULL, MAVLINK_TYPE_UINT8_T, 0, 12, offsetof(mavlink_brief_feature_t, orientation_assignment) }, \
{ "size", NULL, MAVLINK_TYPE_UINT16_T, 0, 13, offsetof(mavlink_brief_feature_t, size) }, \
{ "orientation", NULL, MAVLINK_TYPE_UINT16_T, 0, 15, offsetof(mavlink_brief_feature_t, orientation) }, \
{ "descriptor", NULL, MAVLINK_TYPE_UINT8_T, 32, 17, offsetof(mavlink_brief_feature_t, descriptor) }, \
{ "response", NULL, MAVLINK_TYPE_FLOAT, 0, 49, offsetof(mavlink_brief_feature_t, response) }, \
} \
}
......@@ -58,27 +58,27 @@ static inline uint16_t mavlink_msg_brief_feature_pack(uint8_t system_id, uint8_t
_mav_put_float(buf, 0, x);
_mav_put_float(buf, 4, y);
_mav_put_float(buf, 8, z);
_mav_put_float(buf, 12, response);
_mav_put_uint16_t(buf, 16, size);
_mav_put_uint16_t(buf, 18, orientation);
_mav_put_uint8_t(buf, 20, orientation_assignment);
_mav_put_uint8_t_array(buf, 21, descriptor, 32);
_mav_put_uint8_t(buf, 12, orientation_assignment);
_mav_put_uint16_t(buf, 13, size);
_mav_put_uint16_t(buf, 15, orientation);
_mav_put_float(buf, 49, response);
_mav_put_uint8_t_array(buf, 17, descriptor, 32);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 53);
#else
mavlink_brief_feature_t packet;
packet.x = x;
packet.y = y;
packet.z = z;
packet.response = response;
packet.orientation_assignment = orientation_assignment;
packet.size = size;
packet.orientation = orientation;
packet.orientation_assignment = orientation_assignment;
packet.response = response;
mav_array_memcpy(packet.descriptor, descriptor, sizeof(uint8_t)*32);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 53);
#endif
msg->msgid = MAVLINK_MSG_ID_BRIEF_FEATURE;
return mavlink_finalize_message(msg, system_id, component_id, 53, 88);
return mavlink_finalize_message(msg, system_id, component_id, 53);
}
/**
......@@ -106,27 +106,27 @@ static inline uint16_t mavlink_msg_brief_feature_pack_chan(uint8_t system_id, ui
_mav_put_float(buf, 0, x);
_mav_put_float(buf, 4, y);
_mav_put_float(buf, 8, z);
_mav_put_float(buf, 12, response);
_mav_put_uint16_t(buf, 16, size);
_mav_put_uint16_t(buf, 18, orientation);
_mav_put_uint8_t(buf, 20, orientation_assignment);
_mav_put_uint8_t_array(buf, 21, descriptor, 32);
_mav_put_uint8_t(buf, 12, orientation_assignment);
_mav_put_uint16_t(buf, 13, size);
_mav_put_uint16_t(buf, 15, orientation);
_mav_put_float(buf, 49, response);
_mav_put_uint8_t_array(buf, 17, descriptor, 32);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 53);
#else
mavlink_brief_feature_t packet;
packet.x = x;
packet.y = y;
packet.z = z;
packet.response = response;
packet.orientation_assignment = orientation_assignment;
packet.size = size;
packet.orientation = orientation;
packet.orientation_assignment = orientation_assignment;
packet.response = response;
mav_array_memcpy(packet.descriptor, descriptor, sizeof(uint8_t)*32);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 53);
#endif
msg->msgid = MAVLINK_MSG_ID_BRIEF_FEATURE;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 53, 88);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 53);
}
/**
......@@ -164,23 +164,23 @@ static inline void mavlink_msg_brief_feature_send(mavlink_channel_t chan, float
_mav_put_float(buf, 0, x);
_mav_put_float(buf, 4, y);
_mav_put_float(buf, 8, z);
_mav_put_float(buf, 12, response);
_mav_put_uint16_t(buf, 16, size);
_mav_put_uint16_t(buf, 18, orientation);
_mav_put_uint8_t(buf, 20, orientation_assignment);
_mav_put_uint8_t_array(buf, 21, descriptor, 32);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_BRIEF_FEATURE, buf, 53, 88);
_mav_put_uint8_t(buf, 12, orientation_assignment);
_mav_put_uint16_t(buf, 13, size);
_mav_put_uint16_t(buf, 15, orientation);
_mav_put_float(buf, 49, response);
_mav_put_uint8_t_array(buf, 17, descriptor, 32);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_BRIEF_FEATURE, buf, 53);
#else
mavlink_brief_feature_t packet;
packet.x = x;
packet.y = y;
packet.z = z;
packet.response = response;
packet.orientation_assignment = orientation_assignment;
packet.size = size;
packet.orientation = orientation;
packet.orientation_assignment = orientation_assignment;
packet.response = response;
mav_array_memcpy(packet.descriptor, descriptor, sizeof(uint8_t)*32);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_BRIEF_FEATURE, (const char *)&packet, 53, 88);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_BRIEF_FEATURE, (const char *)&packet, 53);
#endif
}
......@@ -226,7 +226,7 @@ static inline float mavlink_msg_brief_feature_get_z(const mavlink_message_t* msg
*/
static inline uint8_t mavlink_msg_brief_feature_get_orientation_assignment(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 20);
return _MAV_RETURN_uint8_t(msg, 12);
}
/**
......@@ -236,7 +236,7 @@ static inline uint8_t mavlink_msg_brief_feature_get_orientation_assignment(const
*/
static inline uint16_t mavlink_msg_brief_feature_get_size(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 16);
return _MAV_RETURN_uint16_t(msg, 13);
}
/**
......@@ -246,7 +246,7 @@ static inline uint16_t mavlink_msg_brief_feature_get_size(const mavlink_message_
*/
static inline uint16_t mavlink_msg_brief_feature_get_orientation(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 18);
return _MAV_RETURN_uint16_t(msg, 15);
}
/**
......@@ -256,7 +256,7 @@ static inline uint16_t mavlink_msg_brief_feature_get_orientation(const mavlink_m
*/
static inline uint16_t mavlink_msg_brief_feature_get_descriptor(const mavlink_message_t* msg, uint8_t *descriptor)
{
return _MAV_RETURN_uint8_t_array(msg, descriptor, 32, 21);
return _MAV_RETURN_uint8_t_array(msg, descriptor, 32, 17);
}
/**
......@@ -266,7 +266,7 @@ static inline uint16_t mavlink_msg_brief_feature_get_descriptor(const mavlink_me
*/
static inline float mavlink_msg_brief_feature_get_response(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 12);
return _MAV_RETURN_float(msg, 49);
}
/**
......@@ -281,11 +281,11 @@ static inline void mavlink_msg_brief_feature_decode(const mavlink_message_t* msg
brief_feature->x = mavlink_msg_brief_feature_get_x(msg);
brief_feature->y = mavlink_msg_brief_feature_get_y(msg);
brief_feature->z = mavlink_msg_brief_feature_get_z(msg);
brief_feature->response = mavlink_msg_brief_feature_get_response(msg);
brief_feature->orientation_assignment = mavlink_msg_brief_feature_get_orientation_assignment(msg);
brief_feature->size = mavlink_msg_brief_feature_get_size(msg);
brief_feature->orientation = mavlink_msg_brief_feature_get_orientation(msg);
brief_feature->orientation_assignment = mavlink_msg_brief_feature_get_orientation_assignment(msg);
mavlink_msg_brief_feature_get_descriptor(msg, brief_feature->descriptor);
brief_feature->response = mavlink_msg_brief_feature_get_response(msg);
#else
memcpy(brief_feature, _MAV_PAYLOAD(msg), 53);
#endif
......
mavlink/include/v1.0/pixhawk/mavlink_msg_encapsulated_data.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_encapsulated_data.h
View file @ 44d3d10d
......@@ -48,7 +48,7 @@ static inline uint16_t mavlink_msg_encapsulated_data_pack(uint8_t system_id, uin
#endif
msg->msgid = MAVLINK_MSG_ID_ENCAPSULATED_DATA;
return mavlink_finalize_message(msg, system_id, component_id, 255, 223);
return mavlink_finalize_message(msg, system_id, component_id, 255);
}
/**
......@@ -78,7 +78,7 @@ static inline uint16_t mavlink_msg_encapsulated_data_pack_chan(uint8_t system_id
#endif
msg->msgid = MAVLINK_MSG_ID_ENCAPSULATED_DATA;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 255, 223);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 255);
}
/**
......@@ -109,12 +109,12 @@ static inline void mavlink_msg_encapsulated_data_send(mavlink_channel_t chan, ui
char buf[255];
_mav_put_uint16_t(buf, 0, seqnr);
_mav_put_uint8_t_array(buf, 2, data, 253);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ENCAPSULATED_DATA, buf, 255, 223);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ENCAPSULATED_DATA, buf, 255);
#else
mavlink_encapsulated_data_t packet;
packet.seqnr = seqnr;
mav_array_memcpy(packet.data, data, sizeof(uint8_t)*253);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ENCAPSULATED_DATA, (const char *)&packet, 255, 223);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ENCAPSULATED_DATA, (const char *)&packet, 255);
#endif
}
......
mavlink/include/v1.0/pixhawk/mavlink_msg_image_trigger_control.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_image_trigger_control.h
View file @ 44d3d10d
......@@ -45,7 +45,7 @@ static inline uint16_t mavlink_msg_image_trigger_control_pack(uint8_t system_id,
#endif
msg->msgid = MAVLINK_MSG_ID_IMAGE_TRIGGER_CONTROL;
return mavlink_finalize_message(msg, system_id, component_id, 1, 95);
return mavlink_finalize_message(msg, system_id, component_id, 1);
}
/**
......@@ -74,7 +74,7 @@ static inline uint16_t mavlink_msg_image_trigger_control_pack_chan(uint8_t syste
#endif
msg->msgid = MAVLINK_MSG_ID_IMAGE_TRIGGER_CONTROL;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 1, 95);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 1);
}
/**
......@@ -104,12 +104,12 @@ static inline void mavlink_msg_image_trigger_control_send(mavlink_channel_t chan
char buf[1];
_mav_put_uint8_t(buf, 0, enable);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_IMAGE_TRIGGER_CONTROL, buf, 1, 95);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_IMAGE_TRIGGER_CONTROL, buf, 1);
#else
mavlink_image_trigger_control_t packet;
packet.enable = enable;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_IMAGE_TRIGGER_CONTROL, (const char *)&packet, 1, 95);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_IMAGE_TRIGGER_CONTROL, (const char *)&packet, 1);
#endif
}
......
mavlink/include/v1.0/pixhawk/mavlink_msg_image_triggered.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_image_triggered.h
View file @ 44d3d10d
......@@ -100,7 +100,7 @@ static inline uint16_t mavlink_msg_image_triggered_pack(uint8_t system_id, uint8
#endif
msg->msgid = MAVLINK_MSG_ID_IMAGE_TRIGGERED;
return mavlink_finalize_message(msg, system_id, component_id, 52, 86);
return mavlink_finalize_message(msg, system_id, component_id, 52);
}
/**
......@@ -162,7 +162,7 @@ static inline uint16_t mavlink_msg_image_triggered_pack_chan(uint8_t system_id,
#endif
msg->msgid = MAVLINK_MSG_ID_IMAGE_TRIGGERED;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 52, 86);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 52);
}
/**
......@@ -214,7 +214,7 @@ static inline void mavlink_msg_image_triggered_send(mavlink_channel_t chan, uint
_mav_put_float(buf, 44, ground_y);
_mav_put_float(buf, 48, ground_z);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_IMAGE_TRIGGERED, buf, 52, 86);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_IMAGE_TRIGGERED, buf, 52);
#else
mavlink_image_triggered_t packet;
packet.timestamp = timestamp;
......@@ -230,7 +230,7 @@ static inline void mavlink_msg_image_triggered_send(mavlink_channel_t chan, uint
packet.ground_y = ground_y;
packet.ground_z = ground_z;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_IMAGE_TRIGGERED, (const char *)&packet, 52, 86);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_IMAGE_TRIGGERED, (const char *)&packet, 52);
#endif
}
......
mavlink/include/v1.0/pixhawk/mavlink_msg_marker.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_marker.h
View file @ 44d3d10d
......@@ -4,13 +4,13 @@
typedef struct __mavlink_marker_t
{
uint16_t id; ///< ID
float x; ///< x position
float y; ///< y position
float z; ///< z position
float roll; ///< roll orientation
float pitch; ///< pitch orientation
float yaw; ///< yaw orientation
uint16_t id; ///< ID
} mavlink_marker_t;
#define MAVLINK_MSG_ID_MARKER_LEN 26
......@@ -21,13 +21,13 @@ typedef struct __mavlink_marker_t
#define MAVLINK_MESSAGE_INFO_MARKER { \
"MARKER", \
7, \
{ { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_marker_t, x) }, \
{ "y", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_marker_t, y) }, \
{ "z", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_marker_t, z) }, \
{ "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_marker_t, roll) }, \
{ "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_marker_t, pitch) }, \
{ "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_marker_t, yaw) }, \
{ "id", NULL, MAVLINK_TYPE_UINT16_T, 0, 24, offsetof(mavlink_marker_t, id) }, \
{ { "id", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_marker_t, id) }, \
{ "x", NULL, MAVLINK_TYPE_FLOAT, 0, 2, offsetof(mavlink_marker_t, x) }, \
{ "y", NULL, MAVLINK_TYPE_FLOAT, 0, 6, offsetof(mavlink_marker_t, y) }, \
{ "z", NULL, MAVLINK_TYPE_FLOAT, 0, 10, offsetof(mavlink_marker_t, z) }, \
{ "roll", NULL, MAVLINK_TYPE_FLOAT, 0, 14, offsetof(mavlink_marker_t, roll) }, \
{ "pitch", NULL, MAVLINK_TYPE_FLOAT, 0, 18, offsetof(mavlink_marker_t, pitch) }, \
{ "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 22, offsetof(mavlink_marker_t, yaw) }, \
} \
}
......@@ -52,30 +52,30 @@ static inline uint16_t mavlink_msg_marker_pack(uint8_t system_id, uint8_t compon
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[26];
_mav_put_float(buf, 0, x);
_mav_put_float(buf, 4, y);
_mav_put_float(buf, 8, z);
_mav_put_float(buf, 12, roll);
_mav_put_float(buf, 16, pitch);
_mav_put_float(buf, 20, yaw);
_mav_put_uint16_t(buf, 24, id);
_mav_put_uint16_t(buf, 0, id);
_mav_put_float(buf, 2, x);
_mav_put_float(buf, 6, y);
_mav_put_float(buf, 10, z);
_mav_put_float(buf, 14, roll);
_mav_put_float(buf, 18, pitch);
_mav_put_float(buf, 22, yaw);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 26);
#else
mavlink_marker_t packet;
packet.id = id;
packet.x = x;
packet.y = y;
packet.z = z;
packet.roll = roll;
packet.pitch = pitch;
packet.yaw = yaw;
packet.id = id;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 26);
#endif
msg->msgid = MAVLINK_MSG_ID_MARKER;
return mavlink_finalize_message(msg, system_id, component_id, 26, 249);
return mavlink_finalize_message(msg, system_id, component_id, 26);
}
/**
......@@ -99,30 +99,30 @@ static inline uint16_t mavlink_msg_marker_pack_chan(uint8_t system_id, uint8_t c
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[26];
_mav_put_float(buf, 0, x);
_mav_put_float(buf, 4, y);
_mav_put_float(buf, 8, z);
_mav_put_float(buf, 12, roll);
_mav_put_float(buf, 16, pitch);
_mav_put_float(buf, 20, yaw);
_mav_put_uint16_t(buf, 24, id);
_mav_put_uint16_t(buf, 0, id);
_mav_put_float(buf, 2, x);
_mav_put_float(buf, 6, y);
_mav_put_float(buf, 10, z);
_mav_put_float(buf, 14, roll);
_mav_put_float(buf, 18, pitch);
_mav_put_float(buf, 22, yaw);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 26);
#else
mavlink_marker_t packet;
packet.id = id;
packet.x = x;
packet.y = y;
packet.z = z;
packet.roll = roll;
packet.pitch = pitch;
packet.yaw = yaw;
packet.id = id;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 26);
#endif
msg->msgid = MAVLINK_MSG_ID_MARKER;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 26, 249);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 26);
}
/**
......@@ -156,26 +156,26 @@ static inline void mavlink_msg_marker_send(mavlink_channel_t chan, uint16_t id,
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[26];
_mav_put_float(buf, 0, x);
_mav_put_float(buf, 4, y);
_mav_put_float(buf, 8, z);
_mav_put_float(buf, 12, roll);
_mav_put_float(buf, 16, pitch);
_mav_put_float(buf, 20, yaw);
_mav_put_uint16_t(buf, 24, id);
_mav_put_uint16_t(buf, 0, id);
_mav_put_float(buf, 2, x);
_mav_put_float(buf, 6, y);
_mav_put_float(buf, 10, z);
_mav_put_float(buf, 14, roll);
_mav_put_float(buf, 18, pitch);
_mav_put_float(buf, 22, yaw);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MARKER, buf, 26, 249);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MARKER, buf, 26);
#else
mavlink_marker_t packet;
packet.id = id;
packet.x = x;
packet.y = y;
packet.z = z;
packet.roll = roll;
packet.pitch = pitch;
packet.yaw = yaw;
packet.id = id;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MARKER, (const char *)&packet, 26, 249);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_MARKER, (const char *)&packet, 26);
#endif
}
......@@ -191,7 +191,7 @@ static inline void mavlink_msg_marker_send(mavlink_channel_t chan, uint16_t id,
*/
static inline uint16_t mavlink_msg_marker_get_id(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 24);
return _MAV_RETURN_uint16_t(msg, 0);
}
/**
......@@ -201,7 +201,7 @@ static inline uint16_t mavlink_msg_marker_get_id(const mavlink_message_t* msg)
*/
static inline float mavlink_msg_marker_get_x(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 0);
return _MAV_RETURN_float(msg, 2);
}
/**
......@@ -211,7 +211,7 @@ static inline float mavlink_msg_marker_get_x(const mavlink_message_t* msg)
*/
static inline float mavlink_msg_marker_get_y(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 4);
return _MAV_RETURN_float(msg, 6);
}
/**
......@@ -221,7 +221,7 @@ static inline float mavlink_msg_marker_get_y(const mavlink_message_t* msg)
*/
static inline float mavlink_msg_marker_get_z(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 8);
return _MAV_RETURN_float(msg, 10);
}
/**
......@@ -231,7 +231,7 @@ static inline float mavlink_msg_marker_get_z(const mavlink_message_t* msg)
*/
static inline float mavlink_msg_marker_get_roll(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 12);
return _MAV_RETURN_float(msg, 14);
}
/**
......@@ -241,7 +241,7 @@ static inline float mavlink_msg_marker_get_roll(const mavlink_message_t* msg)
*/
static inline float mavlink_msg_marker_get_pitch(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 16);
return _MAV_RETURN_float(msg, 18);
}
/**
......@@ -251,7 +251,7 @@ static inline float mavlink_msg_marker_get_pitch(const mavlink_message_t* msg)
*/
static inline float mavlink_msg_marker_get_yaw(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 20);
return _MAV_RETURN_float(msg, 22);
}
/**
......@@ -263,13 +263,13 @@ static inline float mavlink_msg_marker_get_yaw(const mavlink_message_t* msg)
static inline void mavlink_msg_marker_decode(const mavlink_message_t* msg, mavlink_marker_t* marker)
{
#if MAVLINK_NEED_BYTE_SWAP
marker->id = mavlink_msg_marker_get_id(msg);
marker->x = mavlink_msg_marker_get_x(msg);
marker->y = mavlink_msg_marker_get_y(msg);
marker->z = mavlink_msg_marker_get_z(msg);
marker->roll = mavlink_msg_marker_get_roll(msg);
marker->pitch = mavlink_msg_marker_get_pitch(msg);
marker->yaw = mavlink_msg_marker_get_yaw(msg);
marker->id = mavlink_msg_marker_get_id(msg);
#else
memcpy(marker, _MAV_PAYLOAD(msg), 26);
#endif
......
mavlink/include/v1.0/pixhawk/mavlink_msg_pattern_detected.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_pattern_detected.h
View file @ 44d3d10d
......@@ -4,8 +4,8 @@
typedef struct __mavlink_pattern_detected_t
{
float confidence; ///< Confidence of detection
uint8_t type; ///< 0: Pattern, 1: Letter
float confidence; ///< Confidence of detection
char file[100]; ///< Pattern file name
uint8_t detected; ///< Accepted as true detection, 0 no, 1 yes
} mavlink_pattern_detected_t;
......@@ -18,8 +18,8 @@ typedef struct __mavlink_pattern_detected_t
#define MAVLINK_MESSAGE_INFO_PATTERN_DETECTED { \
"PATTERN_DETECTED", \
4, \
{ { "confidence", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_pattern_detected_t, confidence) }, \
{ "type", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_pattern_detected_t, type) }, \
{ { "type", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_pattern_detected_t, type) }, \
{ "confidence", NULL, MAVLINK_TYPE_FLOAT, 0, 1, offsetof(mavlink_pattern_detected_t, confidence) }, \
{ "file", NULL, MAVLINK_TYPE_CHAR, 100, 5, offsetof(mavlink_pattern_detected_t, file) }, \
{ "detected", NULL, MAVLINK_TYPE_UINT8_T, 0, 105, offsetof(mavlink_pattern_detected_t, detected) }, \
} \
......@@ -43,22 +43,22 @@ static inline uint16_t mavlink_msg_pattern_detected_pack(uint8_t system_id, uint
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[106];
_mav_put_float(buf, 0, confidence);
_mav_put_uint8_t(buf, 4, type);
_mav_put_uint8_t(buf, 0, type);
_mav_put_float(buf, 1, confidence);
_mav_put_uint8_t(buf, 105, detected);
_mav_put_char_array(buf, 5, file, 100);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 106);
#else
mavlink_pattern_detected_t packet;
packet.confidence = confidence;
packet.type = type;
packet.confidence = confidence;
packet.detected = detected;
mav_array_memcpy(packet.file, file, sizeof(char)*100);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 106);
#endif
msg->msgid = MAVLINK_MSG_ID_PATTERN_DETECTED;
return mavlink_finalize_message(msg, system_id, component_id, 106, 90);
return mavlink_finalize_message(msg, system_id, component_id, 106);
}
/**
......@@ -79,22 +79,22 @@ static inline uint16_t mavlink_msg_pattern_detected_pack_chan(uint8_t system_id,
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[106];
_mav_put_float(buf, 0, confidence);
_mav_put_uint8_t(buf, 4, type);
_mav_put_uint8_t(buf, 0, type);
_mav_put_float(buf, 1, confidence);
_mav_put_uint8_t(buf, 105, detected);
_mav_put_char_array(buf, 5, file, 100);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 106);
#else
mavlink_pattern_detected_t packet;
packet.confidence = confidence;
packet.type = type;
packet.confidence = confidence;
packet.detected = detected;
mav_array_memcpy(packet.file, file, sizeof(char)*100);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 106);
#endif
msg->msgid = MAVLINK_MSG_ID_PATTERN_DETECTED;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 106, 90);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 106);
}
/**
......@@ -125,18 +125,18 @@ static inline void mavlink_msg_pattern_detected_send(mavlink_channel_t chan, uin
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[106];
_mav_put_float(buf, 0, confidence);
_mav_put_uint8_t(buf, 4, type);
_mav_put_uint8_t(buf, 0, type);
_mav_put_float(buf, 1, confidence);
_mav_put_uint8_t(buf, 105, detected);
_mav_put_char_array(buf, 5, file, 100);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PATTERN_DETECTED, buf, 106, 90);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PATTERN_DETECTED, buf, 106);
#else
mavlink_pattern_detected_t packet;
packet.confidence = confidence;
packet.type = type;
packet.confidence = confidence;
packet.detected = detected;
mav_array_memcpy(packet.file, file, sizeof(char)*100);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PATTERN_DETECTED, (const char *)&packet, 106, 90);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_PATTERN_DETECTED, (const char *)&packet, 106);
#endif
}
......@@ -152,7 +152,7 @@ static inline void mavlink_msg_pattern_detected_send(mavlink_channel_t chan, uin
*/
static inline uint8_t mavlink_msg_pattern_detected_get_type(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 4);
return _MAV_RETURN_uint8_t(msg, 0);
}
/**
......@@ -162,7 +162,7 @@ static inline uint8_t mavlink_msg_pattern_detected_get_type(const mavlink_messag
*/
static inline float mavlink_msg_pattern_detected_get_confidence(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 0);
return _MAV_RETURN_float(msg, 1);
}
/**
......@@ -194,8 +194,8 @@ static inline uint8_t mavlink_msg_pattern_detected_get_detected(const mavlink_me
static inline void mavlink_msg_pattern_detected_decode(const mavlink_message_t* msg, mavlink_pattern_detected_t* pattern_detected)
{
#if MAVLINK_NEED_BYTE_SWAP
pattern_detected->confidence = mavlink_msg_pattern_detected_get_confidence(msg);
pattern_detected->type = mavlink_msg_pattern_detected_get_type(msg);
pattern_detected->confidence = mavlink_msg_pattern_detected_get_confidence(msg);
mavlink_msg_pattern_detected_get_file(msg, pattern_detected->file);
pattern_detected->detected = mavlink_msg_pattern_detected_get_detected(msg);
#else
......
mavlink/include/v1.0/pixhawk/mavlink_msg_point_of_interest.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_point_of_interest.h
View file @ 44d3d10d
......@@ -4,13 +4,13 @@
typedef struct __mavlink_point_of_interest_t
{
float x; ///< X Position
float y; ///< Y Position
float z; ///< Z Position
uint16_t timeout; ///< 0: no timeout, >1: timeout in seconds
uint8_t type; ///< 0: Notice, 1: Warning, 2: Critical, 3: Emergency, 4: Debug
uint8_t color; ///< 0: blue, 1: yellow, 2: red, 3: orange, 4: green, 5: magenta
uint8_t coordinate_system; ///< 0: global, 1:local
uint16_t timeout; ///< 0: no timeout, >1: timeout in seconds
float x; ///< X Position
float y; ///< Y Position
float z; ///< Z Position
char name[26]; ///< POI name
} mavlink_point_of_interest_t;
......@@ -22,13 +22,13 @@ typedef struct __mavlink_point_of_interest_t
#define MAVLINK_MESSAGE_INFO_POINT_OF_INTEREST { \
"POINT_OF_INTEREST", \
8, \
{ { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_point_of_interest_t, x) }, \
{ "y", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_point_of_interest_t, y) }, \
{ "z", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_point_of_interest_t, z) }, \
{ "timeout", NULL, MAVLINK_TYPE_UINT16_T, 0, 12, offsetof(mavlink_point_of_interest_t, timeout) }, \
{ "type", NULL, MAVLINK_TYPE_UINT8_T, 0, 14, offsetof(mavlink_point_of_interest_t, type) }, \
{ "color", NULL, MAVLINK_TYPE_UINT8_T, 0, 15, offsetof(mavlink_point_of_interest_t, color) }, \
{ "coordinate_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 16, offsetof(mavlink_point_of_interest_t, coordinate_system) }, \
{ { "type", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_point_of_interest_t, type) }, \
{ "color", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_point_of_interest_t, color) }, \
{ "coordinate_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_point_of_interest_t, coordinate_system) }, \
{ "timeout", NULL, MAVLINK_TYPE_UINT16_T, 0, 3, offsetof(mavlink_point_of_interest_t, timeout) }, \
{ "x", NULL, MAVLINK_TYPE_FLOAT, 0, 5, offsetof(mavlink_point_of_interest_t, x) }, \
{ "y", NULL, MAVLINK_TYPE_FLOAT, 0, 9, offsetof(mavlink_point_of_interest_t, y) }, \
{ "z", NULL, MAVLINK_TYPE_FLOAT, 0, 13, offsetof(mavlink_point_of_interest_t, z) }, \
{ "name", NULL, MAVLINK_TYPE_CHAR, 26, 17, offsetof(mavlink_point_of_interest_t, name) }, \
} \
}
......@@ -55,30 +55,30 @@ static inline uint16_t mavlink_msg_point_of_interest_pack(uint8_t system_id, uin
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[43];
_mav_put_float(buf, 0, x);
_mav_put_float(buf, 4, y);
_mav_put_float(buf, 8, z);
_mav_put_uint16_t(buf, 12, timeout);
_mav_put_uint8_t(buf, 14, type);
_mav_put_uint8_t(buf, 15, color);
_mav_put_uint8_t(buf, 16, coordinate_system);
_mav_put_uint8_t(buf, 0, type);
_mav_put_uint8_t(buf, 1, color);
_mav_put_uint8_t(buf, 2, coordinate_system);
_mav_put_uint16_t(buf, 3, timeout);
_mav_put_float(buf, 5, x);
_mav_put_float(buf, 9, y);
_mav_put_float(buf, 13, z);
_mav_put_char_array(buf, 17, name, 26);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 43);
#else
mavlink_point_of_interest_t packet;
packet.x = x;
packet.y = y;
packet.z = z;
packet.timeout = timeout;
packet.type = type;
packet.color = color;
packet.coordinate_system = coordinate_system;
packet.timeout = timeout;
packet.x = x;
packet.y = y;
packet.z = z;
mav_array_memcpy(packet.name, name, sizeof(char)*26);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 43);
#endif
msg->msgid = MAVLINK_MSG_ID_POINT_OF_INTEREST;
return mavlink_finalize_message(msg, system_id, component_id, 43, 95);
return mavlink_finalize_message(msg, system_id, component_id, 43);
}
/**
......@@ -103,30 +103,30 @@ static inline uint16_t mavlink_msg_point_of_interest_pack_chan(uint8_t system_id
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[43];
_mav_put_float(buf, 0, x);
_mav_put_float(buf, 4, y);
_mav_put_float(buf, 8, z);
_mav_put_uint16_t(buf, 12, timeout);
_mav_put_uint8_t(buf, 14, type);
_mav_put_uint8_t(buf, 15, color);
_mav_put_uint8_t(buf, 16, coordinate_system);
_mav_put_uint8_t(buf, 0, type);
_mav_put_uint8_t(buf, 1, color);
_mav_put_uint8_t(buf, 2, coordinate_system);
_mav_put_uint16_t(buf, 3, timeout);
_mav_put_float(buf, 5, x);
_mav_put_float(buf, 9, y);
_mav_put_float(buf, 13, z);
_mav_put_char_array(buf, 17, name, 26);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 43);
#else
mavlink_point_of_interest_t packet;
packet.x = x;
packet.y = y;
packet.z = z;
packet.timeout = timeout;
packet.type = type;
packet.color = color;
packet.coordinate_system = coordinate_system;
packet.timeout = timeout;
packet.x = x;
packet.y = y;
packet.z = z;
mav_array_memcpy(packet.name, name, sizeof(char)*26);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 43);
#endif
msg->msgid = MAVLINK_MSG_ID_POINT_OF_INTEREST;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 43, 95);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 43);
}
/**
......@@ -161,26 +161,26 @@ static inline void mavlink_msg_point_of_interest_send(mavlink_channel_t chan, ui
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[43];
_mav_put_float(buf, 0, x);
_mav_put_float(buf, 4, y);
_mav_put_float(buf, 8, z);
_mav_put_uint16_t(buf, 12, timeout);
_mav_put_uint8_t(buf, 14, type);
_mav_put_uint8_t(buf, 15, color);
_mav_put_uint8_t(buf, 16, coordinate_system);
_mav_put_uint8_t(buf, 0, type);
_mav_put_uint8_t(buf, 1, color);
_mav_put_uint8_t(buf, 2, coordinate_system);
_mav_put_uint16_t(buf, 3, timeout);
_mav_put_float(buf, 5, x);
_mav_put_float(buf, 9, y);
_mav_put_float(buf, 13, z);
_mav_put_char_array(buf, 17, name, 26);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POINT_OF_INTEREST, buf, 43, 95);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POINT_OF_INTEREST, buf, 43);
#else
mavlink_point_of_interest_t packet;
packet.x = x;
packet.y = y;
packet.z = z;
packet.timeout = timeout;
packet.type = type;
packet.color = color;
packet.coordinate_system = coordinate_system;
packet.timeout = timeout;
packet.x = x;
packet.y = y;
packet.z = z;
mav_array_memcpy(packet.name, name, sizeof(char)*26);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POINT_OF_INTEREST, (const char *)&packet, 43, 95);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POINT_OF_INTEREST, (const char *)&packet, 43);
#endif
}
......@@ -196,7 +196,7 @@ static inline void mavlink_msg_point_of_interest_send(mavlink_channel_t chan, ui
*/
static inline uint8_t mavlink_msg_point_of_interest_get_type(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 14);
return _MAV_RETURN_uint8_t(msg, 0);
}
/**
......@@ -206,7 +206,7 @@ static inline uint8_t mavlink_msg_point_of_interest_get_type(const mavlink_messa
*/
static inline uint8_t mavlink_msg_point_of_interest_get_color(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 15);
return _MAV_RETURN_uint8_t(msg, 1);
}
/**
......@@ -216,7 +216,7 @@ static inline uint8_t mavlink_msg_point_of_interest_get_color(const mavlink_mess
*/
static inline uint8_t mavlink_msg_point_of_interest_get_coordinate_system(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 16);
return _MAV_RETURN_uint8_t(msg, 2);
}
/**
......@@ -226,7 +226,7 @@ static inline uint8_t mavlink_msg_point_of_interest_get_coordinate_system(const
*/
static inline uint16_t mavlink_msg_point_of_interest_get_timeout(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 12);
return _MAV_RETURN_uint16_t(msg, 3);
}
/**
......@@ -236,7 +236,7 @@ static inline uint16_t mavlink_msg_point_of_interest_get_timeout(const mavlink_m
*/
static inline float mavlink_msg_point_of_interest_get_x(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 0);
return _MAV_RETURN_float(msg, 5);
}
/**
......@@ -246,7 +246,7 @@ static inline float mavlink_msg_point_of_interest_get_x(const mavlink_message_t*
*/
static inline float mavlink_msg_point_of_interest_get_y(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 4);
return _MAV_RETURN_float(msg, 9);
}
/**
......@@ -256,7 +256,7 @@ static inline float mavlink_msg_point_of_interest_get_y(const mavlink_message_t*
*/
static inline float mavlink_msg_point_of_interest_get_z(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 8);
return _MAV_RETURN_float(msg, 13);
}
/**
......@@ -278,13 +278,13 @@ static inline uint16_t mavlink_msg_point_of_interest_get_name(const mavlink_mess
static inline void mavlink_msg_point_of_interest_decode(const mavlink_message_t* msg, mavlink_point_of_interest_t* point_of_interest)
{
#if MAVLINK_NEED_BYTE_SWAP
point_of_interest->x = mavlink_msg_point_of_interest_get_x(msg);
point_of_interest->y = mavlink_msg_point_of_interest_get_y(msg);
point_of_interest->z = mavlink_msg_point_of_interest_get_z(msg);
point_of_interest->timeout = mavlink_msg_point_of_interest_get_timeout(msg);
point_of_interest->type = mavlink_msg_point_of_interest_get_type(msg);
point_of_interest->color = mavlink_msg_point_of_interest_get_color(msg);
point_of_interest->coordinate_system = mavlink_msg_point_of_interest_get_coordinate_system(msg);
point_of_interest->timeout = mavlink_msg_point_of_interest_get_timeout(msg);
point_of_interest->x = mavlink_msg_point_of_interest_get_x(msg);
point_of_interest->y = mavlink_msg_point_of_interest_get_y(msg);
point_of_interest->z = mavlink_msg_point_of_interest_get_z(msg);
mavlink_msg_point_of_interest_get_name(msg, point_of_interest->name);
#else
memcpy(point_of_interest, _MAV_PAYLOAD(msg), 43);
......
mavlink/include/v1.0/pixhawk/mavlink_msg_position_control_setpoint.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_position_control_setpoint.h
View file @ 44d3d10d
......@@ -4,11 +4,11 @@
typedef struct __mavlink_position_control_setpoint_t
{
uint16_t id; ///< ID of waypoint, 0 for plain position
float x; ///< x position
float y; ///< y position
float z; ///< z position
float yaw; ///< yaw orientation in radians, 0 = NORTH
uint16_t id; ///< ID of waypoint, 0 for plain position
} mavlink_position_control_setpoint_t;
#define MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT_LEN 18
......@@ -19,11 +19,11 @@ typedef struct __mavlink_position_control_setpoint_t
#define MAVLINK_MESSAGE_INFO_POSITION_CONTROL_SETPOINT { \
"POSITION_CONTROL_SETPOINT", \
5, \
{ { "x", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_position_control_setpoint_t, x) }, \
{ "y", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_position_control_setpoint_t, y) }, \
{ "z", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_position_control_setpoint_t, z) }, \
{ "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_position_control_setpoint_t, yaw) }, \
{ "id", NULL, MAVLINK_TYPE_UINT16_T, 0, 16, offsetof(mavlink_position_control_setpoint_t, id) }, \
{ { "id", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_position_control_setpoint_t, id) }, \
{ "x", NULL, MAVLINK_TYPE_FLOAT, 0, 2, offsetof(mavlink_position_control_setpoint_t, x) }, \
{ "y", NULL, MAVLINK_TYPE_FLOAT, 0, 6, offsetof(mavlink_position_control_setpoint_t, y) }, \
{ "z", NULL, MAVLINK_TYPE_FLOAT, 0, 10, offsetof(mavlink_position_control_setpoint_t, z) }, \
{ "yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 14, offsetof(mavlink_position_control_setpoint_t, yaw) }, \
} \
}
......@@ -46,26 +46,26 @@ static inline uint16_t mavlink_msg_position_control_setpoint_pack(uint8_t system
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[18];
_mav_put_float(buf, 0, x);
_mav_put_float(buf, 4, y);
_mav_put_float(buf, 8, z);
_mav_put_float(buf, 12, yaw);
_mav_put_uint16_t(buf, 16, id);
_mav_put_uint16_t(buf, 0, id);
_mav_put_float(buf, 2, x);
_mav_put_float(buf, 6, y);
_mav_put_float(buf, 10, z);
_mav_put_float(buf, 14, yaw);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
#else
mavlink_position_control_setpoint_t packet;
packet.id = id;
packet.x = x;
packet.y = y;
packet.z = z;
packet.yaw = yaw;
packet.id = id;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
#endif
msg->msgid = MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT;
return mavlink_finalize_message(msg, system_id, component_id, 18, 28);
return mavlink_finalize_message(msg, system_id, component_id, 18);
}
/**
......@@ -87,26 +87,26 @@ static inline uint16_t mavlink_msg_position_control_setpoint_pack_chan(uint8_t s
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[18];
_mav_put_float(buf, 0, x);
_mav_put_float(buf, 4, y);
_mav_put_float(buf, 8, z);
_mav_put_float(buf, 12, yaw);
_mav_put_uint16_t(buf, 16, id);
_mav_put_uint16_t(buf, 0, id);
_mav_put_float(buf, 2, x);
_mav_put_float(buf, 6, y);
_mav_put_float(buf, 10, z);
_mav_put_float(buf, 14, yaw);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 18);
#else
mavlink_position_control_setpoint_t packet;
packet.id = id;
packet.x = x;
packet.y = y;
packet.z = z;
packet.yaw = yaw;
packet.id = id;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 18);
#endif
msg->msgid = MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 18, 28);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 18);
}
/**
......@@ -138,22 +138,22 @@ static inline void mavlink_msg_position_control_setpoint_send(mavlink_channel_t
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[18];
_mav_put_float(buf, 0, x);
_mav_put_float(buf, 4, y);
_mav_put_float(buf, 8, z);
_mav_put_float(buf, 12, yaw);
_mav_put_uint16_t(buf, 16, id);
_mav_put_uint16_t(buf, 0, id);
_mav_put_float(buf, 2, x);
_mav_put_float(buf, 6, y);
_mav_put_float(buf, 10, z);
_mav_put_float(buf, 14, yaw);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT, buf, 18, 28);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT, buf, 18);
#else
mavlink_position_control_setpoint_t packet;
packet.id = id;
packet.x = x;
packet.y = y;
packet.z = z;
packet.yaw = yaw;
packet.id = id;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT, (const char *)&packet, 18, 28);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_POSITION_CONTROL_SETPOINT, (const char *)&packet, 18);
#endif
}
......@@ -169,7 +169,7 @@ static inline void mavlink_msg_position_control_setpoint_send(mavlink_channel_t
*/
static inline uint16_t mavlink_msg_position_control_setpoint_get_id(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 16);
return _MAV_RETURN_uint16_t(msg, 0);
}
/**
......@@ -179,7 +179,7 @@ static inline uint16_t mavlink_msg_position_control_setpoint_get_id(const mavlin
*/
static inline float mavlink_msg_position_control_setpoint_get_x(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 0);
return _MAV_RETURN_float(msg, 2);
}
/**
......@@ -189,7 +189,7 @@ static inline float mavlink_msg_position_control_setpoint_get_x(const mavlink_me
*/
static inline float mavlink_msg_position_control_setpoint_get_y(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 4);
return _MAV_RETURN_float(msg, 6);
}
/**
......@@ -199,7 +199,7 @@ static inline float mavlink_msg_position_control_setpoint_get_y(const mavlink_me
*/
static inline float mavlink_msg_position_control_setpoint_get_z(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 8);
return _MAV_RETURN_float(msg, 10);
}
/**
......@@ -209,7 +209,7 @@ static inline float mavlink_msg_position_control_setpoint_get_z(const mavlink_me
*/
static inline float mavlink_msg_position_control_setpoint_get_yaw(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 12);
return _MAV_RETURN_float(msg, 14);
}
/**
......@@ -221,11 +221,11 @@ static inline float mavlink_msg_position_control_setpoint_get_yaw(const mavlink_
static inline void mavlink_msg_position_control_setpoint_decode(const mavlink_message_t* msg, mavlink_position_control_setpoint_t* position_control_setpoint)
{
#if MAVLINK_NEED_BYTE_SWAP
position_control_setpoint->id = mavlink_msg_position_control_setpoint_get_id(msg);
position_control_setpoint->x = mavlink_msg_position_control_setpoint_get_x(msg);
position_control_setpoint->y = mavlink_msg_position_control_setpoint_get_y(msg);
position_control_setpoint->z = mavlink_msg_position_control_setpoint_get_z(msg);
position_control_setpoint->yaw = mavlink_msg_position_control_setpoint_get_yaw(msg);
position_control_setpoint->id = mavlink_msg_position_control_setpoint_get_id(msg);
#else
memcpy(position_control_setpoint, _MAV_PAYLOAD(msg), 18);
#endif
......
mavlink/include/v1.0/pixhawk/mavlink_msg_raw_aux.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_raw_aux.h
View file @ 44d3d10d
......@@ -4,13 +4,13 @@
typedef struct __mavlink_raw_aux_t
{
int32_t baro; ///< Barometric pressure (hecto Pascal)
uint16_t adc1; ///< ADC1 (J405 ADC3, LPC2148 AD0.6)
uint16_t adc2; ///< ADC2 (J405 ADC5, LPC2148 AD0.2)
uint16_t adc3; ///< ADC3 (J405 ADC6, LPC2148 AD0.1)
uint16_t adc4; ///< ADC4 (J405 ADC7, LPC2148 AD1.3)
uint16_t vbat; ///< Battery voltage
int16_t temp; ///< Temperature (degrees celcius)
int32_t baro; ///< Barometric pressure (hecto Pascal)
} mavlink_raw_aux_t;
#define MAVLINK_MSG_ID_RAW_AUX_LEN 16
......@@ -21,13 +21,13 @@ typedef struct __mavlink_raw_aux_t
#define MAVLINK_MESSAGE_INFO_RAW_AUX { \
"RAW_AUX", \
7, \
{ { "baro", NULL, MAVLINK_TYPE_INT32_T, 0, 0, offsetof(mavlink_raw_aux_t, baro) }, \
{ "adc1", NULL, MAVLINK_TYPE_UINT16_T, 0, 4, offsetof(mavlink_raw_aux_t, adc1) }, \
{ "adc2", NULL, MAVLINK_TYPE_UINT16_T, 0, 6, offsetof(mavlink_raw_aux_t, adc2) }, \
{ "adc3", NULL, MAVLINK_TYPE_UINT16_T, 0, 8, offsetof(mavlink_raw_aux_t, adc3) }, \
{ "adc4", NULL, MAVLINK_TYPE_UINT16_T, 0, 10, offsetof(mavlink_raw_aux_t, adc4) }, \
{ "vbat", NULL, MAVLINK_TYPE_UINT16_T, 0, 12, offsetof(mavlink_raw_aux_t, vbat) }, \
{ "temp", NULL, MAVLINK_TYPE_INT16_T, 0, 14, offsetof(mavlink_raw_aux_t, temp) }, \
{ { "adc1", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_raw_aux_t, adc1) }, \
{ "adc2", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_raw_aux_t, adc2) }, \
{ "adc3", NULL, MAVLINK_TYPE_UINT16_T, 0, 4, offsetof(mavlink_raw_aux_t, adc3) }, \
{ "adc4", NULL, MAVLINK_TYPE_UINT16_T, 0, 6, offsetof(mavlink_raw_aux_t, adc4) }, \
{ "vbat", NULL, MAVLINK_TYPE_UINT16_T, 0, 8, offsetof(mavlink_raw_aux_t, vbat) }, \
{ "temp", NULL, MAVLINK_TYPE_INT16_T, 0, 10, offsetof(mavlink_raw_aux_t, temp) }, \
{ "baro", NULL, MAVLINK_TYPE_INT32_T, 0, 12, offsetof(mavlink_raw_aux_t, baro) }, \
} \
}
......@@ -52,30 +52,30 @@ static inline uint16_t mavlink_msg_raw_aux_pack(uint8_t system_id, uint8_t compo
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[16];
_mav_put_int32_t(buf, 0, baro);
_mav_put_uint16_t(buf, 4, adc1);
_mav_put_uint16_t(buf, 6, adc2);
_mav_put_uint16_t(buf, 8, adc3);
_mav_put_uint16_t(buf, 10, adc4);
_mav_put_uint16_t(buf, 12, vbat);
_mav_put_int16_t(buf, 14, temp);
_mav_put_uint16_t(buf, 0, adc1);
_mav_put_uint16_t(buf, 2, adc2);
_mav_put_uint16_t(buf, 4, adc3);
_mav_put_uint16_t(buf, 6, adc4);
_mav_put_uint16_t(buf, 8, vbat);
_mav_put_int16_t(buf, 10, temp);
_mav_put_int32_t(buf, 12, baro);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 16);
#else
mavlink_raw_aux_t packet;
packet.baro = baro;
packet.adc1 = adc1;
packet.adc2 = adc2;
packet.adc3 = adc3;
packet.adc4 = adc4;
packet.vbat = vbat;
packet.temp = temp;
packet.baro = baro;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 16);
#endif
msg->msgid = MAVLINK_MSG_ID_RAW_AUX;
return mavlink_finalize_message(msg, system_id, component_id, 16, 182);
return mavlink_finalize_message(msg, system_id, component_id, 16);
}
/**
......@@ -99,30 +99,30 @@ static inline uint16_t mavlink_msg_raw_aux_pack_chan(uint8_t system_id, uint8_t
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[16];
_mav_put_int32_t(buf, 0, baro);
_mav_put_uint16_t(buf, 4, adc1);
_mav_put_uint16_t(buf, 6, adc2);
_mav_put_uint16_t(buf, 8, adc3);
_mav_put_uint16_t(buf, 10, adc4);
_mav_put_uint16_t(buf, 12, vbat);
_mav_put_int16_t(buf, 14, temp);
_mav_put_uint16_t(buf, 0, adc1);
_mav_put_uint16_t(buf, 2, adc2);
_mav_put_uint16_t(buf, 4, adc3);
_mav_put_uint16_t(buf, 6, adc4);
_mav_put_uint16_t(buf, 8, vbat);
_mav_put_int16_t(buf, 10, temp);
_mav_put_int32_t(buf, 12, baro);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 16);
#else
mavlink_raw_aux_t packet;
packet.baro = baro;
packet.adc1 = adc1;
packet.adc2 = adc2;
packet.adc3 = adc3;
packet.adc4 = adc4;
packet.vbat = vbat;
packet.temp = temp;
packet.baro = baro;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 16);
#endif
msg->msgid = MAVLINK_MSG_ID_RAW_AUX;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 16, 182);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 16);
}
/**
......@@ -156,26 +156,26 @@ static inline void mavlink_msg_raw_aux_send(mavlink_channel_t chan, uint16_t adc
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[16];
_mav_put_int32_t(buf, 0, baro);
_mav_put_uint16_t(buf, 4, adc1);
_mav_put_uint16_t(buf, 6, adc2);
_mav_put_uint16_t(buf, 8, adc3);
_mav_put_uint16_t(buf, 10, adc4);
_mav_put_uint16_t(buf, 12, vbat);
_mav_put_int16_t(buf, 14, temp);
_mav_put_uint16_t(buf, 0, adc1);
_mav_put_uint16_t(buf, 2, adc2);
_mav_put_uint16_t(buf, 4, adc3);
_mav_put_uint16_t(buf, 6, adc4);
_mav_put_uint16_t(buf, 8, vbat);
_mav_put_int16_t(buf, 10, temp);
_mav_put_int32_t(buf, 12, baro);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RAW_AUX, buf, 16, 182);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RAW_AUX, buf, 16);
#else
mavlink_raw_aux_t packet;
packet.baro = baro;
packet.adc1 = adc1;
packet.adc2 = adc2;
packet.adc3 = adc3;
packet.adc4 = adc4;
packet.vbat = vbat;
packet.temp = temp;
packet.baro = baro;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RAW_AUX, (const char *)&packet, 16, 182);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_RAW_AUX, (const char *)&packet, 16);
#endif
}
......@@ -191,7 +191,7 @@ static inline void mavlink_msg_raw_aux_send(mavlink_channel_t chan, uint16_t adc
*/
static inline uint16_t mavlink_msg_raw_aux_get_adc1(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 4);
return _MAV_RETURN_uint16_t(msg, 0);
}
/**
......@@ -201,7 +201,7 @@ static inline uint16_t mavlink_msg_raw_aux_get_adc1(const mavlink_message_t* msg
*/
static inline uint16_t mavlink_msg_raw_aux_get_adc2(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 6);
return _MAV_RETURN_uint16_t(msg, 2);
}
/**
......@@ -211,7 +211,7 @@ static inline uint16_t mavlink_msg_raw_aux_get_adc2(const mavlink_message_t* msg
*/
static inline uint16_t mavlink_msg_raw_aux_get_adc3(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 8);
return _MAV_RETURN_uint16_t(msg, 4);
}
/**
......@@ -221,7 +221,7 @@ static inline uint16_t mavlink_msg_raw_aux_get_adc3(const mavlink_message_t* msg
*/
static inline uint16_t mavlink_msg_raw_aux_get_adc4(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 10);
return _MAV_RETURN_uint16_t(msg, 6);
}
/**
......@@ -231,7 +231,7 @@ static inline uint16_t mavlink_msg_raw_aux_get_adc4(const mavlink_message_t* msg
*/
static inline uint16_t mavlink_msg_raw_aux_get_vbat(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 12);
return _MAV_RETURN_uint16_t(msg, 8);
}
/**
......@@ -241,7 +241,7 @@ static inline uint16_t mavlink_msg_raw_aux_get_vbat(const mavlink_message_t* msg
*/
static inline int16_t mavlink_msg_raw_aux_get_temp(const mavlink_message_t* msg)
{
return _MAV_RETURN_int16_t(msg, 14);
return _MAV_RETURN_int16_t(msg, 10);
}
/**
......@@ -251,7 +251,7 @@ static inline int16_t mavlink_msg_raw_aux_get_temp(const mavlink_message_t* msg)
*/
static inline int32_t mavlink_msg_raw_aux_get_baro(const mavlink_message_t* msg)
{
return _MAV_RETURN_int32_t(msg, 0);
return _MAV_RETURN_int32_t(msg, 12);
}
/**
......@@ -263,13 +263,13 @@ static inline int32_t mavlink_msg_raw_aux_get_baro(const mavlink_message_t* msg)
static inline void mavlink_msg_raw_aux_decode(const mavlink_message_t* msg, mavlink_raw_aux_t* raw_aux)
{
#if MAVLINK_NEED_BYTE_SWAP
raw_aux->baro = mavlink_msg_raw_aux_get_baro(msg);
raw_aux->adc1 = mavlink_msg_raw_aux_get_adc1(msg);
raw_aux->adc2 = mavlink_msg_raw_aux_get_adc2(msg);
raw_aux->adc3 = mavlink_msg_raw_aux_get_adc3(msg);
raw_aux->adc4 = mavlink_msg_raw_aux_get_adc4(msg);
raw_aux->vbat = mavlink_msg_raw_aux_get_vbat(msg);
raw_aux->temp = mavlink_msg_raw_aux_get_temp(msg);
raw_aux->baro = mavlink_msg_raw_aux_get_baro(msg);
#else
memcpy(raw_aux, _MAV_PAYLOAD(msg), 16);
#endif
......
mavlink/include/v1.0/pixhawk/mavlink_msg_set_cam_shutter.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_set_cam_shutter.h
View file @ 44d3d10d
......@@ -4,12 +4,12 @@
typedef struct __mavlink_set_cam_shutter_t
{
float gain; ///< Camera gain
uint16_t interval; ///< Shutter interval, in microseconds
uint16_t exposure; ///< Exposure time, in microseconds
uint8_t cam_no; ///< Camera id
uint8_t cam_mode; ///< Camera mode: 0 = auto, 1 = manual
uint8_t trigger_pin; ///< Trigger pin, 0-3 for PtGrey FireFly
uint16_t interval; ///< Shutter interval, in microseconds
uint16_t exposure; ///< Exposure time, in microseconds
float gain; ///< Camera gain
} mavlink_set_cam_shutter_t;
#define MAVLINK_MSG_ID_SET_CAM_SHUTTER_LEN 11
......@@ -20,12 +20,12 @@ typedef struct __mavlink_set_cam_shutter_t
#define MAVLINK_MESSAGE_INFO_SET_CAM_SHUTTER { \
"SET_CAM_SHUTTER", \
6, \
{ { "gain", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_set_cam_shutter_t, gain) }, \
{ "interval", NULL, MAVLINK_TYPE_UINT16_T, 0, 4, offsetof(mavlink_set_cam_shutter_t, interval) }, \
{ "exposure", NULL, MAVLINK_TYPE_UINT16_T, 0, 6, offsetof(mavlink_set_cam_shutter_t, exposure) }, \
{ "cam_no", NULL, MAVLINK_TYPE_UINT8_T, 0, 8, offsetof(mavlink_set_cam_shutter_t, cam_no) }, \
{ "cam_mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 9, offsetof(mavlink_set_cam_shutter_t, cam_mode) }, \
{ "trigger_pin", NULL, MAVLINK_TYPE_UINT8_T, 0, 10, offsetof(mavlink_set_cam_shutter_t, trigger_pin) }, \
{ { "cam_no", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_set_cam_shutter_t, cam_no) }, \
{ "cam_mode", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_set_cam_shutter_t, cam_mode) }, \
{ "trigger_pin", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_set_cam_shutter_t, trigger_pin) }, \
{ "interval", NULL, MAVLINK_TYPE_UINT16_T, 0, 3, offsetof(mavlink_set_cam_shutter_t, interval) }, \
{ "exposure", NULL, MAVLINK_TYPE_UINT16_T, 0, 5, offsetof(mavlink_set_cam_shutter_t, exposure) }, \
{ "gain", NULL, MAVLINK_TYPE_FLOAT, 0, 7, offsetof(mavlink_set_cam_shutter_t, gain) }, \
} \
}
......@@ -49,28 +49,28 @@ static inline uint16_t mavlink_msg_set_cam_shutter_pack(uint8_t system_id, uint8
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[11];
_mav_put_float(buf, 0, gain);
_mav_put_uint16_t(buf, 4, interval);
_mav_put_uint16_t(buf, 6, exposure);
_mav_put_uint8_t(buf, 8, cam_no);
_mav_put_uint8_t(buf, 9, cam_mode);
_mav_put_uint8_t(buf, 10, trigger_pin);
_mav_put_uint8_t(buf, 0, cam_no);
_mav_put_uint8_t(buf, 1, cam_mode);
_mav_put_uint8_t(buf, 2, trigger_pin);
_mav_put_uint16_t(buf, 3, interval);
_mav_put_uint16_t(buf, 5, exposure);
_mav_put_float(buf, 7, gain);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 11);
#else
mavlink_set_cam_shutter_t packet;
packet.gain = gain;
packet.interval = interval;
packet.exposure = exposure;
packet.cam_no = cam_no;
packet.cam_mode = cam_mode;
packet.trigger_pin = trigger_pin;
packet.interval = interval;
packet.exposure = exposure;
packet.gain = gain;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 11);
#endif
msg->msgid = MAVLINK_MSG_ID_SET_CAM_SHUTTER;
return mavlink_finalize_message(msg, system_id, component_id, 11, 108);
return mavlink_finalize_message(msg, system_id, component_id, 11);
}
/**
......@@ -93,28 +93,28 @@ static inline uint16_t mavlink_msg_set_cam_shutter_pack_chan(uint8_t system_id,
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[11];
_mav_put_float(buf, 0, gain);
_mav_put_uint16_t(buf, 4, interval);
_mav_put_uint16_t(buf, 6, exposure);
_mav_put_uint8_t(buf, 8, cam_no);
_mav_put_uint8_t(buf, 9, cam_mode);
_mav_put_uint8_t(buf, 10, trigger_pin);
_mav_put_uint8_t(buf, 0, cam_no);
_mav_put_uint8_t(buf, 1, cam_mode);
_mav_put_uint8_t(buf, 2, trigger_pin);
_mav_put_uint16_t(buf, 3, interval);
_mav_put_uint16_t(buf, 5, exposure);
_mav_put_float(buf, 7, gain);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 11);
#else
mavlink_set_cam_shutter_t packet;
packet.gain = gain;
packet.interval = interval;
packet.exposure = exposure;
packet.cam_no = cam_no;
packet.cam_mode = cam_mode;
packet.trigger_pin = trigger_pin;
packet.interval = interval;
packet.exposure = exposure;
packet.gain = gain;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 11);
#endif
msg->msgid = MAVLINK_MSG_ID_SET_CAM_SHUTTER;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 11, 108);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 11);
}
/**
......@@ -147,24 +147,24 @@ static inline void mavlink_msg_set_cam_shutter_send(mavlink_channel_t chan, uint
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[11];
_mav_put_float(buf, 0, gain);
_mav_put_uint16_t(buf, 4, interval);
_mav_put_uint16_t(buf, 6, exposure);
_mav_put_uint8_t(buf, 8, cam_no);
_mav_put_uint8_t(buf, 9, cam_mode);
_mav_put_uint8_t(buf, 10, trigger_pin);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_CAM_SHUTTER, buf, 11, 108);
_mav_put_uint8_t(buf, 0, cam_no);
_mav_put_uint8_t(buf, 1, cam_mode);
_mav_put_uint8_t(buf, 2, trigger_pin);
_mav_put_uint16_t(buf, 3, interval);
_mav_put_uint16_t(buf, 5, exposure);
_mav_put_float(buf, 7, gain);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_CAM_SHUTTER, buf, 11);
#else
mavlink_set_cam_shutter_t packet;
packet.gain = gain;
packet.interval = interval;
packet.exposure = exposure;
packet.cam_no = cam_no;
packet.cam_mode = cam_mode;
packet.trigger_pin = trigger_pin;
packet.interval = interval;
packet.exposure = exposure;
packet.gain = gain;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_CAM_SHUTTER, (const char *)&packet, 11, 108);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SET_CAM_SHUTTER, (const char *)&packet, 11);
#endif
}
......@@ -180,7 +180,7 @@ static inline void mavlink_msg_set_cam_shutter_send(mavlink_channel_t chan, uint
*/
static inline uint8_t mavlink_msg_set_cam_shutter_get_cam_no(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 8);
return _MAV_RETURN_uint8_t(msg, 0);
}
/**
......@@ -190,7 +190,7 @@ static inline uint8_t mavlink_msg_set_cam_shutter_get_cam_no(const mavlink_messa
*/
static inline uint8_t mavlink_msg_set_cam_shutter_get_cam_mode(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 9);
return _MAV_RETURN_uint8_t(msg, 1);
}
/**
......@@ -200,7 +200,7 @@ static inline uint8_t mavlink_msg_set_cam_shutter_get_cam_mode(const mavlink_mes
*/
static inline uint8_t mavlink_msg_set_cam_shutter_get_trigger_pin(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 10);
return _MAV_RETURN_uint8_t(msg, 2);
}
/**
......@@ -210,7 +210,7 @@ static inline uint8_t mavlink_msg_set_cam_shutter_get_trigger_pin(const mavlink_
*/
static inline uint16_t mavlink_msg_set_cam_shutter_get_interval(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 4);
return _MAV_RETURN_uint16_t(msg, 3);
}
/**
......@@ -220,7 +220,7 @@ static inline uint16_t mavlink_msg_set_cam_shutter_get_interval(const mavlink_me
*/
static inline uint16_t mavlink_msg_set_cam_shutter_get_exposure(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 6);
return _MAV_RETURN_uint16_t(msg, 5);
}
/**
......@@ -230,7 +230,7 @@ static inline uint16_t mavlink_msg_set_cam_shutter_get_exposure(const mavlink_me
*/
static inline float mavlink_msg_set_cam_shutter_get_gain(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 0);
return _MAV_RETURN_float(msg, 7);
}
/**
......@@ -242,12 +242,12 @@ static inline float mavlink_msg_set_cam_shutter_get_gain(const mavlink_message_t
static inline void mavlink_msg_set_cam_shutter_decode(const mavlink_message_t* msg, mavlink_set_cam_shutter_t* set_cam_shutter)
{
#if MAVLINK_NEED_BYTE_SWAP
set_cam_shutter->gain = mavlink_msg_set_cam_shutter_get_gain(msg);
set_cam_shutter->interval = mavlink_msg_set_cam_shutter_get_interval(msg);
set_cam_shutter->exposure = mavlink_msg_set_cam_shutter_get_exposure(msg);
set_cam_shutter->cam_no = mavlink_msg_set_cam_shutter_get_cam_no(msg);
set_cam_shutter->cam_mode = mavlink_msg_set_cam_shutter_get_cam_mode(msg);
set_cam_shutter->trigger_pin = mavlink_msg_set_cam_shutter_get_trigger_pin(msg);
set_cam_shutter->interval = mavlink_msg_set_cam_shutter_get_interval(msg);
set_cam_shutter->exposure = mavlink_msg_set_cam_shutter_get_exposure(msg);
set_cam_shutter->gain = mavlink_msg_set_cam_shutter_get_gain(msg);
#else
memcpy(set_cam_shutter, _MAV_PAYLOAD(msg), 11);
#endif
......
mavlink/include/v1.0/common/mavlink_msg_vicon_position_estimate.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_vicon_position_estimate.h
View file @ 44d3d10d
// MESSAGE VICON_POSITION_ESTIMATE PACKING
#define MAVLINK_MSG_ID_VICON_POSITION_ESTIMATE 104
#define MAVLINK_MSG_ID_VICON_POSITION_ESTIMATE 157
typedef struct __mavlink_vicon_position_estimate_t
{
......@@ -14,7 +14,7 @@ typedef struct __mavlink_vicon_position_estimate_t
} mavlink_vicon_position_estimate_t;
#define MAVLINK_MSG_ID_VICON_POSITION_ESTIMATE_LEN 32
#define MAVLINK_MSG_ID_104_LEN 32
#define MAVLINK_MSG_ID_157_LEN 32
......@@ -75,7 +75,7 @@ static inline uint16_t mavlink_msg_vicon_position_estimate_pack(uint8_t system_i
#endif
msg->msgid = MAVLINK_MSG_ID_VICON_POSITION_ESTIMATE;
return mavlink_finalize_message(msg, system_id, component_id, 32, 56);
return mavlink_finalize_message(msg, system_id, component_id, 32);
}
/**
......@@ -122,7 +122,7 @@ static inline uint16_t mavlink_msg_vicon_position_estimate_pack_chan(uint8_t sys
#endif
msg->msgid = MAVLINK_MSG_ID_VICON_POSITION_ESTIMATE;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 32, 56);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 32);
}
/**
......@@ -164,7 +164,7 @@ static inline void mavlink_msg_vicon_position_estimate_send(mavlink_channel_t ch
_mav_put_float(buf, 24, pitch);
_mav_put_float(buf, 28, yaw);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VICON_POSITION_ESTIMATE, buf, 32, 56);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VICON_POSITION_ESTIMATE, buf, 32);
#else
mavlink_vicon_position_estimate_t packet;
packet.usec = usec;
......@@ -175,7 +175,7 @@ static inline void mavlink_msg_vicon_position_estimate_send(mavlink_channel_t ch
packet.pitch = pitch;
packet.yaw = yaw;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VICON_POSITION_ESTIMATE, (const char *)&packet, 32, 56);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VICON_POSITION_ESTIMATE, (const char *)&packet, 32);
#endif
}
......
mavlink/include/v1.0/common/mavlink_msg_vision_position_estimate.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_vision_position_estimate.h
View file @ 44d3d10d
// MESSAGE VISION_POSITION_ESTIMATE PACKING
#define MAVLINK_MSG_ID_VISION_POSITION_ESTIMATE 102
#define MAVLINK_MSG_ID_VISION_POSITION_ESTIMATE 156
typedef struct __mavlink_vision_position_estimate_t
{
......@@ -14,7 +14,7 @@ typedef struct __mavlink_vision_position_estimate_t
} mavlink_vision_position_estimate_t;
#define MAVLINK_MSG_ID_VISION_POSITION_ESTIMATE_LEN 32
#define MAVLINK_MSG_ID_102_LEN 32
#define MAVLINK_MSG_ID_156_LEN 32
......@@ -75,7 +75,7 @@ static inline uint16_t mavlink_msg_vision_position_estimate_pack(uint8_t system_
#endif
msg->msgid = MAVLINK_MSG_ID_VISION_POSITION_ESTIMATE;
return mavlink_finalize_message(msg, system_id, component_id, 32, 158);
return mavlink_finalize_message(msg, system_id, component_id, 32);
}
/**
......@@ -122,7 +122,7 @@ static inline uint16_t mavlink_msg_vision_position_estimate_pack_chan(uint8_t sy
#endif
msg->msgid = MAVLINK_MSG_ID_VISION_POSITION_ESTIMATE;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 32, 158);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 32);
}
/**
......@@ -164,7 +164,7 @@ static inline void mavlink_msg_vision_position_estimate_send(mavlink_channel_t c
_mav_put_float(buf, 24, pitch);
_mav_put_float(buf, 28, yaw);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VISION_POSITION_ESTIMATE, buf, 32, 158);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VISION_POSITION_ESTIMATE, buf, 32);
#else
mavlink_vision_position_estimate_t packet;
packet.usec = usec;
......@@ -175,7 +175,7 @@ static inline void mavlink_msg_vision_position_estimate_send(mavlink_channel_t c
packet.pitch = pitch;
packet.yaw = yaw;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VISION_POSITION_ESTIMATE, (const char *)&packet, 32, 158);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VISION_POSITION_ESTIMATE, (const char *)&packet, 32);
#endif
}
......
mavlink/include/v1.0/common/mavlink_msg_vision_speed_estimate.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_vision_speed_estimate.h
View file @ 44d3d10d
// MESSAGE VISION_SPEED_ESTIMATE PACKING
#define MAVLINK_MSG_ID_VISION_SPEED_ESTIMATE 103
#define MAVLINK_MSG_ID_VISION_SPEED_ESTIMATE 158
typedef struct __mavlink_vision_speed_estimate_t
{
......@@ -11,7 +11,7 @@ typedef struct __mavlink_vision_speed_estimate_t
} mavlink_vision_speed_estimate_t;
#define MAVLINK_MSG_ID_VISION_SPEED_ESTIMATE_LEN 20
#define MAVLINK_MSG_ID_103_LEN 20
#define MAVLINK_MSG_ID_158_LEN 20
......@@ -60,7 +60,7 @@ static inline uint16_t mavlink_msg_vision_speed_estimate_pack(uint8_t system_id,
#endif
msg->msgid = MAVLINK_MSG_ID_VISION_SPEED_ESTIMATE;
return mavlink_finalize_message(msg, system_id, component_id, 20, 208);
return mavlink_finalize_message(msg, system_id, component_id, 20);
}
/**
......@@ -98,7 +98,7 @@ static inline uint16_t mavlink_msg_vision_speed_estimate_pack_chan(uint8_t syste
#endif
msg->msgid = MAVLINK_MSG_ID_VISION_SPEED_ESTIMATE;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 20, 208);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 20);
}
/**
......@@ -134,7 +134,7 @@ static inline void mavlink_msg_vision_speed_estimate_send(mavlink_channel_t chan
_mav_put_float(buf, 12, y);
_mav_put_float(buf, 16, z);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VISION_SPEED_ESTIMATE, buf, 20, 208);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VISION_SPEED_ESTIMATE, buf, 20);
#else
mavlink_vision_speed_estimate_t packet;
packet.usec = usec;
......@@ -142,7 +142,7 @@ static inline void mavlink_msg_vision_speed_estimate_send(mavlink_channel_t chan
packet.y = y;
packet.z = z;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VISION_SPEED_ESTIMATE, (const char *)&packet, 20, 208);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_VISION_SPEED_ESTIMATE, (const char *)&packet, 20);
#endif
}
......
mavlink/include/v1.0/pixhawk/mavlink_msg_watchdog_command.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_command.h
View file @ 44d3d10d
......@@ -4,9 +4,9 @@
typedef struct __mavlink_watchdog_command_t
{
uint8_t target_system_id; ///< Target system ID
uint16_t watchdog_id; ///< Watchdog ID
uint16_t process_id; ///< Process ID
uint8_t target_system_id; ///< Target system ID
uint8_t command_id; ///< Command ID
} mavlink_watchdog_command_t;
......@@ -18,9 +18,9 @@ typedef struct __mavlink_watchdog_command_t
#define MAVLINK_MESSAGE_INFO_WATCHDOG_COMMAND { \
"WATCHDOG_COMMAND", \
4, \
{ { "watchdog_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_watchdog_command_t, watchdog_id) }, \
{ "process_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_watchdog_command_t, process_id) }, \
{ "target_system_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_watchdog_command_t, target_system_id) }, \
{ { "target_system_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_watchdog_command_t, target_system_id) }, \
{ "watchdog_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 1, offsetof(mavlink_watchdog_command_t, watchdog_id) }, \
{ "process_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 3, offsetof(mavlink_watchdog_command_t, process_id) }, \
{ "command_id", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_watchdog_command_t, command_id) }, \
} \
}
......@@ -43,24 +43,24 @@ static inline uint16_t mavlink_msg_watchdog_command_pack(uint8_t system_id, uint
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[6];
_mav_put_uint16_t(buf, 0, watchdog_id);
_mav_put_uint16_t(buf, 2, process_id);
_mav_put_uint8_t(buf, 4, target_system_id);
_mav_put_uint8_t(buf, 0, target_system_id);
_mav_put_uint16_t(buf, 1, watchdog_id);
_mav_put_uint16_t(buf, 3, process_id);
_mav_put_uint8_t(buf, 5, command_id);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 6);
#else
mavlink_watchdog_command_t packet;
packet.target_system_id = target_system_id;
packet.watchdog_id = watchdog_id;
packet.process_id = process_id;
packet.target_system_id = target_system_id;
packet.command_id = command_id;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 6);
#endif
msg->msgid = MAVLINK_MSG_ID_WATCHDOG_COMMAND;
return mavlink_finalize_message(msg, system_id, component_id, 6, 162);
return mavlink_finalize_message(msg, system_id, component_id, 6);
}
/**
......@@ -81,24 +81,24 @@ static inline uint16_t mavlink_msg_watchdog_command_pack_chan(uint8_t system_id,
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[6];
_mav_put_uint16_t(buf, 0, watchdog_id);
_mav_put_uint16_t(buf, 2, process_id);
_mav_put_uint8_t(buf, 4, target_system_id);
_mav_put_uint8_t(buf, 0, target_system_id);
_mav_put_uint16_t(buf, 1, watchdog_id);
_mav_put_uint16_t(buf, 3, process_id);
_mav_put_uint8_t(buf, 5, command_id);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 6);
#else
mavlink_watchdog_command_t packet;
packet.target_system_id = target_system_id;
packet.watchdog_id = watchdog_id;
packet.process_id = process_id;
packet.target_system_id = target_system_id;
packet.command_id = command_id;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 6);
#endif
msg->msgid = MAVLINK_MSG_ID_WATCHDOG_COMMAND;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 6, 162);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 6);
}
/**
......@@ -129,20 +129,20 @@ static inline void mavlink_msg_watchdog_command_send(mavlink_channel_t chan, uin
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[6];
_mav_put_uint16_t(buf, 0, watchdog_id);
_mav_put_uint16_t(buf, 2, process_id);
_mav_put_uint8_t(buf, 4, target_system_id);
_mav_put_uint8_t(buf, 0, target_system_id);
_mav_put_uint16_t(buf, 1, watchdog_id);
_mav_put_uint16_t(buf, 3, process_id);
_mav_put_uint8_t(buf, 5, command_id);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_COMMAND, buf, 6, 162);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_COMMAND, buf, 6);
#else
mavlink_watchdog_command_t packet;
packet.target_system_id = target_system_id;
packet.watchdog_id = watchdog_id;
packet.process_id = process_id;
packet.target_system_id = target_system_id;
packet.command_id = command_id;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_COMMAND, (const char *)&packet, 6, 162);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_COMMAND, (const char *)&packet, 6);
#endif
}
......@@ -158,7 +158,7 @@ static inline void mavlink_msg_watchdog_command_send(mavlink_channel_t chan, uin
*/
static inline uint8_t mavlink_msg_watchdog_command_get_target_system_id(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 4);
return _MAV_RETURN_uint8_t(msg, 0);
}
/**
......@@ -168,7 +168,7 @@ static inline uint8_t mavlink_msg_watchdog_command_get_target_system_id(const ma
*/
static inline uint16_t mavlink_msg_watchdog_command_get_watchdog_id(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 0);
return _MAV_RETURN_uint16_t(msg, 1);
}
/**
......@@ -178,7 +178,7 @@ static inline uint16_t mavlink_msg_watchdog_command_get_watchdog_id(const mavlin
*/
static inline uint16_t mavlink_msg_watchdog_command_get_process_id(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 2);
return _MAV_RETURN_uint16_t(msg, 3);
}
/**
......@@ -200,9 +200,9 @@ static inline uint8_t mavlink_msg_watchdog_command_get_command_id(const mavlink_
static inline void mavlink_msg_watchdog_command_decode(const mavlink_message_t* msg, mavlink_watchdog_command_t* watchdog_command)
{
#if MAVLINK_NEED_BYTE_SWAP
watchdog_command->target_system_id = mavlink_msg_watchdog_command_get_target_system_id(msg);
watchdog_command->watchdog_id = mavlink_msg_watchdog_command_get_watchdog_id(msg);
watchdog_command->process_id = mavlink_msg_watchdog_command_get_process_id(msg);
watchdog_command->target_system_id = mavlink_msg_watchdog_command_get_target_system_id(msg);
watchdog_command->command_id = mavlink_msg_watchdog_command_get_command_id(msg);
#else
memcpy(watchdog_command, _MAV_PAYLOAD(msg), 6);
......
mavlink/include/v1.0/pixhawk/mavlink_msg_watchdog_heartbeat.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_heartbeat.h
View file @ 44d3d10d
......@@ -50,7 +50,7 @@ static inline uint16_t mavlink_msg_watchdog_heartbeat_pack(uint8_t system_id, ui
#endif
msg->msgid = MAVLINK_MSG_ID_WATCHDOG_HEARTBEAT;
return mavlink_finalize_message(msg, system_id, component_id, 4, 153);
return mavlink_finalize_message(msg, system_id, component_id, 4);
}
/**
......@@ -82,7 +82,7 @@ static inline uint16_t mavlink_msg_watchdog_heartbeat_pack_chan(uint8_t system_i
#endif
msg->msgid = MAVLINK_MSG_ID_WATCHDOG_HEARTBEAT;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 4, 153);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 4);
}
/**
......@@ -114,13 +114,13 @@ static inline void mavlink_msg_watchdog_heartbeat_send(mavlink_channel_t chan, u
_mav_put_uint16_t(buf, 0, watchdog_id);
_mav_put_uint16_t(buf, 2, process_count);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_HEARTBEAT, buf, 4, 153);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_HEARTBEAT, buf, 4);
#else
mavlink_watchdog_heartbeat_t packet;
packet.watchdog_id = watchdog_id;
packet.process_count = process_count;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_HEARTBEAT, (const char *)&packet, 4, 153);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_HEARTBEAT, (const char *)&packet, 4);
#endif
}
......
mavlink/include/v1.0/pixhawk/mavlink_msg_watchdog_process_info.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_process_info.h
View file @ 44d3d10d
......@@ -4,11 +4,11 @@
typedef struct __mavlink_watchdog_process_info_t
{
int32_t timeout; ///< Timeout (seconds)
uint16_t watchdog_id; ///< Watchdog ID
uint16_t process_id; ///< Process ID
char name[100]; ///< Process name
char arguments[147]; ///< Process arguments
int32_t timeout; ///< Timeout (seconds)
} mavlink_watchdog_process_info_t;
#define MAVLINK_MSG_ID_WATCHDOG_PROCESS_INFO_LEN 255
......@@ -20,11 +20,11 @@ typedef struct __mavlink_watchdog_process_info_t
#define MAVLINK_MESSAGE_INFO_WATCHDOG_PROCESS_INFO { \
"WATCHDOG_PROCESS_INFO", \
5, \
{ { "timeout", NULL, MAVLINK_TYPE_INT32_T, 0, 0, offsetof(mavlink_watchdog_process_info_t, timeout) }, \
{ "watchdog_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 4, offsetof(mavlink_watchdog_process_info_t, watchdog_id) }, \
{ "process_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 6, offsetof(mavlink_watchdog_process_info_t, process_id) }, \
{ "name", NULL, MAVLINK_TYPE_CHAR, 100, 8, offsetof(mavlink_watchdog_process_info_t, name) }, \
{ "arguments", NULL, MAVLINK_TYPE_CHAR, 147, 108, offsetof(mavlink_watchdog_process_info_t, arguments) }, \
{ { "watchdog_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_watchdog_process_info_t, watchdog_id) }, \
{ "process_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_watchdog_process_info_t, process_id) }, \
{ "name", NULL, MAVLINK_TYPE_CHAR, 100, 4, offsetof(mavlink_watchdog_process_info_t, name) }, \
{ "arguments", NULL, MAVLINK_TYPE_CHAR, 147, 104, offsetof(mavlink_watchdog_process_info_t, arguments) }, \
{ "timeout", NULL, MAVLINK_TYPE_INT32_T, 0, 251, offsetof(mavlink_watchdog_process_info_t, timeout) }, \
} \
}
......@@ -47,24 +47,24 @@ static inline uint16_t mavlink_msg_watchdog_process_info_pack(uint8_t system_id,
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[255];
_mav_put_int32_t(buf, 0, timeout);
_mav_put_uint16_t(buf, 4, watchdog_id);
_mav_put_uint16_t(buf, 6, process_id);
_mav_put_char_array(buf, 8, name, 100);
_mav_put_char_array(buf, 108, arguments, 147);
_mav_put_uint16_t(buf, 0, watchdog_id);
_mav_put_uint16_t(buf, 2, process_id);
_mav_put_int32_t(buf, 251, timeout);
_mav_put_char_array(buf, 4, name, 100);
_mav_put_char_array(buf, 104, arguments, 147);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 255);
#else
mavlink_watchdog_process_info_t packet;
packet.timeout = timeout;
packet.watchdog_id = watchdog_id;
packet.process_id = process_id;
packet.timeout = timeout;
mav_array_memcpy(packet.name, name, sizeof(char)*100);
mav_array_memcpy(packet.arguments, arguments, sizeof(char)*147);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 255);
#endif
msg->msgid = MAVLINK_MSG_ID_WATCHDOG_PROCESS_INFO;
return mavlink_finalize_message(msg, system_id, component_id, 255, 16);
return mavlink_finalize_message(msg, system_id, component_id, 255);
}
/**
......@@ -86,24 +86,24 @@ static inline uint16_t mavlink_msg_watchdog_process_info_pack_chan(uint8_t syste
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[255];
_mav_put_int32_t(buf, 0, timeout);
_mav_put_uint16_t(buf, 4, watchdog_id);
_mav_put_uint16_t(buf, 6, process_id);
_mav_put_char_array(buf, 8, name, 100);
_mav_put_char_array(buf, 108, arguments, 147);
_mav_put_uint16_t(buf, 0, watchdog_id);
_mav_put_uint16_t(buf, 2, process_id);
_mav_put_int32_t(buf, 251, timeout);
_mav_put_char_array(buf, 4, name, 100);
_mav_put_char_array(buf, 104, arguments, 147);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 255);
#else
mavlink_watchdog_process_info_t packet;
packet.timeout = timeout;
packet.watchdog_id = watchdog_id;
packet.process_id = process_id;
packet.timeout = timeout;
mav_array_memcpy(packet.name, name, sizeof(char)*100);
mav_array_memcpy(packet.arguments, arguments, sizeof(char)*147);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 255);
#endif
msg->msgid = MAVLINK_MSG_ID_WATCHDOG_PROCESS_INFO;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 255, 16);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 255);
}
/**
......@@ -135,20 +135,20 @@ static inline void mavlink_msg_watchdog_process_info_send(mavlink_channel_t chan
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[255];
_mav_put_int32_t(buf, 0, timeout);
_mav_put_uint16_t(buf, 4, watchdog_id);
_mav_put_uint16_t(buf, 6, process_id);
_mav_put_char_array(buf, 8, name, 100);
_mav_put_char_array(buf, 108, arguments, 147);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_PROCESS_INFO, buf, 255, 16);
_mav_put_uint16_t(buf, 0, watchdog_id);
_mav_put_uint16_t(buf, 2, process_id);
_mav_put_int32_t(buf, 251, timeout);
_mav_put_char_array(buf, 4, name, 100);
_mav_put_char_array(buf, 104, arguments, 147);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_PROCESS_INFO, buf, 255);
#else
mavlink_watchdog_process_info_t packet;
packet.timeout = timeout;
packet.watchdog_id = watchdog_id;
packet.process_id = process_id;
packet.timeout = timeout;
mav_array_memcpy(packet.name, name, sizeof(char)*100);
mav_array_memcpy(packet.arguments, arguments, sizeof(char)*147);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_PROCESS_INFO, (const char *)&packet, 255, 16);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_PROCESS_INFO, (const char *)&packet, 255);
#endif
}
......@@ -164,7 +164,7 @@ static inline void mavlink_msg_watchdog_process_info_send(mavlink_channel_t chan
*/
static inline uint16_t mavlink_msg_watchdog_process_info_get_watchdog_id(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 4);
return _MAV_RETURN_uint16_t(msg, 0);
}
/**
......@@ -174,7 +174,7 @@ static inline uint16_t mavlink_msg_watchdog_process_info_get_watchdog_id(const m
*/
static inline uint16_t mavlink_msg_watchdog_process_info_get_process_id(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 6);
return _MAV_RETURN_uint16_t(msg, 2);
}
/**
......@@ -184,7 +184,7 @@ static inline uint16_t mavlink_msg_watchdog_process_info_get_process_id(const ma
*/
static inline uint16_t mavlink_msg_watchdog_process_info_get_name(const mavlink_message_t* msg, char *name)
{
return _MAV_RETURN_char_array(msg, name, 100, 8);
return _MAV_RETURN_char_array(msg, name, 100, 4);
}
/**
......@@ -194,7 +194,7 @@ static inline uint16_t mavlink_msg_watchdog_process_info_get_name(const mavlink_
*/
static inline uint16_t mavlink_msg_watchdog_process_info_get_arguments(const mavlink_message_t* msg, char *arguments)
{
return _MAV_RETURN_char_array(msg, arguments, 147, 108);
return _MAV_RETURN_char_array(msg, arguments, 147, 104);
}
/**
......@@ -204,7 +204,7 @@ static inline uint16_t mavlink_msg_watchdog_process_info_get_arguments(const mav
*/
static inline int32_t mavlink_msg_watchdog_process_info_get_timeout(const mavlink_message_t* msg)
{
return _MAV_RETURN_int32_t(msg, 0);
return _MAV_RETURN_int32_t(msg, 251);
}
/**
......@@ -216,11 +216,11 @@ static inline int32_t mavlink_msg_watchdog_process_info_get_timeout(const mavlin
static inline void mavlink_msg_watchdog_process_info_decode(const mavlink_message_t* msg, mavlink_watchdog_process_info_t* watchdog_process_info)
{
#if MAVLINK_NEED_BYTE_SWAP
watchdog_process_info->timeout = mavlink_msg_watchdog_process_info_get_timeout(msg);
watchdog_process_info->watchdog_id = mavlink_msg_watchdog_process_info_get_watchdog_id(msg);
watchdog_process_info->process_id = mavlink_msg_watchdog_process_info_get_process_id(msg);
mavlink_msg_watchdog_process_info_get_name(msg, watchdog_process_info->name);
mavlink_msg_watchdog_process_info_get_arguments(msg, watchdog_process_info->arguments);
watchdog_process_info->timeout = mavlink_msg_watchdog_process_info_get_timeout(msg);
#else
memcpy(watchdog_process_info, _MAV_PAYLOAD(msg), 255);
#endif
......
mavlink/include/v1.0/pixhawk/mavlink_msg_watchdog_process_status.h → mavlink/include/mavlink/v0.9/pixhawk/mavlink_msg_watchdog_process_status.h
View file @ 44d3d10d
......@@ -4,12 +4,12 @@
typedef struct __mavlink_watchdog_process_status_t
{
int32_t pid; ///< PID
uint16_t watchdog_id; ///< Watchdog ID
uint16_t process_id; ///< Process ID
uint16_t crashes; ///< Number of crashes
uint8_t state; ///< Is running / finished / suspended / crashed
uint8_t muted; ///< Is muted
int32_t pid; ///< PID
uint16_t crashes; ///< Number of crashes
} mavlink_watchdog_process_status_t;
#define MAVLINK_MSG_ID_WATCHDOG_PROCESS_STATUS_LEN 12
......@@ -20,12 +20,12 @@ typedef struct __mavlink_watchdog_process_status_t
#define MAVLINK_MESSAGE_INFO_WATCHDOG_PROCESS_STATUS { \
"WATCHDOG_PROCESS_STATUS", \
6, \
{ { "pid", NULL, MAVLINK_TYPE_INT32_T, 0, 0, offsetof(mavlink_watchdog_process_status_t, pid) }, \
{ "watchdog_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 4, offsetof(mavlink_watchdog_process_status_t, watchdog_id) }, \
{ "process_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 6, offsetof(mavlink_watchdog_process_status_t, process_id) }, \
{ "crashes", NULL, MAVLINK_TYPE_UINT16_T, 0, 8, offsetof(mavlink_watchdog_process_status_t, crashes) }, \
{ "state", NULL, MAVLINK_TYPE_UINT8_T, 0, 10, offsetof(mavlink_watchdog_process_status_t, state) }, \
{ "muted", NULL, MAVLINK_TYPE_UINT8_T, 0, 11, offsetof(mavlink_watchdog_process_status_t, muted) }, \
{ { "watchdog_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 0, offsetof(mavlink_watchdog_process_status_t, watchdog_id) }, \
{ "process_id", NULL, MAVLINK_TYPE_UINT16_T, 0, 2, offsetof(mavlink_watchdog_process_status_t, process_id) }, \
{ "state", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_watchdog_process_status_t, state) }, \
{ "muted", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_watchdog_process_status_t, muted) }, \
{ "pid", NULL, MAVLINK_TYPE_INT32_T, 0, 6, offsetof(mavlink_watchdog_process_status_t, pid) }, \
{ "crashes", NULL, MAVLINK_TYPE_UINT16_T, 0, 10, offsetof(mavlink_watchdog_process_status_t, crashes) }, \
} \
}
......@@ -49,28 +49,28 @@ static inline uint16_t mavlink_msg_watchdog_process_status_pack(uint8_t system_i
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[12];
_mav_put_int32_t(buf, 0, pid);
_mav_put_uint16_t(buf, 4, watchdog_id);
_mav_put_uint16_t(buf, 6, process_id);
_mav_put_uint16_t(buf, 8, crashes);
_mav_put_uint8_t(buf, 10, state);
_mav_put_uint8_t(buf, 11, muted);
_mav_put_uint16_t(buf, 0, watchdog_id);
_mav_put_uint16_t(buf, 2, process_id);
_mav_put_uint8_t(buf, 4, state);
_mav_put_uint8_t(buf, 5, muted);
_mav_put_int32_t(buf, 6, pid);
_mav_put_uint16_t(buf, 10, crashes);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 12);
#else
mavlink_watchdog_process_status_t packet;
packet.pid = pid;
packet.watchdog_id = watchdog_id;
packet.process_id = process_id;
packet.crashes = crashes;
packet.state = state;
packet.muted = muted;
packet.pid = pid;
packet.crashes = crashes;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 12);
#endif
msg->msgid = MAVLINK_MSG_ID_WATCHDOG_PROCESS_STATUS;
return mavlink_finalize_message(msg, system_id, component_id, 12, 29);
return mavlink_finalize_message(msg, system_id, component_id, 12);
}
/**
......@@ -93,28 +93,28 @@ static inline uint16_t mavlink_msg_watchdog_process_status_pack_chan(uint8_t sys
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[12];
_mav_put_int32_t(buf, 0, pid);
_mav_put_uint16_t(buf, 4, watchdog_id);
_mav_put_uint16_t(buf, 6, process_id);
_mav_put_uint16_t(buf, 8, crashes);
_mav_put_uint8_t(buf, 10, state);
_mav_put_uint8_t(buf, 11, muted);
_mav_put_uint16_t(buf, 0, watchdog_id);
_mav_put_uint16_t(buf, 2, process_id);
_mav_put_uint8_t(buf, 4, state);
_mav_put_uint8_t(buf, 5, muted);
_mav_put_int32_t(buf, 6, pid);
_mav_put_uint16_t(buf, 10, crashes);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 12);
#else
mavlink_watchdog_process_status_t packet;
packet.pid = pid;
packet.watchdog_id = watchdog_id;
packet.process_id = process_id;
packet.crashes = crashes;
packet.state = state;
packet.muted = muted;
packet.pid = pid;
packet.crashes = crashes;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 12);
#endif
msg->msgid = MAVLINK_MSG_ID_WATCHDOG_PROCESS_STATUS;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 12, 29);
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 12);
}
/**
......@@ -147,24 +147,24 @@ static inline void mavlink_msg_watchdog_process_status_send(mavlink_channel_t ch
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[12];
_mav_put_int32_t(buf, 0, pid);
_mav_put_uint16_t(buf, 4, watchdog_id);
_mav_put_uint16_t(buf, 6, process_id);
_mav_put_uint16_t(buf, 8, crashes);
_mav_put_uint8_t(buf, 10, state);
_mav_put_uint8_t(buf, 11, muted);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_PROCESS_STATUS, buf, 12, 29);
_mav_put_uint16_t(buf, 0, watchdog_id);
_mav_put_uint16_t(buf, 2, process_id);
_mav_put_uint8_t(buf, 4, state);
_mav_put_uint8_t(buf, 5, muted);
_mav_put_int32_t(buf, 6, pid);
_mav_put_uint16_t(buf, 10, crashes);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_PROCESS_STATUS, buf, 12);
#else
mavlink_watchdog_process_status_t packet;
packet.pid = pid;
packet.watchdog_id = watchdog_id;
packet.process_id = process_id;
packet.crashes = crashes;
packet.state = state;
packet.muted = muted;
packet.pid = pid;
packet.crashes = crashes;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_PROCESS_STATUS, (const char *)&packet, 12, 29);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_WATCHDOG_PROCESS_STATUS, (const char *)&packet, 12);
#endif
}
......@@ -180,7 +180,7 @@ static inline void mavlink_msg_watchdog_process_status_send(mavlink_channel_t ch
*/
static inline uint16_t mavlink_msg_watchdog_process_status_get_watchdog_id(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 4);
return _MAV_RETURN_uint16_t(msg, 0);
}
/**
......@@ -190,7 +190,7 @@ static inline uint16_t mavlink_msg_watchdog_process_status_get_watchdog_id(const
*/
static inline uint16_t mavlink_msg_watchdog_process_status_get_process_id(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 6);
return _MAV_RETURN_uint16_t(msg, 2);
}
/**
......@@ -200,7 +200,7 @@ static inline uint16_t mavlink_msg_watchdog_process_status_get_process_id(const
*/
static inline uint8_t mavlink_msg_watchdog_process_status_get_state(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 10);
return _MAV_RETURN_uint8_t(msg, 4);
}
/**
......@@ -210,7 +210,7 @@ static inline uint8_t mavlink_msg_watchdog_process_status_get_state(const mavlin
*/
static inline uint8_t mavlink_msg_watchdog_process_status_get_muted(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint8_t(msg, 11);
return _MAV_RETURN_uint8_t(msg, 5);
}
/**
......@@ -220,7 +220,7 @@ static inline uint8_t mavlink_msg_watchdog_process_status_get_muted(const mavlin
*/
static inline int32_t mavlink_msg_watchdog_process_status_get_pid(const mavlink_message_t* msg)
{
return _MAV_RETURN_int32_t(msg, 0);
return _MAV_RETURN_int32_t(msg, 6);
}
/**
......@@ -230,7 +230,7 @@ static inline int32_t mavlink_msg_watchdog_process_status_get_pid(const mavlink_
*/
static inline uint16_t mavlink_msg_watchdog_process_status_get_crashes(const mavlink_message_t* msg)
{
return _MAV_RETURN_uint16_t(msg, 8);
return _MAV_RETURN_uint16_t(msg, 10);
}
/**
......@@ -242,12 +242,12 @@ static inline uint16_t mavlink_msg_watchdog_process_status_get_crashes(const mav
static inline void mavlink_msg_watchdog_process_status_decode(const mavlink_message_t* msg, mavlink_watchdog_process_status_t* watchdog_process_status)
{
#if MAVLINK_NEED_BYTE_SWAP
watchdog_process_status->pid = mavlink_msg_watchdog_process_status_get_pid(msg);
watchdog_process_status->watchdog_id = mavlink_msg_watchdog_process_status_get_watchdog_id(msg);
watchdog_process_status->process_id = mavlink_msg_watchdog_process_status_get_process_id(msg);
watchdog_process_status->crashes = mavlink_msg_watchdog_process_status_get_crashes(msg);
watchdog_process_status->state = mavlink_msg_watchdog_process_status_get_state(msg);
watchdog_process_status->muted = mavlink_msg_watchdog_process_status_get_muted(msg);
watchdog_process_status->pid = mavlink_msg_watchdog_process_status_get_pid(msg);
watchdog_process_status->crashes = mavlink_msg_watchdog_process_status_get_crashes(msg);
#else
memcpy(watchdog_process_status, _MAV_PAYLOAD(msg), 12);
#endif
......
mavlink/include/v1.0/pixhawk/version.h → mavlink/include/mavlink/v0.9/pixhawk/version.h
View file @ 44d3d10d
......@@ -5,8 +5,8 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Fri Apr 20 10:00:51 2012"
#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:50 2012"
#define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
#endif // MAVLINK_VERSION_H
mavlink/include/mavlink/v0.9/slugs/version.h
View file @ 44d3d10d
......@@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Thu Apr 19 19:44:32 2012"
#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:52 2012"
#define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
......
mavlink/include/mavlink/v0.9/test/version.h
View file @ 44d3d10d
......@@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Thu Apr 19 19:44:56 2012"
#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:53 2012"
#define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 179
......
mavlink/include/mavlink/v0.9/ualberta/version.h
View file @ 44d3d10d
......@@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Thu Apr 19 19:44:39 2012"
#define MAVLINK_BUILD_DATE "Fri Apr 20 12:22:54 2012"
#define MAVLINK_WIRE_PROTOCOL_VERSION "0.9"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
......
mavlink/include/mavlink/v1.0/ardupilotmega/mavlink_msg_dcm.h deleted 100644 → 0
View file @ f7785989
// MESSAGE DCM PACKING
#define MAVLINK_MSG_ID_DCM 163
typedef struct __mavlink_dcm_t
{
float omegaIx; ///< X gyro drift estimate rad/s
float omegaIy; ///< Y gyro drift estimate rad/s
float omegaIz; ///< Z gyro drift estimate rad/s
float accel_weight; ///< average accel_weight
float renorm_val; ///< average renormalisation value
float error_rp; ///< average error_roll_pitch value
float error_yaw; ///< average error_yaw value
} mavlink_dcm_t;
#define MAVLINK_MSG_ID_DCM_LEN 28
#define MAVLINK_MSG_ID_163_LEN 28
#define MAVLINK_MESSAGE_INFO_DCM { \
"DCM", \
7, \
{ { "omegaIx", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_dcm_t, omegaIx) }, \
{ "omegaIy", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_dcm_t, omegaIy) }, \
{ "omegaIz", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_dcm_t, omegaIz) }, \
{ "accel_weight", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_dcm_t, accel_weight) }, \
{ "renorm_val", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_dcm_t, renorm_val) }, \
{ "error_rp", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_dcm_t, error_rp) }, \
{ "error_yaw", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_dcm_t, error_yaw) }, \
} \
}
/**
* @brief Pack a dcm message
* @param system_id ID of this system
* @param component_id ID of this component (e.g. 200 for IMU)
* @param msg The MAVLink message to compress the data into
*
* @param omegaIx X gyro drift estimate rad/s
* @param omegaIy Y gyro drift estimate rad/s
* @param omegaIz Z gyro drift estimate rad/s
* @param accel_weight average accel_weight
* @param renorm_val average renormalisation value
* @param error_rp average error_roll_pitch value
* @param error_yaw average error_yaw value
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_dcm_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
float omegaIx, float omegaIy, float omegaIz, float accel_weight, float renorm_val, float error_rp, float error_yaw)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[28];
_mav_put_float(buf, 0, omegaIx);
_mav_put_float(buf, 4, omegaIy);
_mav_put_float(buf, 8, omegaIz);
_mav_put_float(buf, 12, accel_weight);
_mav_put_float(buf, 16, renorm_val);
_mav_put_float(buf, 20, error_rp);
_mav_put_float(buf, 24, error_yaw);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 28);
#else
mavlink_dcm_t packet;
packet.omegaIx = omegaIx;
packet.omegaIy = omegaIy;
packet.omegaIz = omegaIz;
packet.accel_weight = accel_weight;
packet.renorm_val = renorm_val;
packet.error_rp = error_rp;
packet.error_yaw = error_yaw;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 28);
#endif
msg->msgid = MAVLINK_MSG_ID_DCM;
return mavlink_finalize_message(msg, system_id, component_id, 28, 205);
}
/**
* @brief Pack a dcm message on a channel
* @param system_id ID of this system
* @param component_id ID of this component (e.g. 200 for IMU)
* @param chan The MAVLink channel this message was sent over
* @param msg The MAVLink message to compress the data into
* @param omegaIx X gyro drift estimate rad/s
* @param omegaIy Y gyro drift estimate rad/s
* @param omegaIz Z gyro drift estimate rad/s
* @param accel_weight average accel_weight
* @param renorm_val average renormalisation value
* @param error_rp average error_roll_pitch value
* @param error_yaw average error_yaw value
* @return length of the message in bytes (excluding serial stream start sign)
*/
static inline uint16_t mavlink_msg_dcm_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
mavlink_message_t* msg,
float omegaIx,float omegaIy,float omegaIz,float accel_weight,float renorm_val,float error_rp,float error_yaw)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[28];
_mav_put_float(buf, 0, omegaIx);
_mav_put_float(buf, 4, omegaIy);
_mav_put_float(buf, 8, omegaIz);
_mav_put_float(buf, 12, accel_weight);
_mav_put_float(buf, 16, renorm_val);
_mav_put_float(buf, 20, error_rp);
_mav_put_float(buf, 24, error_yaw);
memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, 28);
#else
mavlink_dcm_t packet;
packet.omegaIx = omegaIx;
packet.omegaIy = omegaIy;
packet.omegaIz = omegaIz;
packet.accel_weight = accel_weight;
packet.renorm_val = renorm_val;
packet.error_rp = error_rp;
packet.error_yaw = error_yaw;
memcpy(_MAV_PAYLOAD_NON_CONST(msg), &packet, 28);
#endif
msg->msgid = MAVLINK_MSG_ID_DCM;
return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 28, 205);
}
/**
* @brief Encode a dcm struct into a message
*
* @param system_id ID of this system
* @param component_id ID of this component (e.g. 200 for IMU)
* @param msg The MAVLink message to compress the data into
* @param dcm C-struct to read the message contents from
*/
static inline uint16_t mavlink_msg_dcm_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_dcm_t* dcm)
{
return mavlink_msg_dcm_pack(system_id, component_id, msg, dcm->omegaIx, dcm->omegaIy, dcm->omegaIz, dcm->accel_weight, dcm->renorm_val, dcm->error_rp, dcm->error_yaw);
}
/**
* @brief Send a dcm message
* @param chan MAVLink channel to send the message
*
* @param omegaIx X gyro drift estimate rad/s
* @param omegaIy Y gyro drift estimate rad/s
* @param omegaIz Z gyro drift estimate rad/s
* @param accel_weight average accel_weight
* @param renorm_val average renormalisation value
* @param error_rp average error_roll_pitch value
* @param error_yaw average error_yaw value
*/
#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
static inline void mavlink_msg_dcm_send(mavlink_channel_t chan, float omegaIx, float omegaIy, float omegaIz, float accel_weight, float renorm_val, float error_rp, float error_yaw)
{
#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
char buf[28];
_mav_put_float(buf, 0, omegaIx);
_mav_put_float(buf, 4, omegaIy);
_mav_put_float(buf, 8, omegaIz);
_mav_put_float(buf, 12, accel_weight);
_mav_put_float(buf, 16, renorm_val);
_mav_put_float(buf, 20, error_rp);
_mav_put_float(buf, 24, error_yaw);
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DCM, buf, 28, 205);
#else
mavlink_dcm_t packet;
packet.omegaIx = omegaIx;
packet.omegaIy = omegaIy;
packet.omegaIz = omegaIz;
packet.accel_weight = accel_weight;
packet.renorm_val = renorm_val;
packet.error_rp = error_rp;
packet.error_yaw = error_yaw;
_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_DCM, (const char *)&packet, 28, 205);
#endif
}
#endif
// MESSAGE DCM UNPACKING
/**
* @brief Get field omegaIx from dcm message
*
* @return X gyro drift estimate rad/s
*/
static inline float mavlink_msg_dcm_get_omegaIx(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 0);
}
/**
* @brief Get field omegaIy from dcm message
*
* @return Y gyro drift estimate rad/s
*/
static inline float mavlink_msg_dcm_get_omegaIy(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 4);
}
/**
* @brief Get field omegaIz from dcm message
*
* @return Z gyro drift estimate rad/s
*/
static inline float mavlink_msg_dcm_get_omegaIz(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 8);
}
/**
* @brief Get field accel_weight from dcm message
*
* @return average accel_weight
*/
static inline float mavlink_msg_dcm_get_accel_weight(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 12);
}
/**
* @brief Get field renorm_val from dcm message
*
* @return average renormalisation value
*/
static inline float mavlink_msg_dcm_get_renorm_val(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 16);
}
/**
* @brief Get field error_rp from dcm message
*
* @return average error_roll_pitch value
*/
static inline float mavlink_msg_dcm_get_error_rp(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 20);
}
/**
* @brief Get field error_yaw from dcm message
*
* @return average error_yaw value
*/
static inline float mavlink_msg_dcm_get_error_yaw(const mavlink_message_t* msg)
{
return _MAV_RETURN_float(msg, 24);
}
/**
* @brief Decode a dcm message into a struct
*
* @param msg The message to decode
* @param dcm C-struct to decode the message contents into
*/
static inline void mavlink_msg_dcm_decode(const mavlink_message_t* msg, mavlink_dcm_t* dcm)
{
#if MAVLINK_NEED_BYTE_SWAP
dcm->omegaIx = mavlink_msg_dcm_get_omegaIx(msg);
dcm->omegaIy = mavlink_msg_dcm_get_omegaIy(msg);
dcm->omegaIz = mavlink_msg_dcm_get_omegaIz(msg);
dcm->accel_weight = mavlink_msg_dcm_get_accel_weight(msg);
dcm->renorm_val = mavlink_msg_dcm_get_renorm_val(msg);
dcm->error_rp = mavlink_msg_dcm_get_error_rp(msg);
dcm->error_yaw = mavlink_msg_dcm_get_error_yaw(msg);
#else
memcpy(dcm, _MAV_PAYLOAD(msg), 28);
#endif
}
mavlink/include/mavlink/v1.0/ardupilotmega/testsuite.h
View file @ 44d3d10d
......@@ -668,12 +668,12 @@ static void mavlink_test_fence_status(uint8_t system_id, uint8_t component_id, m
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
}
static void mavlink_test_dcm(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
static void mavlink_test_ahrs(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
{
mavlink_message_t msg;
uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
uint16_t i;
mavlink_dcm_t packet_in = {
mavlink_ahrs_t packet_in = {
17.0,
45.0,
73.0,
......@@ -682,7 +682,7 @@ static void mavlink_test_dcm(uint8_t system_id, uint8_t component_id, mavlink_me
157.0,
185.0,
};
mavlink_dcm_t packet1, packet2;
mavlink_ahrs_t packet1, packet2;
memset(&packet1, 0, sizeof(packet1));
packet1.omegaIx = packet_in.omegaIx;
packet1.omegaIy = packet_in.omegaIy;
......@@ -695,18 +695,18 @@ static void mavlink_test_dcm(uint8_t system_id, uint8_t component_id, mavlink_me
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_dcm_encode(system_id, component_id, &msg, &packet1);
mavlink_msg_dcm_decode(&msg, &packet2);
mavlink_msg_ahrs_encode(system_id, component_id, &msg, &packet1);
mavlink_msg_ahrs_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_dcm_pack(system_id, component_id, &msg , packet1.omegaIx , packet1.omegaIy , packet1.omegaIz , packet1.accel_weight , packet1.renorm_val , packet1.error_rp , packet1.error_yaw );
mavlink_msg_dcm_decode(&msg, &packet2);
mavlink_msg_ahrs_pack(system_id, component_id, &msg , packet1.omegaIx , packet1.omegaIy , packet1.omegaIz , packet1.accel_weight , packet1.renorm_val , packet1.error_rp , packet1.error_yaw );
mavlink_msg_ahrs_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_dcm_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.omegaIx , packet1.omegaIy , packet1.omegaIz , packet1.accel_weight , packet1.renorm_val , packet1.error_rp , packet1.error_yaw );
mavlink_msg_dcm_decode(&msg, &packet2);
mavlink_msg_ahrs_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.omegaIx , packet1.omegaIy , packet1.omegaIz , packet1.accel_weight , packet1.renorm_val , packet1.error_rp , packet1.error_yaw );
mavlink_msg_ahrs_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
......@@ -714,12 +714,12 @@ static void mavlink_test_dcm(uint8_t system_id, uint8_t component_id, mavlink_me
for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
comm_send_ch(MAVLINK_COMM_0, buffer[i]);
}
mavlink_msg_dcm_decode(last_msg, &packet2);
mavlink_msg_ahrs_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_dcm_send(MAVLINK_COMM_1 , packet1.omegaIx , packet1.omegaIy , packet1.omegaIz , packet1.accel_weight , packet1.renorm_val , packet1.error_rp , packet1.error_yaw );
mavlink_msg_dcm_decode(last_msg, &packet2);
mavlink_msg_ahrs_send(MAVLINK_COMM_1 , packet1.omegaIx , packet1.omegaIy , packet1.omegaIz , packet1.accel_weight , packet1.renorm_val , packet1.error_rp , packet1.error_yaw );
mavlink_msg_ahrs_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
}
......@@ -782,6 +782,106 @@ static void mavlink_test_simstate(uint8_t system_id, uint8_t component_id, mavli
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
}
static void mavlink_test_hwstatus(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
{
mavlink_message_t msg;
uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
uint16_t i;
mavlink_hwstatus_t packet_in = {
17235,
139,
};
mavlink_hwstatus_t packet1, packet2;
memset(&packet1, 0, sizeof(packet1));
packet1.Vcc = packet_in.Vcc;
packet1.I2Cerr = packet_in.I2Cerr;
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_hwstatus_encode(system_id, component_id, &msg, &packet1);
mavlink_msg_hwstatus_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_hwstatus_pack(system_id, component_id, &msg , packet1.Vcc , packet1.I2Cerr );
mavlink_msg_hwstatus_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_hwstatus_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.Vcc , packet1.I2Cerr );
mavlink_msg_hwstatus_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_to_send_buffer(buffer, &msg);
for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
comm_send_ch(MAVLINK_COMM_0, buffer[i]);
}
mavlink_msg_hwstatus_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_hwstatus_send(MAVLINK_COMM_1 , packet1.Vcc , packet1.I2Cerr );
mavlink_msg_hwstatus_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
}
static void mavlink_test_radio(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
{
mavlink_message_t msg;
uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
uint16_t i;
mavlink_radio_t packet_in = {
17235,
17339,
17,
84,
151,
218,
29,
};
mavlink_radio_t packet1, packet2;
memset(&packet1, 0, sizeof(packet1));
packet1.rxerrors = packet_in.rxerrors;
packet1.fixed = packet_in.fixed;
packet1.rssi = packet_in.rssi;
packet1.remrssi = packet_in.remrssi;
packet1.txbuf = packet_in.txbuf;
packet1.noise = packet_in.noise;
packet1.remnoise = packet_in.remnoise;
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_radio_encode(system_id, component_id, &msg, &packet1);
mavlink_msg_radio_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_radio_pack(system_id, component_id, &msg , packet1.rssi , packet1.remrssi , packet1.txbuf , packet1.noise , packet1.remnoise , packet1.rxerrors , packet1.fixed );
mavlink_msg_radio_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_radio_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.rssi , packet1.remrssi , packet1.txbuf , packet1.noise , packet1.remnoise , packet1.rxerrors , packet1.fixed );
mavlink_msg_radio_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_to_send_buffer(buffer, &msg);
for (i=0; i<mavlink_msg_get_send_buffer_length(&msg); i++) {
comm_send_ch(MAVLINK_COMM_0, buffer[i]);
}
mavlink_msg_radio_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2));
mavlink_msg_radio_send(MAVLINK_COMM_1 , packet1.rssi , packet1.remrssi , packet1.txbuf , packet1.noise , packet1.remnoise , packet1.rxerrors , packet1.fixed );
mavlink_msg_radio_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
}
static void mavlink_test_ardupilotmega(uint8_t system_id, uint8_t component_id, mavlink_message_t *last_msg)
{
mavlink_test_sensor_offsets(system_id, component_id, last_msg);
......@@ -796,8 +896,10 @@ static void mavlink_test_ardupilotmega(uint8_t system_id, uint8_t component_id,
mavlink_test_fence_point(system_id, component_id, last_msg);
mavlink_test_fence_fetch_point(system_id, component_id, last_msg);
mavlink_test_fence_status(system_id, component_id, last_msg);
mavlink_test_dcm(system_id, component_id, last_msg);
mavlink_test_ahrs(system_id, component_id, last_msg);
mavlink_test_simstate(system_id, component_id, last_msg);
mavlink_test_hwstatus(system_id, component_id, last_msg);
mavlink_test_radio(system_id, component_id, last_msg);
}
#ifdef __cplusplus
......
mavlink/include/mavlink/v1.0/ardupilotmega/version.h
View file @ 44d3d10d
......@@ -5,7 +5,7 @@
#ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Thu Apr 19 19:36:59 2012"
#define MAVLINK_BUILD_DATE "Tue May 22 11:47:35 2012"
#define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 101
......
mavlink/include/mavlink/v1.0/test/version.h
View file @ 44d3d10d
This diff is collapsed.
mavlink/include/v1.0/ardupilotmega/ardupilotmega.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/ardupilotmega/mavlink.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/ardupilotmega/mavlink_msg_ahrs.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/ardupilotmega/mavlink_msg_radio.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/ardupilotmega/testsuite.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/ardupilotmega/version.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/checksum.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/common.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_attitude.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_auth_key.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_command_ack.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_command_long.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_data_stream.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_debug.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_debug_vect.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_gps_raw_int.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_gps_status.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_heartbeat.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_hil_controls.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_hil_state.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_memory_vect.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_mission_ack.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_mission_item.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_optical_flow.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_param_set.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_param_value.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_ping.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_raw_imu.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_raw_pressure.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_scaled_imu.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_set_mode.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_statustext.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_sys_status.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_system_time.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/mavlink_msg_vfr_hud.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/testsuite.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/common/version.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/mavlink_helpers.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/mavlink_protobuf_manager.hpp deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/mavlink_types.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/pixhawk/pixhawk.pb.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
mavlink/include/v1.0/protocol.h deleted 100644 → 0
View file @ f7785989
This diff is collapsed.
qgroundcontrol.pro
View file @ 44d3d10d
This diff is collapsed.
src/comm/QGCMAVLink.h
View file @ 44d3d10d
This diff is collapsed.
src/uas/UAS.cc
View file @ 44d3d10d
This diff is collapsed.
src/uas/UAS.h
View file @ 44d3d10d
This diff is collapsed.
src/uas/UASInterface.h
View file @ 44d3d10d
This diff is collapsed.
src/uas/UASWaypointManager.cc
View file @ 44d3d10d
This diff is collapsed.
src/ui/HSIDisplay.cc
View file @ 44d3d10d
This diff is collapsed.
src/ui/MAVLinkDecoder.cc
View file @ 44d3d10d
This diff is collapsed.
src/ui/map3D/Pixhawk3DWidget.cc
View file @ 44d3d10d
This diff is collapsed.
src/ui/uas/UASView.cc
View file @ 44d3d10d
This diff is collapsed.
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