update and merge

This commit is contained in:
Matt
2018-12-06 01:31:47 +08:00
parent 33d09d8d50
commit 7695f414f9
45 changed files with 2565 additions and 665 deletions
+5 -5
View File
@@ -8,7 +8,7 @@ typedef struct __mavlink_hil_gps_t {
uint64_t time_usec; /*< [us] Timestamp (UNIX Epoch time or time since system boot). The receiving end can infer timestamp format (since 1.1.1970 or since system boot) by checking for the magnitude the number.*/
int32_t lat; /*< [degE7] Latitude (WGS84)*/
int32_t lon; /*< [degE7] Longitude (WGS84)*/
int32_t alt; /*< [mm] Altitude (AMSL). Positive for up.*/
int32_t alt; /*< [mm] Altitude (MSL). Positive for up.*/
uint16_t eph; /*< [cm] GPS HDOP horizontal dilution of position. If unknown, set to: 65535*/
uint16_t epv; /*< [cm] GPS VDOP vertical dilution of position. If unknown, set to: 65535*/
uint16_t vel; /*< [cm/s] GPS ground speed. If unknown, set to: 65535*/
@@ -81,7 +81,7 @@ typedef struct __mavlink_hil_gps_t {
* @param fix_type 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
* @param lat [degE7] Latitude (WGS84)
* @param lon [degE7] Longitude (WGS84)
* @param alt [mm] Altitude (AMSL). Positive for up.
* @param alt [mm] Altitude (MSL). Positive for up.
* @param eph [cm] GPS HDOP horizontal dilution of position. If unknown, set to: 65535
* @param epv [cm] GPS VDOP vertical dilution of position. If unknown, set to: 65535
* @param vel [cm/s] GPS ground speed. If unknown, set to: 65535
@@ -145,7 +145,7 @@ static inline uint16_t mavlink_msg_hil_gps_pack(uint8_t system_id, uint8_t compo
* @param fix_type 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
* @param lat [degE7] Latitude (WGS84)
* @param lon [degE7] Longitude (WGS84)
* @param alt [mm] Altitude (AMSL). Positive for up.
* @param alt [mm] Altitude (MSL). Positive for up.
* @param eph [cm] GPS HDOP horizontal dilution of position. If unknown, set to: 65535
* @param epv [cm] GPS VDOP vertical dilution of position. If unknown, set to: 65535
* @param vel [cm/s] GPS ground speed. If unknown, set to: 65535
@@ -235,7 +235,7 @@ static inline uint16_t mavlink_msg_hil_gps_encode_chan(uint8_t system_id, uint8_
* @param fix_type 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
* @param lat [degE7] Latitude (WGS84)
* @param lon [degE7] Longitude (WGS84)
* @param alt [mm] Altitude (AMSL). Positive for up.
* @param alt [mm] Altitude (MSL). Positive for up.
* @param eph [cm] GPS HDOP horizontal dilution of position. If unknown, set to: 65535
* @param epv [cm] GPS VDOP vertical dilution of position. If unknown, set to: 65535
* @param vel [cm/s] GPS ground speed. If unknown, set to: 65535
@@ -396,7 +396,7 @@ static inline int32_t mavlink_msg_hil_gps_get_lon(const mavlink_message_t* msg)
/**
* @brief Get field alt from hil_gps message
*
* @return [mm] Altitude (AMSL). Positive for up.
* @return [mm] Altitude (MSL). Positive for up.
*/
static inline int32_t mavlink_msg_hil_gps_get_alt(const mavlink_message_t* msg)
{