autogenerated headers for rev...

autogenerated headers for rev https://github.com/mavlink/mavlink/tree/8349b1cf68565c249cbad8aae0db0a466478b6a5

minimal/minimal.h

@@ -40,9 +40,9 @@ extern "C" {
 typedef enum MAV_AUTOPILOT
 {
    MAV_AUTOPILOT_GENERIC=0, /* Generic autopilot, full support for everything | */
-   MAV_AUTOPILOT_PIXHAWK=1, /* PIXHAWK autopilot, http://pixhawk.ethz.ch | */
+   MAV_AUTOPILOT_RESERVED=1, /* Reserved for future use. | */
    MAV_AUTOPILOT_SLUGS=2, /* SLUGS autopilot, http://slugsuav.soe.ucsc.edu | */
-   MAV_AUTOPILOT_ARDUPILOTMEGA=3, /* ArduPilotMega / ArduCopter, http://diydrones.com | */
+   MAV_AUTOPILOT_ARDUPILOTMEGA=3, /* ArduPilot - Plane/Copter/Rover/Sub/Tracker, http://ardupilot.org | */
    MAV_AUTOPILOT_OPENPILOT=4, /* OpenPilot, http://openpilot.org | */
    MAV_AUTOPILOT_GENERIC_WAYPOINTS_ONLY=5, /* Generic autopilot only supporting simple waypoints | */
    MAV_AUTOPILOT_GENERIC_WAYPOINTS_AND_SIMPLE_NAVIGATION_ONLY=6, /* Generic autopilot supporting waypoints and other simple navigation commands | */
@@ -51,11 +51,19 @@ typedef enum MAV_AUTOPILOT
    MAV_AUTOPILOT_PPZ=9, /* PPZ UAV - http://nongnu.org/paparazzi | */
    MAV_AUTOPILOT_UDB=10, /* UAV Dev Board | */
    MAV_AUTOPILOT_FP=11, /* FlexiPilot | */
-   MAV_AUTOPILOT_ENUM_END=12, /*  | */
+   MAV_AUTOPILOT_PX4=12, /* PX4 Autopilot - http://px4.io/ | */
+   MAV_AUTOPILOT_SMACCMPILOT=13, /* SMACCMPilot - http://smaccmpilot.org | */
+   MAV_AUTOPILOT_AUTOQUAD=14, /* AutoQuad -- http://autoquad.org | */
+   MAV_AUTOPILOT_ARMAZILA=15, /* Armazila -- http://armazila.com | */
+   MAV_AUTOPILOT_AEROB=16, /* Aerob -- http://aerob.ru | */
+   MAV_AUTOPILOT_ASLUAV=17, /* ASLUAV autopilot -- http://www.asl.ethz.ch | */
+   MAV_AUTOPILOT_SMARTAP=18, /* SmartAP Autopilot - http://sky-drones.com | */
+   MAV_AUTOPILOT_AIRRAILS=19, /* AirRails - http://uaventure.com | */
+   MAV_AUTOPILOT_ENUM_END=20, /*  | */
 } MAV_AUTOPILOT;
 #endif
 
-/** @brief  */
+/** @brief MAVLINK system type. All components in a system should report this type in their HEARTBEAT. */
 #ifndef HAVE_ENUM_MAV_TYPE
 #define HAVE_ENUM_MAV_TYPE
 typedef enum MAV_TYPE
@@ -75,9 +83,25 @@ typedef enum MAV_TYPE
    MAV_TYPE_SUBMARINE=12, /* Submarine | */
    MAV_TYPE_HEXAROTOR=13, /* Hexarotor | */
    MAV_TYPE_OCTOROTOR=14, /* Octorotor | */
-   MAV_TYPE_TRICOPTER=15, /* Octorotor | */
+   MAV_TYPE_TRICOPTER=15, /* Tricopter | */
    MAV_TYPE_FLAPPING_WING=16, /* Flapping wing | */
-   MAV_TYPE_ENUM_END=17, /*  | */
+   MAV_TYPE_KITE=17, /* Kite | */
+   MAV_TYPE_ONBOARD_CONTROLLER=18, /* Onboard companion controller | */
+   MAV_TYPE_VTOL_DUOROTOR=19, /* Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter. | */
+   MAV_TYPE_VTOL_QUADROTOR=20, /* Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter. | */
+   MAV_TYPE_VTOL_TILTROTOR=21, /* Tiltrotor VTOL | */
+   MAV_TYPE_VTOL_RESERVED2=22, /* VTOL reserved 2 | */
+   MAV_TYPE_VTOL_RESERVED3=23, /* VTOL reserved 3 | */
+   MAV_TYPE_VTOL_RESERVED4=24, /* VTOL reserved 4 | */
+   MAV_TYPE_VTOL_RESERVED5=25, /* VTOL reserved 5 | */
+   MAV_TYPE_GIMBAL=26, /* Gimbal (standalone) | */
+   MAV_TYPE_ADSB=27, /* ADSB system (standalone) | */
+   MAV_TYPE_PARAFOIL=28, /* Steerable, nonrigid airfoil | */
+   MAV_TYPE_DODECAROTOR=29, /* Dodecarotor | */
+   MAV_TYPE_CAMERA=30, /* Camera (standalone) | */
+   MAV_TYPE_CHARGING_STATION=31, /* Charging station | */
+   MAV_TYPE_FLARM=32, /* FLARM collision avoidance system (standalone) | */
+   MAV_TYPE_ENUM_END=33, /*  | */
 } MAV_TYPE;
 #endif
 
