Commit 68f99575 authored by PX4BuildBot's avatar PX4BuildBot

autogenerated headers for rev...

autogenerated headers for rev https://github.com/mavlink/mavlink/tree/8cf87fc5afe996604cc4399f21f83c7989ae5d9a
parent 62abc603
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 26 2018" #define MAVLINK_BUILD_DATE "Tue Mar 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 26 2018" #define MAVLINK_BUILD_DATE "Tue Mar 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 26 2018" #define MAVLINK_BUILD_DATE "Tue Mar 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
...@@ -906,6 +906,22 @@ typedef enum MAV_BATTERY_FUNCTION ...@@ -906,6 +906,22 @@ typedef enum MAV_BATTERY_FUNCTION
} MAV_BATTERY_FUNCTION; } MAV_BATTERY_FUNCTION;
#endif #endif
/** @brief Enumeration for states of low battery extent */
#ifndef HAVE_ENUM_MAV_BATTERY_CHARGE_STATE
#define HAVE_ENUM_MAV_BATTERY_CHARGE_STATE
typedef enum MAV_BATTERY_CHARGE_STATE
{
MAV_BATTERY_CHARGE_STATE_UNDEFINED=0, /* Low battery state is not provided | */
MAV_BATTERY_CHARGE_STATE_OK=1, /* Battery is not nearly empty, normal operation | */
MAV_BATTERY_CHARGE_STATE_LOW=2, /* Battery state is low, warn and monitor close | */
MAV_BATTERY_CHARGE_STATE_CRITICAL=3, /* Battry state is critical, return / abort immediately | */
MAV_BATTERY_CHARGE_STATE_EMERGENCY=4, /* Battry state is too low for ordinary abortion, fastest possible emergency stop preventing damage | */
MAV_BATTERY_CHARGE_STATE_FAILED=5, /* Battry failed, damage unavoidable | */
MAV_BATTERY_CHARGE_STATE_UNHEALTHY=6, /* Battry is diagnosed to be broken or an error occurred, usage is discouraged / prohibited | */
MAV_BATTERY_CHARGE_STATE_ENUM_END=7, /* | */
} MAV_BATTERY_CHARGE_STATE;
#endif
/** @brief Enumeration of VTOL states */ /** @brief Enumeration of VTOL states */
#ifndef HAVE_ENUM_MAV_VTOL_STATE #ifndef HAVE_ENUM_MAV_VTOL_STATE
#define HAVE_ENUM_MAV_VTOL_STATE #define HAVE_ENUM_MAV_VTOL_STATE
......
This diff is collapsed.
...@@ -6958,7 +6958,7 @@ static void mavlink_test_battery_status(uint8_t system_id, uint8_t component_id, ...@@ -6958,7 +6958,7 @@ static void mavlink_test_battery_status(uint8_t system_id, uint8_t component_id,
uint8_t buffer[MAVLINK_MAX_PACKET_LEN]; uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
uint16_t i; uint16_t i;
mavlink_battery_status_t packet_in = { mavlink_battery_status_t packet_in = {
963497464,963497672,17651,{ 17755, 17756, 17757, 17758, 17759, 17760, 17761, 17762, 17763, 17764 },18795,101,168,235,46 963497464,963497672,17651,{ 17755, 17756, 17757, 17758, 17759, 17760, 17761, 17762, 17763, 17764 },18795,101,168,235,46,963499336,125
}; };
mavlink_battery_status_t packet1, packet2; mavlink_battery_status_t packet1, packet2;
memset(&packet1, 0, sizeof(packet1)); memset(&packet1, 0, sizeof(packet1));
...@@ -6970,6 +6970,8 @@ static void mavlink_test_battery_status(uint8_t system_id, uint8_t component_id, ...@@ -6970,6 +6970,8 @@ static void mavlink_test_battery_status(uint8_t system_id, uint8_t component_id,
packet1.battery_function = packet_in.battery_function; packet1.battery_function = packet_in.battery_function;
packet1.type = packet_in.type; packet1.type = packet_in.type;
packet1.battery_remaining = packet_in.battery_remaining; packet1.battery_remaining = packet_in.battery_remaining;
packet1.time_remaining = packet_in.time_remaining;
packet1.charge_state = packet_in.charge_state;
mav_array_memcpy(packet1.voltages, packet_in.voltages, sizeof(uint16_t)*10); mav_array_memcpy(packet1.voltages, packet_in.voltages, sizeof(uint16_t)*10);
...@@ -6985,12 +6987,12 @@ static void mavlink_test_battery_status(uint8_t system_id, uint8_t component_id, ...@@ -6985,12 +6987,12 @@ static void mavlink_test_battery_status(uint8_t system_id, uint8_t component_id,
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2)); memset(&packet2, 0, sizeof(packet2));
mavlink_msg_battery_status_pack(system_id, component_id, &msg , packet1.id , packet1.battery_function , packet1.type , packet1.temperature , packet1.voltages , packet1.current_battery , packet1.current_consumed , packet1.energy_consumed , packet1.battery_remaining ); mavlink_msg_battery_status_pack(system_id, component_id, &msg , packet1.id , packet1.battery_function , packet1.type , packet1.temperature , packet1.voltages , packet1.current_battery , packet1.current_consumed , packet1.energy_consumed , packet1.battery_remaining , packet1.time_remaining , packet1.charge_state );
mavlink_msg_battery_status_decode(&msg, &packet2); mavlink_msg_battery_status_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2)); memset(&packet2, 0, sizeof(packet2));
mavlink_msg_battery_status_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.id , packet1.battery_function , packet1.type , packet1.temperature , packet1.voltages , packet1.current_battery , packet1.current_consumed , packet1.energy_consumed , packet1.battery_remaining ); mavlink_msg_battery_status_pack_chan(system_id, component_id, MAVLINK_COMM_0, &msg , packet1.id , packet1.battery_function , packet1.type , packet1.temperature , packet1.voltages , packet1.current_battery , packet1.current_consumed , packet1.energy_consumed , packet1.battery_remaining , packet1.time_remaining , packet1.charge_state );
mavlink_msg_battery_status_decode(&msg, &packet2); mavlink_msg_battery_status_decode(&msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
...@@ -7003,7 +7005,7 @@ static void mavlink_test_battery_status(uint8_t system_id, uint8_t component_id, ...@@ -7003,7 +7005,7 @@ static void mavlink_test_battery_status(uint8_t system_id, uint8_t component_id,
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
memset(&packet2, 0, sizeof(packet2)); memset(&packet2, 0, sizeof(packet2));
mavlink_msg_battery_status_send(MAVLINK_COMM_1 , packet1.id , packet1.battery_function , packet1.type , packet1.temperature , packet1.voltages , packet1.current_battery , packet1.current_consumed , packet1.energy_consumed , packet1.battery_remaining ); mavlink_msg_battery_status_send(MAVLINK_COMM_1 , packet1.id , packet1.battery_function , packet1.type , packet1.temperature , packet1.voltages , packet1.current_battery , packet1.current_consumed , packet1.energy_consumed , packet1.battery_remaining , packet1.time_remaining , packet1.charge_state );
mavlink_msg_battery_status_decode(last_msg, &packet2); mavlink_msg_battery_status_decode(last_msg, &packet2);
MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0); MAVLINK_ASSERT(memcmp(&packet1, &packet2, sizeof(packet1)) == 0);
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 26 2018" #define MAVLINK_BUILD_DATE "Tue Mar 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 26 2018" #define MAVLINK_BUILD_DATE "Tue Mar 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 26 2018" #define MAVLINK_BUILD_DATE "Tue Mar 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
...@@ -2498,6 +2498,30 @@ ...@@ -2498,6 +2498,30 @@
<description>Payload battery</description> <description>Payload battery</description>
</entry> </entry>
</enum> </enum>
<enum name="MAV_BATTERY_CHARGE_STATE">
<description>Enumeration for states of low battery extent</description>
<entry value="0" name="MAV_BATTERY_CHARGE_STATE_UNDEFINED">
<description>Low battery state is not provided</description>
</entry>
<entry value="1" name="MAV_BATTERY_CHARGE_STATE_OK">
<description>Battery is not nearly empty, normal operation</description>
</entry>
<entry value="2" name="MAV_BATTERY_CHARGE_STATE_LOW">
<description>Battery state is low, warn and monitor close</description>
</entry>
<entry value="3" name="MAV_BATTERY_CHARGE_STATE_CRITICAL">
<description>Battry state is critical, return / abort immediately</description>
</entry>
<entry value="4" name="MAV_BATTERY_CHARGE_STATE_EMERGENCY">
<description>Battry state is too low for ordinary abortion, fastest possible emergency stop preventing damage</description>
</entry>
<entry value="5" name="MAV_BATTERY_CHARGE_STATE_FAILED">
<description>Battry failed, damage unavoidable</description>
</entry>
<entry value="6" name="MAV_BATTERY_CHARGE_STATE_UNHEALTHY">
<description>Battry is diagnosed to be broken or an error occurred, usage is discouraged / prohibited</description>
</entry>
</enum>
<enum name="MAV_VTOL_STATE"> <enum name="MAV_VTOL_STATE">
<description>Enumeration of VTOL states</description> <description>Enumeration of VTOL states</description>
<entry value="0" name="MAV_VTOL_STATE_UNDEFINED"> <entry value="0" name="MAV_VTOL_STATE_UNDEFINED">
...@@ -4112,6 +4136,9 @@ ...@@ -4112,6 +4136,9 @@
<field type="int32_t" name="current_consumed" units="mAh">Consumed charge, in milliampere hours (1 = 1 mAh), -1: autopilot does not provide mAh consumption estimate</field> <field type="int32_t" name="current_consumed" units="mAh">Consumed charge, in milliampere hours (1 = 1 mAh), -1: autopilot does not provide mAh consumption estimate</field>
<field type="int32_t" name="energy_consumed" units="hJ">Consumed energy, in HectoJoules (intergrated U*I*dt) (1 = 100 Joule), -1: autopilot does not provide energy consumption estimate</field> <field type="int32_t" name="energy_consumed" units="hJ">Consumed energy, in HectoJoules (intergrated U*I*dt) (1 = 100 Joule), -1: autopilot does not provide energy consumption estimate</field>
<field type="int8_t" name="battery_remaining" units="%">Remaining battery energy: (0%: 0, 100%: 100), -1: autopilot does not estimate the remaining battery</field> <field type="int8_t" name="battery_remaining" units="%">Remaining battery energy: (0%: 0, 100%: 100), -1: autopilot does not estimate the remaining battery</field>
<extensions/>
<field type="int32_t" name="time_remaining" units="s">Remaining battery time, in seconds (1 = 1s = 0% energy left), 0: autopilot does not provide remaining battery time estimate</field>
<field type="uint8_t" name="charge_state" enum="MAV_BATTERY_CHARGE_STATE">State for extent of discharge, provided by autopilot for warning or external reactions</field>
</message> </message>
<message id="148" name="AUTOPILOT_VERSION"> <message id="148" name="AUTOPILOT_VERSION">
<description>Version and capability of autopilot software</description> <description>Version and capability of autopilot software</description>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 26 2018" #define MAVLINK_BUILD_DATE "Tue Mar 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 9 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 9
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 26 2018" #define MAVLINK_BUILD_DATE "Tue Mar 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 26 2018" #define MAVLINK_BUILD_DATE "Tue Mar 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 26 2018" #define MAVLINK_BUILD_DATE "Tue Mar 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 179 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 179
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#ifndef MAVLINK_VERSION_H #ifndef MAVLINK_VERSION_H
#define MAVLINK_VERSION_H #define MAVLINK_VERSION_H
#define MAVLINK_BUILD_DATE "Mon Mar 26 2018" #define MAVLINK_BUILD_DATE "Tue Mar 27 2018"
#define MAVLINK_WIRE_PROTOCOL_VERSION "2.0" #define MAVLINK_WIRE_PROTOCOL_VERSION "2.0"
#define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 255
......
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