diff --git a/mavlink/Makefile b/mavlink/Makefile
index cf9c22d9e94a1634b42441a5d8506605a385dd07..e301af84bf38b08e2c6a7fa8d394a48804947482 100644
--- a/mavlink/Makefile
+++ b/mavlink/Makefile
@@ -2,14 +2,16 @@
# Created: Arnaud Degroote on Mon, 8 Oct 2012
#
-PKGNAME= mavlink-${VERSION}
-DISTNAME= ${VERSION}
-VERSION= 1.0.11
-CATEGORIES= supervision
-MASTER_SITES= https://github.com/mavlink/mavlink/archive/
+DISTNAME= mavlink-${VERSION}
+VERSION= 20150326
+CATEGORIES= middleware
+
+COMMIT= 7a7ce3362706dd0164377d6182ce73f22f4d41ef
+FETCH_METHOD= git
+MASTER_SITES= https://github.com/mavlink/mavlink.git@${COMMIT}
MASTER_REPOSITORY= https://github.com/mavlink/mavlink.git
-MAINTAINER= arnaud.degroote@isae.fr
+MAINTAINER= arnaud.degroote@isae-supaero.fr
COMMENT= MAVLink -- Micro Air Vehicle Message Marshalling Library
LICENSE= gnu-lgpl-v3
diff --git a/mavlink/PLIST b/mavlink/PLIST
index 10c6e35c04ddc65a1d60928824b4549e6fecbeee..f95716296a41e0efdce31d83f1d5f50b077def51 100644
--- a/mavlink/PLIST
+++ b/mavlink/PLIST
@@ -1,4 +1,4 @@
-@comment Mon Dec 16 11:25:37 CET 2013
+@comment Thu Mar 26 09:13:56 CET 2015
include/mavlink/config.h
include/mavlink/v0.9/ardupilotmega/ardupilotmega.h
include/mavlink/v0.9/ardupilotmega/mavlink.h
@@ -159,7 +159,15 @@ include/mavlink/v0.9/ualberta/version.h
include/mavlink/v1.0/ardupilotmega/ardupilotmega.h
include/mavlink/v1.0/ardupilotmega/mavlink.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_ahrs.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_ahrs2.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_ahrs3.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_airspeed_autocal.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_ap_adc.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_autopilot_version_request.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_battery2.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_camera_feedback.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_camera_status.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_compassmot_status.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_data16.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_data32.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_data64.h
@@ -169,50 +177,83 @@ include/mavlink/v1.0/ardupilotmega/mavlink_msg_digicam_control.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_fence_fetch_point.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_fence_point.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_fence_status.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_control.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_gimbal_report.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_hwstatus.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_led_control.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_limits_status.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_meminfo.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_mount_configure.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_mount_control.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_mount_status.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_radio.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_rally_fetch_point.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_rally_point.h
+include/mavlink/v1.0/ardupilotmega/mavlink_msg_rangefinder.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_sensor_offsets.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_set_mag_offsets.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_simstate.h
include/mavlink/v1.0/ardupilotmega/mavlink_msg_wind.h
include/mavlink/v1.0/ardupilotmega/testsuite.h
include/mavlink/v1.0/ardupilotmega/version.h
+include/mavlink/v1.0/autoquad/autoquad.h
+include/mavlink/v1.0/autoquad/mavlink.h
+include/mavlink/v1.0/autoquad/mavlink_msg_aq_esc_telemetry.h
+include/mavlink/v1.0/autoquad/mavlink_msg_aq_telemetry_f.h
+include/mavlink/v1.0/autoquad/testsuite.h
+include/mavlink/v1.0/autoquad/version.h
include/mavlink/v1.0/checksum.h
include/mavlink/v1.0/common/common.h
include/mavlink/v1.0/common/mavlink.h
+include/mavlink/v1.0/common/mavlink_msg_actuator_control_target.h
+include/mavlink/v1.0/common/mavlink_msg_att_pos_mocap.h
include/mavlink/v1.0/common/mavlink_msg_attitude.h
include/mavlink/v1.0/common/mavlink_msg_attitude_quaternion.h
+include/mavlink/v1.0/common/mavlink_msg_attitude_quaternion_cov.h
+include/mavlink/v1.0/common/mavlink_msg_attitude_target.h
include/mavlink/v1.0/common/mavlink_msg_auth_key.h
+include/mavlink/v1.0/common/mavlink_msg_autopilot_version.h
include/mavlink/v1.0/common/mavlink_msg_battery_status.h
include/mavlink/v1.0/common/mavlink_msg_change_operator_control.h
include/mavlink/v1.0/common/mavlink_msg_change_operator_control_ack.h
include/mavlink/v1.0/common/mavlink_msg_command_ack.h
+include/mavlink/v1.0/common/mavlink_msg_command_int.h
include/mavlink/v1.0/common/mavlink_msg_command_long.h
include/mavlink/v1.0/common/mavlink_msg_data_stream.h
+include/mavlink/v1.0/common/mavlink_msg_data_transmission_handshake.h
include/mavlink/v1.0/common/mavlink_msg_debug.h
include/mavlink/v1.0/common/mavlink_msg_debug_vect.h
-include/mavlink/v1.0/common/mavlink_msg_file_transfer_dir_list.h
-include/mavlink/v1.0/common/mavlink_msg_file_transfer_res.h
-include/mavlink/v1.0/common/mavlink_msg_file_transfer_start.h
+include/mavlink/v1.0/common/mavlink_msg_distance_sensor.h
+include/mavlink/v1.0/common/mavlink_msg_encapsulated_data.h
+include/mavlink/v1.0/common/mavlink_msg_file_transfer_protocol.h
include/mavlink/v1.0/common/mavlink_msg_global_position_int.h
-include/mavlink/v1.0/common/mavlink_msg_global_position_setpoint_int.h
+include/mavlink/v1.0/common/mavlink_msg_global_position_int_cov.h
include/mavlink/v1.0/common/mavlink_msg_global_vision_position_estimate.h
+include/mavlink/v1.0/common/mavlink_msg_gps2_raw.h
+include/mavlink/v1.0/common/mavlink_msg_gps2_rtk.h
include/mavlink/v1.0/common/mavlink_msg_gps_global_origin.h
+include/mavlink/v1.0/common/mavlink_msg_gps_inject_data.h
include/mavlink/v1.0/common/mavlink_msg_gps_raw_int.h
+include/mavlink/v1.0/common/mavlink_msg_gps_rtk.h
include/mavlink/v1.0/common/mavlink_msg_gps_status.h
include/mavlink/v1.0/common/mavlink_msg_heartbeat.h
include/mavlink/v1.0/common/mavlink_msg_highres_imu.h
include/mavlink/v1.0/common/mavlink_msg_hil_controls.h
+include/mavlink/v1.0/common/mavlink_msg_hil_gps.h
+include/mavlink/v1.0/common/mavlink_msg_hil_optical_flow.h
include/mavlink/v1.0/common/mavlink_msg_hil_rc_inputs_raw.h
+include/mavlink/v1.0/common/mavlink_msg_hil_sensor.h
include/mavlink/v1.0/common/mavlink_msg_hil_state.h
+include/mavlink/v1.0/common/mavlink_msg_hil_state_quaternion.h
include/mavlink/v1.0/common/mavlink_msg_local_position_ned.h
+include/mavlink/v1.0/common/mavlink_msg_local_position_ned_cov.h
include/mavlink/v1.0/common/mavlink_msg_local_position_ned_system_global_offset.h
-include/mavlink/v1.0/common/mavlink_msg_local_position_setpoint.h
+include/mavlink/v1.0/common/mavlink_msg_log_data.h
+include/mavlink/v1.0/common/mavlink_msg_log_entry.h
+include/mavlink/v1.0/common/mavlink_msg_log_erase.h
+include/mavlink/v1.0/common/mavlink_msg_log_request_data.h
+include/mavlink/v1.0/common/mavlink_msg_log_request_end.h
+include/mavlink/v1.0/common/mavlink_msg_log_request_list.h
include/mavlink/v1.0/common/mavlink_msg_manual_control.h
include/mavlink/v1.0/common/mavlink_msg_manual_setpoint.h
include/mavlink/v1.0/common/mavlink_msg_memory_vect.h
@@ -221,6 +262,7 @@ include/mavlink/v1.0/common/mavlink_msg_mission_clear_all.h
include/mavlink/v1.0/common/mavlink_msg_mission_count.h
include/mavlink/v1.0/common/mavlink_msg_mission_current.h
include/mavlink/v1.0/common/mavlink_msg_mission_item.h
+include/mavlink/v1.0/common/mavlink_msg_mission_item_int.h
include/mavlink/v1.0/common/mavlink_msg_mission_item_reached.h
include/mavlink/v1.0/common/mavlink_msg_mission_request.h
include/mavlink/v1.0/common/mavlink_msg_mission_request_list.h
@@ -231,40 +273,49 @@ include/mavlink/v1.0/common/mavlink_msg_named_value_float.h
include/mavlink/v1.0/common/mavlink_msg_named_value_int.h
include/mavlink/v1.0/common/mavlink_msg_nav_controller_output.h
include/mavlink/v1.0/common/mavlink_msg_optical_flow.h
+include/mavlink/v1.0/common/mavlink_msg_optical_flow_rad.h
+include/mavlink/v1.0/common/mavlink_msg_param_map_rc.h
include/mavlink/v1.0/common/mavlink_msg_param_request_list.h
include/mavlink/v1.0/common/mavlink_msg_param_request_read.h
include/mavlink/v1.0/common/mavlink_msg_param_set.h
include/mavlink/v1.0/common/mavlink_msg_param_value.h
include/mavlink/v1.0/common/mavlink_msg_ping.h
+include/mavlink/v1.0/common/mavlink_msg_position_target_global_int.h
+include/mavlink/v1.0/common/mavlink_msg_position_target_local_ned.h
+include/mavlink/v1.0/common/mavlink_msg_power_status.h
+include/mavlink/v1.0/common/mavlink_msg_radio_status.h
include/mavlink/v1.0/common/mavlink_msg_raw_imu.h
include/mavlink/v1.0/common/mavlink_msg_raw_pressure.h
+include/mavlink/v1.0/common/mavlink_msg_rc_channels.h
include/mavlink/v1.0/common/mavlink_msg_rc_channels_override.h
include/mavlink/v1.0/common/mavlink_msg_rc_channels_raw.h
include/mavlink/v1.0/common/mavlink_msg_rc_channels_scaled.h
include/mavlink/v1.0/common/mavlink_msg_request_data_stream.h
-include/mavlink/v1.0/common/mavlink_msg_roll_pitch_yaw_rates_thrust_setpoint.h
-include/mavlink/v1.0/common/mavlink_msg_roll_pitch_yaw_speed_thrust_setpoint.h
-include/mavlink/v1.0/common/mavlink_msg_roll_pitch_yaw_thrust_setpoint.h
include/mavlink/v1.0/common/mavlink_msg_safety_allowed_area.h
include/mavlink/v1.0/common/mavlink_msg_safety_set_allowed_area.h
include/mavlink/v1.0/common/mavlink_msg_scaled_imu.h
+include/mavlink/v1.0/common/mavlink_msg_scaled_imu2.h
+include/mavlink/v1.0/common/mavlink_msg_scaled_imu3.h
include/mavlink/v1.0/common/mavlink_msg_scaled_pressure.h
+include/mavlink/v1.0/common/mavlink_msg_scaled_pressure2.h
+include/mavlink/v1.0/common/mavlink_msg_serial_control.h
include/mavlink/v1.0/common/mavlink_msg_servo_output_raw.h
-include/mavlink/v1.0/common/mavlink_msg_set_global_position_setpoint_int.h
+include/mavlink/v1.0/common/mavlink_msg_set_actuator_control_target.h
+include/mavlink/v1.0/common/mavlink_msg_set_attitude_target.h
include/mavlink/v1.0/common/mavlink_msg_set_gps_global_origin.h
-include/mavlink/v1.0/common/mavlink_msg_set_local_position_setpoint.h
include/mavlink/v1.0/common/mavlink_msg_set_mode.h
-include/mavlink/v1.0/common/mavlink_msg_set_quad_motors_setpoint.h
-include/mavlink/v1.0/common/mavlink_msg_set_quad_swarm_led_roll_pitch_yaw_thrust.h
-include/mavlink/v1.0/common/mavlink_msg_set_quad_swarm_roll_pitch_yaw_thrust.h
-include/mavlink/v1.0/common/mavlink_msg_set_roll_pitch_yaw_speed_thrust.h
-include/mavlink/v1.0/common/mavlink_msg_set_roll_pitch_yaw_thrust.h
-include/mavlink/v1.0/common/mavlink_msg_setpoint_6dof.h
-include/mavlink/v1.0/common/mavlink_msg_setpoint_8dof.h
-include/mavlink/v1.0/common/mavlink_msg_state_correction.h
+include/mavlink/v1.0/common/mavlink_msg_set_position_target_global_int.h
+include/mavlink/v1.0/common/mavlink_msg_set_position_target_local_ned.h
+include/mavlink/v1.0/common/mavlink_msg_sim_state.h
include/mavlink/v1.0/common/mavlink_msg_statustext.h
include/mavlink/v1.0/common/mavlink_msg_sys_status.h
include/mavlink/v1.0/common/mavlink_msg_system_time.h
+include/mavlink/v1.0/common/mavlink_msg_terrain_check.h
+include/mavlink/v1.0/common/mavlink_msg_terrain_data.h
+include/mavlink/v1.0/common/mavlink_msg_terrain_report.h
+include/mavlink/v1.0/common/mavlink_msg_terrain_request.h
+include/mavlink/v1.0/common/mavlink_msg_timesync.h
+include/mavlink/v1.0/common/mavlink_msg_v2_extension.h
include/mavlink/v1.0/common/mavlink_msg_vfr_hud.h
include/mavlink/v1.0/common/mavlink_msg_vicon_position_estimate.h
include/mavlink/v1.0/common/mavlink_msg_vision_position_estimate.h
@@ -296,8 +347,8 @@ include/mavlink/v1.0/matrixpilot/mavlink_msg_serial_udb_extra_f7.h
include/mavlink/v1.0/matrixpilot/mavlink_msg_serial_udb_extra_f8.h
include/mavlink/v1.0/matrixpilot/testsuite.h
include/mavlink/v1.0/matrixpilot/version.h
+include/mavlink/v1.0/mavlink_conversions.h
include/mavlink/v1.0/mavlink_helpers.h
-include/mavlink/v1.0/mavlink_protobuf_manager.hpp
include/mavlink/v1.0/mavlink_types.h
include/mavlink/v1.0/minimal/mavlink.h
include/mavlink/v1.0/minimal/mavlink_msg_heartbeat.h
@@ -307,12 +358,12 @@ include/mavlink/v1.0/minimal/version.h
include/mavlink/v1.0/pixhawk/mavlink.h
include/mavlink/v1.0/pixhawk/mavlink_msg_attitude_control.h
include/mavlink/v1.0/pixhawk/mavlink_msg_brief_feature.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_data_transmission_handshake.h
-include/mavlink/v1.0/pixhawk/mavlink_msg_encapsulated_data.h
+include/mavlink/v1.0/pixhawk/mavlink_msg_detection_stats.h
include/mavlink/v1.0/pixhawk/mavlink_msg_image_available.h
include/mavlink/v1.0/pixhawk/mavlink_msg_image_trigger_control.h
include/mavlink/v1.0/pixhawk/mavlink_msg_image_triggered.h
include/mavlink/v1.0/pixhawk/mavlink_msg_marker.h
+include/mavlink/v1.0/pixhawk/mavlink_msg_onboard_health.h
include/mavlink/v1.0/pixhawk/mavlink_msg_pattern_detected.h
include/mavlink/v1.0/pixhawk/mavlink_msg_point_of_interest.h
include/mavlink/v1.0/pixhawk/mavlink_msg_point_of_interest_connection.h
@@ -325,39 +376,30 @@ include/mavlink/v1.0/pixhawk/mavlink_msg_watchdog_heartbeat.h
include/mavlink/v1.0/pixhawk/mavlink_msg_watchdog_process_info.h
include/mavlink/v1.0/pixhawk/mavlink_msg_watchdog_process_status.h
include/mavlink/v1.0/pixhawk/pixhawk.h
-include/mavlink/v1.0/pixhawk/pixhawk.pb.h
include/mavlink/v1.0/pixhawk/testsuite.h
include/mavlink/v1.0/pixhawk/version.h
include/mavlink/v1.0/protocol.h
-include/mavlink/v1.0/sensesoar/mavlink.h
-include/mavlink/v1.0/sensesoar/mavlink_msg_cmd_airspeed_ack.h
-include/mavlink/v1.0/sensesoar/mavlink_msg_cmd_airspeed_chng.h
-include/mavlink/v1.0/sensesoar/mavlink_msg_filt_rot_vel.h
-include/mavlink/v1.0/sensesoar/mavlink_msg_llc_out.h
-include/mavlink/v1.0/sensesoar/mavlink_msg_obs_air_temp.h
-include/mavlink/v1.0/sensesoar/mavlink_msg_obs_air_velocity.h
-include/mavlink/v1.0/sensesoar/mavlink_msg_obs_attitude.h
-include/mavlink/v1.0/sensesoar/mavlink_msg_obs_bias.h
-include/mavlink/v1.0/sensesoar/mavlink_msg_obs_position.h
-include/mavlink/v1.0/sensesoar/mavlink_msg_obs_qff.h
-include/mavlink/v1.0/sensesoar/mavlink_msg_obs_velocity.h
-include/mavlink/v1.0/sensesoar/mavlink_msg_obs_wind.h
-include/mavlink/v1.0/sensesoar/mavlink_msg_pm_elec.h
-include/mavlink/v1.0/sensesoar/mavlink_msg_sys_stat.h
-include/mavlink/v1.0/sensesoar/sensesoar.h
-include/mavlink/v1.0/sensesoar/testsuite.h
-include/mavlink/v1.0/sensesoar/version.h
include/mavlink/v1.0/slugs/mavlink.h
-include/mavlink/v1.0/slugs/mavlink_msg_air_data.h
+include/mavlink/v1.0/slugs/mavlink_msg_boot.h
+include/mavlink/v1.0/slugs/mavlink_msg_control_surface.h
include/mavlink/v1.0/slugs/mavlink_msg_cpu_load.h
include/mavlink/v1.0/slugs/mavlink_msg_ctrl_srfc_pt.h
include/mavlink/v1.0/slugs/mavlink_msg_data_log.h
include/mavlink/v1.0/slugs/mavlink_msg_diagnostic.h
include/mavlink/v1.0/slugs/mavlink_msg_gps_date_time.h
+include/mavlink/v1.0/slugs/mavlink_msg_isr_location.h
include/mavlink/v1.0/slugs/mavlink_msg_mid_lvl_cmds.h
+include/mavlink/v1.0/slugs/mavlink_msg_novatel_diag.h
+include/mavlink/v1.0/slugs/mavlink_msg_ptz_status.h
include/mavlink/v1.0/slugs/mavlink_msg_sensor_bias.h
-include/mavlink/v1.0/slugs/mavlink_msg_slugs_action.h
+include/mavlink/v1.0/slugs/mavlink_msg_sensor_diag.h
+include/mavlink/v1.0/slugs/mavlink_msg_slugs_camera_order.h
+include/mavlink/v1.0/slugs/mavlink_msg_slugs_configuration_camera.h
+include/mavlink/v1.0/slugs/mavlink_msg_slugs_mobile_location.h
include/mavlink/v1.0/slugs/mavlink_msg_slugs_navigation.h
+include/mavlink/v1.0/slugs/mavlink_msg_status_gps.h
+include/mavlink/v1.0/slugs/mavlink_msg_uav_status.h
+include/mavlink/v1.0/slugs/mavlink_msg_volt_sensor.h
include/mavlink/v1.0/slugs/slugs.h
include/mavlink/v1.0/slugs/testsuite.h
include/mavlink/v1.0/slugs/version.h
@@ -374,4 +416,4 @@ include/mavlink/v1.0/ualberta/testsuite.h
include/mavlink/v1.0/ualberta/ualberta.h
include/mavlink/v1.0/ualberta/version.h
lib/pkgconfig/mavlink.pc
-share/mavlink/src/v1.0/pixhawk/pixhawk.pb.cc
+@pkgdir share/mavlink
diff --git a/mavlink/distinfo b/mavlink/distinfo
index 69b89404404316201dfe78ee1c33c5b7750ec025..b42768262adc209fd81bcfd04c80c38dbad822f8 100644
--- a/mavlink/distinfo
+++ b/mavlink/distinfo
@@ -1,3 +1,3 @@
-SHA1 (1.0.11.tar.gz) = e6cbf1499cb6bea9cb67a566216aec68bd149b2d
-RMD160 (1.0.11.tar.gz) = 20aedd017e6d70fcd4d8a980dddadc7ad4902c55
-Size (1.0.11.tar.gz) = 374075 bytes
+SHA1 (mavlink-20150326.tar.gz) = 173e60d59e5d3c1b788d0f879e56fa97472a244e
+RMD160 (mavlink-20150326.tar.gz) = 60008b61234467791e0ad0c153a745777894ba1e
+SHA1 (patch-cmake) = 99e7836e33990af23eda3957d45a398f67b67a67
diff --git a/mavlink/patches/patch-cmake b/mavlink/patches/patch-cmake
new file mode 100644
index 0000000000000000000000000000000000000000..feab03d6a5f32b008919e2f86d4da4ca5e6ccab1
--- /dev/null
+++ b/mavlink/patches/patch-cmake
@@ -0,0 +1,22 @@
+Reported on https://github.com/mavlink/mavlink/pull/359
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9672634..ab3c11e 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -127,14 +127,13 @@ macro(generateMavlink version definitions)
+ COMMAND PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_EXECUTABLE} ${mavgen} --lang=C --wire-protocol=${version}
+ --output=include/v${version} ${definitionAbsPath}
+ COMMAND touch ${targetName}-stamp
+- DEPENDS ${definitionAbsPath} ${mavgen}
+ )
+ add_custom_target(${targetName} ALL DEPENDS ${targetName}-stamp)
+ endforeach()
+ endmacro()
+
+ # build
+-set(mavgen ${CMAKE_SOURCE_DIR}/pymavlink/generator/mavgen.py)
++set(mavgen -m pymavlink.tools.mavgen)
+ set(v0.9Definitions
+ ardupilotmega.xml
+ common.xml