@@ -93,7 +117,7 @@ typedef enum MAV_MODE_FLAG
    MAV_MODE_FLAG_STABILIZE_ENABLED=16, /* 0b00010000 system stabilizes electronically its attitude (and optionally position). It needs however further control inputs to move around. | */
    MAV_MODE_FLAG_HIL_ENABLED=32, /* 0b00100000 hardware in the loop simulation. All motors / actuators are blocked, but internal software is full operational. | */
    MAV_MODE_FLAG_MANUAL_INPUT_ENABLED=64, /* 0b01000000 remote control input is enabled. | */
-   MAV_MODE_FLAG_SAFETY_ARMED=128, /* 0b10000000 MAV safety set to armed. Motors are enabled / running / can start. Ready to fly. | */
+   MAV_MODE_FLAG_SAFETY_ARMED=128, /* 0b10000000 MAV safety set to armed. Motors are enabled / running / can start. Ready to fly. Additional note: this flag is to be ignore when sent in the command MAV_CMD_DO_SET_MODE and MAV_CMD_COMPONENT_ARM_DISARM shall be used instead. The flag can still be used to report the armed state. | */
    MAV_MODE_FLAG_ENUM_END=129, /*  | */
 } MAV_MODE_FLAG;
 #endif
@@ -128,19 +152,72 @@ typedef enum MAV_STATE
    MAV_STATE_CRITICAL=5, /* System is in a non-normal flight mode. It can however still navigate. | */
    MAV_STATE_EMERGENCY=6, /* System is in a non-normal flight mode. It lost control over parts or over the whole airframe. It is in mayday and going down. | */
    MAV_STATE_POWEROFF=7, /* System just initialized its power-down sequence, will shut down now. | */
-   MAV_STATE_ENUM_END=8, /*  | */
+   MAV_STATE_FLIGHT_TERMINATION=8, /* System is terminating itself. | */
+   MAV_STATE_ENUM_END=9, /*  | */
 } MAV_STATE;
 #endif
 
