Move MAVLink to lib/main/MAVLink; Post-rebase fixups

2016-10-17 17:24:42 +10:00 · 2016-10-17 17:24:42 +10:00 · 09140cfdef
parent f73e07e299
commit 09140cfdef
127 changed files with 8 additions and 9 deletions
--- a/3
+++ b/3
@ -385,6 +385,9 @@ else
 .DEFAULT_GOAL := hex
 endif

+INCLUDE_DIRS    := $(INCLUDE_DIRS) \
+                   $(ROOT)/lib/main/MAVLink
+
 INCLUDE_DIRS    := $(INCLUDE_DIRS) \
                   $(TARGET_DIR)

--- a/src/main/telemetry/mavlink/checksum.h
+++ b/src/main/telemetry/mavlink/checksum.h
--- a/src/main/telemetry/mavlink/common/common.h
+++ b/src/main/telemetry/mavlink/common/common.h
--- a/src/main/telemetry/mavlink/common/mavlink.h
+++ b/src/main/telemetry/mavlink/common/mavlink.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_actuator_control_target.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_actuator_control_target.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_att_pos_mocap.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_att_pos_mocap.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_attitude.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_attitude.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_attitude_quaternion.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_attitude_quaternion.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_attitude_quaternion_cov.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_attitude_quaternion_cov.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_attitude_target.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_attitude_target.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_auth_key.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_auth_key.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_autopilot_version.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_autopilot_version.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_battery_status.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_battery_status.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_camera_trigger.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_camera_trigger.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_change_operator_control.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_change_operator_control.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_change_operator_control_ack.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_change_operator_control_ack.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_command_ack.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_command_ack.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_command_int.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_command_int.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_command_long.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_command_long.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_data_stream.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_data_stream.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_data_transmission_handshake.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_data_transmission_handshake.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_debug.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_debug.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_debug_vect.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_debug_vect.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_distance_sensor.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_distance_sensor.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_encapsulated_data.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_encapsulated_data.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_file_transfer_protocol.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_file_transfer_protocol.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_global_position_int.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_global_position_int.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_global_position_int_cov.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_global_position_int_cov.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_global_vision_position_estimate.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_global_vision_position_estimate.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_gps2_raw.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_gps2_raw.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_gps2_rtk.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_gps2_rtk.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_gps_global_origin.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_gps_global_origin.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_gps_inject_data.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_gps_inject_data.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_gps_raw_int.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_gps_raw_int.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_gps_rtk.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_gps_rtk.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_gps_status.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_gps_status.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_heartbeat.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_heartbeat.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_highres_imu.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_highres_imu.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_hil_controls.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_hil_controls.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_hil_gps.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_hil_gps.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_hil_optical_flow.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_hil_optical_flow.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_hil_rc_inputs_raw.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_hil_rc_inputs_raw.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_hil_sensor.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_hil_sensor.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_hil_state.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_hil_state.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_hil_state_quaternion.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_hil_state_quaternion.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_local_position_ned.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_local_position_ned.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_local_position_ned_cov.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_local_position_ned_cov.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_local_position_ned_system_global_offset.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_local_position_ned_system_global_offset.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_log_data.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_log_data.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_log_entry.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_log_entry.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_log_erase.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_log_erase.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_log_request_data.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_log_request_data.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_log_request_end.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_log_request_end.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_log_request_list.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_log_request_list.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_manual_control.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_manual_control.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_manual_setpoint.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_manual_setpoint.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_memory_vect.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_memory_vect.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_mission_ack.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_mission_ack.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_mission_clear_all.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_mission_clear_all.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_mission_count.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_mission_count.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_mission_current.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_mission_current.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_mission_item.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_mission_item.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_mission_item_int.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_mission_item_int.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_mission_item_reached.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_mission_item_reached.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_mission_request.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_mission_request.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_mission_request_list.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_mission_request_list.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_mission_request_partial_list.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_mission_request_partial_list.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_mission_set_current.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_mission_set_current.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_mission_write_partial_list.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_mission_write_partial_list.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_named_value_float.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_named_value_float.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_named_value_int.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_named_value_int.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_nav_controller_output.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_nav_controller_output.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_optical_flow.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_optical_flow.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_optical_flow_rad.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_optical_flow_rad.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_param_map_rc.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_param_map_rc.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_param_request_list.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_param_request_list.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_param_request_read.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_param_request_read.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_param_set.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_param_set.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_param_value.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_param_value.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_ping.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_ping.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_position_target_global_int.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_position_target_global_int.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_position_target_local_ned.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_position_target_local_ned.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_power_status.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_power_status.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_radio_status.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_radio_status.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_raw_imu.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_raw_imu.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_raw_pressure.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_raw_pressure.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_rc_channels.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_rc_channels.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_rc_channels_override.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_rc_channels_override.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_rc_channels_raw.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_rc_channels_raw.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_rc_channels_scaled.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_rc_channels_scaled.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_request_data_stream.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_request_data_stream.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_safety_allowed_area.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_safety_allowed_area.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_safety_set_allowed_area.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_safety_set_allowed_area.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_scaled_imu.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_scaled_imu.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_scaled_imu2.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_scaled_imu2.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_scaled_imu3.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_scaled_imu3.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_scaled_pressure.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_scaled_pressure.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_scaled_pressure2.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_scaled_pressure2.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_serial_control.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_serial_control.h
--- a/src/main/telemetry/mavlink/common/mavlink_msg_servo_output_raw.h
+++ b/src/main/telemetry/mavlink/common/mavlink_msg_servo_output_raw.h
--- a/Show More
+++ b/Show More