+/** @brief Component ids (values) for the different types and instances of onboard hardware/software that might make up a MAVLink system (autopilot, cameras, servos, GPS systems, avoidance systems etc.). 
+      Components must use the appropriate ID in their source address when sending messages. Components can also use IDs to determine if they are the intended recipient of an incoming message. The MAV_COMP_ID_ALL value is used to indicate messages that must be processed by all components.
+      When creating new entries, components that can have multiple instances (e.g. cameras, servos etc.) should be allocated sequential values. An appropriate number of values should be left free after these components to allow the number of instances to be expanded. */
+#ifndef HAVE_ENUM_MAV_COMPONENT
+#define HAVE_ENUM_MAV_COMPONENT
+typedef enum MAV_COMPONENT
+{
+   MAV_COMP_ID_ALL=0, /* Used to broadcast messages to all components of the receiving system. Components should attempt to process messages with this component ID and forward to components on any other interfaces. | */
+   MAV_COMP_ID_AUTOPILOT1=1, /* System flight controller component ("autopilot"). Only one autopilot is expected in a particular system. | */
+   MAV_COMP_ID_CAMERA=100, /* Camera #1. | */
+   MAV_COMP_ID_CAMERA2=101, /* Camera #2. | */
+   MAV_COMP_ID_CAMERA3=102, /* Camera #3. | */
+   MAV_COMP_ID_CAMERA4=103, /* Camera #4. | */
+   MAV_COMP_ID_CAMERA5=104, /* Camera #5. | */
+   MAV_COMP_ID_CAMERA6=105, /* Camera #6. | */
+   MAV_COMP_ID_SERVO1=140, /* Servo #1. | */
+   MAV_COMP_ID_SERVO2=141, /* Servo #2. | */
+   MAV_COMP_ID_SERVO3=142, /* Servo #3. | */
+   MAV_COMP_ID_SERVO4=143, /* Servo #4. | */
+   MAV_COMP_ID_SERVO5=144, /* Servo #5. | */
+   MAV_COMP_ID_SERVO6=145, /* Servo #6. | */
+   MAV_COMP_ID_SERVO7=146, /* Servo #7. | */
+   MAV_COMP_ID_SERVO8=147, /* Servo #8. | */
+   MAV_COMP_ID_SERVO9=148, /* Servo #9. | */
+   MAV_COMP_ID_SERVO10=149, /* Servo #10. | */
+   MAV_COMP_ID_SERVO11=150, /* Servo #11. | */
+   MAV_COMP_ID_SERVO12=151, /* Servo #12. | */
+   MAV_COMP_ID_SERVO13=152, /* Servo #13. | */
+   MAV_COMP_ID_SERVO14=153, /* Servo #14. | */
+   MAV_COMP_ID_GIMBAL=154, /* Gimbal component. | */
+   MAV_COMP_ID_LOG=155, /* Logging component. | */
+   MAV_COMP_ID_ADSB=156, /* Automatic Dependent Surveillance-Broadcast (ADS-B) component. | */
+   MAV_COMP_ID_OSD=157, /* On Screen Display (OSD) devices for video links. | */
+   MAV_COMP_ID_PERIPHERAL=158, /* Generic autopilot peripheral component ID. Meant for devices that do not implement the parameter microservice. | */
+   MAV_COMP_ID_QX1_GIMBAL=159, /* Gimbal ID for QX1. | */
+   MAV_COMP_ID_FLARM=160, /* FLARM collision alert component. | */
+   MAV_COMP_ID_MISSIONPLANNER=190, /* Component that supports the Mission microservice. | */
+   MAV_COMP_ID_PATHPLANNER=195, /* Component that finds an optimal path between points based on a certain constraint (e.g. minimum snap, shortest path, cost, etc.). | */
+   MAV_COMP_ID_OBSTACLE_AVOIDANCE=196, /* Component that plans a collision free path between two points. | */
+   MAV_COMP_ID_VISUAL_INERTIAL_ODOMETRY=197, /* Component that provides position estimates using VIO techniques. | */
+   MAV_COMP_ID_IMU=200, /* Inertial Measurement Unit (IMU) #1. | */
+   MAV_COMP_ID_IMU_2=201, /* Inertial Measurement Unit (IMU) #2. | */
+   MAV_COMP_ID_IMU_3=202, /* Inertial Measurement Unit (IMU) #3. | */
+   MAV_COMP_ID_GPS=220, /* GPS #1. | */
+   MAV_COMP_ID_GPS2=221, /* GPS #2. | */
+   MAV_COMP_ID_UDP_BRIDGE=240, /* Component to bridge MAVLink to UDP (i.e. from a UART). | */
+   MAV_COMP_ID_UART_BRIDGE=241, /* Component to bridge to UART (i.e. from UDP). | */
+   MAV_COMP_ID_SYSTEM_CONTROL=250, /* Component for handling system messages (e.g. to ARM, takeoff, etc.). | */
+   MAV_COMPONENT_ENUM_END=251, /*  | */
+} MAV_COMPONENT;
+#endif
+
 // MAVLINK VERSION
 
 #ifndef MAVLINK_VERSION
-#define MAVLINK_VERSION 2
+#define MAVLINK_VERSION 3
 #endif
 
 #if (MAVLINK_VERSION == 0)
 #undef MAVLINK_VERSION
-#define MAVLINK_VERSION 2
+#define MAVLINK_VERSION 3
 #endif
 
 // MESSAGE DEFINITIONS

minimal/testsuite.h

@@ -37,7 +37,7 @@ static void mavlink_test_heartbeat(uint8_t system_id, uint8_t component_id, mavl
         uint8_t buffer[MAVLINK_MAX_PACKET_LEN];
         uint16_t i;
     mavlink_heartbeat_t packet_in = {
-        963497464,17,84,151,218,2
+        963497464,17,84,151,218,3
     };
     mavlink_heartbeat_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));