diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AP-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AP-1280.size.txt index 98e22f7f52..9b8f40b39e 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AP-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AP-1280.size.txt @@ -343,7 +343,6 @@ 0000000f V AP_IMU_Oilpan::AP_IMU_Oilpan(AP_ADC*, unsigned int)::__c 00000010 b rc_override 00000010 r planner_menu_commands -00000010 r __menu_name__main_menu 00000010 T GCS_MAVLINK::send_message(ap_message) 00000010 W AP_VarT::cast_to_float() const 00000010 W AP_VarT::cast_to_float() const @@ -352,6 +351,7 @@ 00000010 r Log_Read_Startup()::__c 00000010 r test_wp(unsigned char, Menu::arg const*)::__c 00000010 r dump_log(unsigned char, Menu::arg const*)::__c +00000011 r __menu_name__main_menu 00000011 r erase_logs(unsigned char, Menu::arg const*)::__c 00000011 r zero_eeprom()::__c 00000011 r test_airspeed(unsigned char, Menu::arg const*)::__c @@ -419,7 +419,10 @@ 00000019 r handle_process_nav_cmd()::__c 00000019 r handle_process_do_command()::__c 00000019 r handle_process_condition_command()::__c +00000019 r do_jump()::__c 0000001a r failsafe_short_on_event()::__c +0000001a r do_jump()::__c +0000001a r do_jump()::__c 0000001a r Log_Read(int, int)::__c 0000001b r failsafe_short_off_event()::__c 0000001c W AP_VarA::unserialize(void*, unsigned int) @@ -440,12 +443,12 @@ 0000001e r startup_ground()::__c 0000001f r setup_compass(unsigned char, Menu::arg const*)::__c 0000001f r init_ardupilot()::__c -0000001f r Log_Read(int, int)::__c 0000001f r test_mag(unsigned char, Menu::arg const*)::__c 00000020 t gcs_send_message(ap_message) 00000020 r test_current(unsigned char, Menu::arg const*)::__c 00000020 r report_xtrack()::__c 00000020 r init_barometer()::__c +00000020 r Log_Read(int, int)::__c 00000020 t byte_swap_4 00000021 r print_log_menu()::__c 00000021 r print_log_menu()::__c @@ -475,9 +478,9 @@ 00000026 t print_done() 00000026 t print_hit_enter() 00000026 r init_ardupilot()::__c -00000026 r init_ardupilot()::__c 00000026 r print_PID(PID*)::__c 00000027 r change_command(unsigned char)::__c +00000027 r init_ardupilot()::__c 00000027 r test_xbee(unsigned char, Menu::arg const*)::__c 00000028 t main_menu_help(unsigned char, Menu::arg const*) 00000028 t help_log(unsigned char, Menu::arg const*) @@ -683,6 +686,7 @@ 0000018c T GCS_MAVLINK::data_stream_send(unsigned int, unsigned int) 00000192 T init_home() 00000192 t test_imu(unsigned char, Menu::arg const*) +0000019c t do_jump() 000001ae t start_new_log(unsigned char) 000001b2 t update_crosstrack() 000001b2 t set_mode(unsigned char) @@ -706,10 +710,10 @@ 0000024c t update_loiter() 0000025c t setup_radio(unsigned char, Menu::arg const*) 00000268 t send_raw_imu3(mavlink_channel_t) +000002d4 t handle_process_do_command() 000002e4 t read_radio() 0000031e t test_mag(unsigned char, Menu::arg const*) 0000033a W Parameters::~Parameters() -00000382 t handle_process_do_command() 000003e6 t read_battery() 0000044c t print_log_menu() 000004de t set_servos() @@ -718,4 +722,4 @@ 00000920 W Parameters::Parameters() 0000092b b g 0000149a T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001be4 T loop +00001cbe T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AP-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AP-2560.size.txt index ce4a544e01..0fa674eeaf 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AP-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AP-2560.size.txt @@ -343,7 +343,6 @@ 0000000f V AP_IMU_Oilpan::AP_IMU_Oilpan(AP_ADC*, unsigned int)::__c 00000010 b rc_override 00000010 r planner_menu_commands -00000010 r __menu_name__main_menu 00000010 T GCS_MAVLINK::send_message(ap_message) 00000010 W AP_VarT::cast_to_float() const 00000010 W AP_VarT::cast_to_float() const @@ -352,6 +351,7 @@ 00000010 r Log_Read_Startup()::__c 00000010 r test_wp(unsigned char, Menu::arg const*)::__c 00000010 r dump_log(unsigned char, Menu::arg const*)::__c +00000011 r __menu_name__main_menu 00000011 r erase_logs(unsigned char, Menu::arg const*)::__c 00000011 r zero_eeprom()::__c 00000011 r test_airspeed(unsigned char, Menu::arg const*)::__c @@ -419,7 +419,10 @@ 00000019 r handle_process_nav_cmd()::__c 00000019 r handle_process_do_command()::__c 00000019 r handle_process_condition_command()::__c +00000019 r do_jump()::__c 0000001a r failsafe_short_on_event()::__c +0000001a r do_jump()::__c +0000001a r do_jump()::__c 0000001a r Log_Read(int, int)::__c 0000001b r failsafe_short_off_event()::__c 0000001c W AP_VarA::unserialize(void*, unsigned int) @@ -440,12 +443,12 @@ 0000001e r startup_ground()::__c 0000001f r setup_compass(unsigned char, Menu::arg const*)::__c 0000001f r init_ardupilot()::__c -0000001f r Log_Read(int, int)::__c 0000001f r test_mag(unsigned char, Menu::arg const*)::__c 00000020 t gcs_send_message(ap_message) 00000020 r test_current(unsigned char, Menu::arg const*)::__c 00000020 r report_xtrack()::__c 00000020 r init_barometer()::__c +00000020 r Log_Read(int, int)::__c 00000020 t byte_swap_4 00000021 r print_log_menu()::__c 00000021 r print_log_menu()::__c @@ -475,9 +478,9 @@ 00000026 t print_done() 00000026 t print_hit_enter() 00000026 r init_ardupilot()::__c -00000026 r init_ardupilot()::__c 00000026 r print_PID(PID*)::__c 00000027 r change_command(unsigned char)::__c +00000027 r init_ardupilot()::__c 00000027 r test_xbee(unsigned char, Menu::arg const*)::__c 00000028 t main_menu_help(unsigned char, Menu::arg const*) 00000028 t help_log(unsigned char, Menu::arg const*) @@ -683,6 +686,7 @@ 0000018c T GCS_MAVLINK::data_stream_send(unsigned int, unsigned int) 00000190 T init_home() 00000192 t test_imu(unsigned char, Menu::arg const*) +0000019a t do_jump() 000001ae t start_new_log(unsigned char) 000001b2 t update_crosstrack() 000001b2 t set_mode(unsigned char) @@ -706,10 +710,10 @@ 0000024c t update_loiter() 0000025c t setup_radio(unsigned char, Menu::arg const*) 00000268 t send_raw_imu3(mavlink_channel_t) +000002d4 t handle_process_do_command() 000002e4 t read_radio() 0000031e t test_mag(unsigned char, Menu::arg const*) 0000033a W Parameters::~Parameters() -00000382 t handle_process_do_command() 000003e6 t read_battery() 00000436 t print_log_menu() 000004de t set_servos() @@ -718,4 +722,4 @@ 00000920 W Parameters::Parameters() 0000092b b g 0000149a T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001be4 T loop +00001cbe T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-1280.size.txt index 98e22f7f52..9b8f40b39e 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-1280.size.txt @@ -343,7 +343,6 @@ 0000000f V AP_IMU_Oilpan::AP_IMU_Oilpan(AP_ADC*, unsigned int)::__c 00000010 b rc_override 00000010 r planner_menu_commands -00000010 r __menu_name__main_menu 00000010 T GCS_MAVLINK::send_message(ap_message) 00000010 W AP_VarT::cast_to_float() const 00000010 W AP_VarT::cast_to_float() const @@ -352,6 +351,7 @@ 00000010 r Log_Read_Startup()::__c 00000010 r test_wp(unsigned char, Menu::arg const*)::__c 00000010 r dump_log(unsigned char, Menu::arg const*)::__c +00000011 r __menu_name__main_menu 00000011 r erase_logs(unsigned char, Menu::arg const*)::__c 00000011 r zero_eeprom()::__c 00000011 r test_airspeed(unsigned char, Menu::arg const*)::__c @@ -419,7 +419,10 @@ 00000019 r handle_process_nav_cmd()::__c 00000019 r handle_process_do_command()::__c 00000019 r handle_process_condition_command()::__c +00000019 r do_jump()::__c 0000001a r failsafe_short_on_event()::__c +0000001a r do_jump()::__c +0000001a r do_jump()::__c 0000001a r Log_Read(int, int)::__c 0000001b r failsafe_short_off_event()::__c 0000001c W AP_VarA::unserialize(void*, unsigned int) @@ -440,12 +443,12 @@ 0000001e r startup_ground()::__c 0000001f r setup_compass(unsigned char, Menu::arg const*)::__c 0000001f r init_ardupilot()::__c -0000001f r Log_Read(int, int)::__c 0000001f r test_mag(unsigned char, Menu::arg const*)::__c 00000020 t gcs_send_message(ap_message) 00000020 r test_current(unsigned char, Menu::arg const*)::__c 00000020 r report_xtrack()::__c 00000020 r init_barometer()::__c +00000020 r Log_Read(int, int)::__c 00000020 t byte_swap_4 00000021 r print_log_menu()::__c 00000021 r print_log_menu()::__c @@ -475,9 +478,9 @@ 00000026 t print_done() 00000026 t print_hit_enter() 00000026 r init_ardupilot()::__c -00000026 r init_ardupilot()::__c 00000026 r print_PID(PID*)::__c 00000027 r change_command(unsigned char)::__c +00000027 r init_ardupilot()::__c 00000027 r test_xbee(unsigned char, Menu::arg const*)::__c 00000028 t main_menu_help(unsigned char, Menu::arg const*) 00000028 t help_log(unsigned char, Menu::arg const*) @@ -683,6 +686,7 @@ 0000018c T GCS_MAVLINK::data_stream_send(unsigned int, unsigned int) 00000192 T init_home() 00000192 t test_imu(unsigned char, Menu::arg const*) +0000019c t do_jump() 000001ae t start_new_log(unsigned char) 000001b2 t update_crosstrack() 000001b2 t set_mode(unsigned char) @@ -706,10 +710,10 @@ 0000024c t update_loiter() 0000025c t setup_radio(unsigned char, Menu::arg const*) 00000268 t send_raw_imu3(mavlink_channel_t) +000002d4 t handle_process_do_command() 000002e4 t read_radio() 0000031e t test_mag(unsigned char, Menu::arg const*) 0000033a W Parameters::~Parameters() -00000382 t handle_process_do_command() 000003e6 t read_battery() 0000044c t print_log_menu() 000004de t set_servos() @@ -718,4 +722,4 @@ 00000920 W Parameters::Parameters() 0000092b b g 0000149a T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001be4 T loop +00001cbe T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-2560.size.txt index ce4a544e01..0fa674eeaf 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-2560.size.txt @@ -343,7 +343,6 @@ 0000000f V AP_IMU_Oilpan::AP_IMU_Oilpan(AP_ADC*, unsigned int)::__c 00000010 b rc_override 00000010 r planner_menu_commands -00000010 r __menu_name__main_menu 00000010 T GCS_MAVLINK::send_message(ap_message) 00000010 W AP_VarT::cast_to_float() const 00000010 W AP_VarT::cast_to_float() const @@ -352,6 +351,7 @@ 00000010 r Log_Read_Startup()::__c 00000010 r test_wp(unsigned char, Menu::arg const*)::__c 00000010 r dump_log(unsigned char, Menu::arg const*)::__c +00000011 r __menu_name__main_menu 00000011 r erase_logs(unsigned char, Menu::arg const*)::__c 00000011 r zero_eeprom()::__c 00000011 r test_airspeed(unsigned char, Menu::arg const*)::__c @@ -419,7 +419,10 @@ 00000019 r handle_process_nav_cmd()::__c 00000019 r handle_process_do_command()::__c 00000019 r handle_process_condition_command()::__c +00000019 r do_jump()::__c 0000001a r failsafe_short_on_event()::__c +0000001a r do_jump()::__c +0000001a r do_jump()::__c 0000001a r Log_Read(int, int)::__c 0000001b r failsafe_short_off_event()::__c 0000001c W AP_VarA::unserialize(void*, unsigned int) @@ -440,12 +443,12 @@ 0000001e r startup_ground()::__c 0000001f r setup_compass(unsigned char, Menu::arg const*)::__c 0000001f r init_ardupilot()::__c -0000001f r Log_Read(int, int)::__c 0000001f r test_mag(unsigned char, Menu::arg const*)::__c 00000020 t gcs_send_message(ap_message) 00000020 r test_current(unsigned char, Menu::arg const*)::__c 00000020 r report_xtrack()::__c 00000020 r init_barometer()::__c +00000020 r Log_Read(int, int)::__c 00000020 t byte_swap_4 00000021 r print_log_menu()::__c 00000021 r print_log_menu()::__c @@ -475,9 +478,9 @@ 00000026 t print_done() 00000026 t print_hit_enter() 00000026 r init_ardupilot()::__c -00000026 r init_ardupilot()::__c 00000026 r print_PID(PID*)::__c 00000027 r change_command(unsigned char)::__c +00000027 r init_ardupilot()::__c 00000027 r test_xbee(unsigned char, Menu::arg const*)::__c 00000028 t main_menu_help(unsigned char, Menu::arg const*) 00000028 t help_log(unsigned char, Menu::arg const*) @@ -683,6 +686,7 @@ 0000018c T GCS_MAVLINK::data_stream_send(unsigned int, unsigned int) 00000190 T init_home() 00000192 t test_imu(unsigned char, Menu::arg const*) +0000019a t do_jump() 000001ae t start_new_log(unsigned char) 000001b2 t update_crosstrack() 000001b2 t set_mode(unsigned char) @@ -706,10 +710,10 @@ 0000024c t update_loiter() 0000025c t setup_radio(unsigned char, Menu::arg const*) 00000268 t send_raw_imu3(mavlink_channel_t) +000002d4 t handle_process_do_command() 000002e4 t read_radio() 0000031e t test_mag(unsigned char, Menu::arg const*) 0000033a W Parameters::~Parameters() -00000382 t handle_process_do_command() 000003e6 t read_battery() 00000436 t print_log_menu() 000004de t set_servos() @@ -718,4 +722,4 @@ 00000920 W Parameters::Parameters() 0000092b b g 0000149a T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001be4 T loop +00001cbe T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/APHIL-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/APHIL-1280.build.log index 5ff5c619b3..f7c809ef2b 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/APHIL-1280.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/APHIL-1280.build.log @@ -15,9 +15,9 @@ autogenerated:36: warning: 'void send_raw_imu3(mavlink_channel_t)' declared 'sta autogenerated:49: warning: 'bool print_log_menu()' declared 'static' but never defined autogenerated:52: warning: 'void get_log_boundaries(byte, int&, int&)' declared 'static' but never defined autogenerated:53: warning: 'int find_last_log_page(int)' declared 'static' but never defined -/root/apm/ardupilot-mega/ArduPlane/Log.pde:746: warning: 'void Log_Write_Attitude(int, int, uint16_t)' defined but not used -/root/apm/ardupilot-mega/ArduPlane/Log.pde:747: warning: 'void Log_Write_Control_Tuning()' defined but not used -/root/apm/ardupilot-mega/ArduPlane/Log.pde:748: warning: 'void Log_Write_Raw()' defined but not used +/root/apm/ardupilot-mega/ArduPlane/Log.pde:749: warning: 'void Log_Write_Attitude(int, int, uint16_t)' defined but not used +/root/apm/ardupilot-mega/ArduPlane/Log.pde:750: warning: 'void Log_Write_Control_Tuning()' defined but not used +/root/apm/ardupilot-mega/ArduPlane/Log.pde:751: warning: 'void Log_Write_Raw()' defined but not used autogenerated:64: warning: 'void Log_Read_Current()' declared 'static' but never defined autogenerated:65: warning: 'void Log_Read_Control_Tuning()' declared 'static' but never defined autogenerated:66: warning: 'void Log_Read_Nav_Tuning()' declared 'static' but never defined @@ -64,7 +64,7 @@ autogenerated:199: warning: 'void test_wp_print(Location*, byte)' declared 'stat /root/apm/ardupilot-mega/ArduPlane/ArduPlane.pde:304: warning: 'airspeed_raw' defined but not used /root/apm/ardupilot-mega/ArduPlane/ArduPlane.pde:305: warning: 'airspeed_pressure' defined but not used /root/apm/ardupilot-mega/ArduPlane/ArduPlane.pde:309: warning: 'abs_pressure' defined but not used -/root/apm/ardupilot-mega/ArduPlane/Log.pde:743: warning: 'int8_t process_logs(uint8_t, const Menu::arg*)' defined but not used +/root/apm/ardupilot-mega/ArduPlane/Log.pde:746: warning: 'int8_t process_logs(uint8_t, const Menu::arg*)' defined but not used /root/apm/ardupilot-mega/ArduPlane/planner.pde:19: warning: 'int8_t planner_mode(uint8_t, const Menu::arg*)' defined but not used %% libraries/APM_BMP085/APM_BMP085.o %% libraries/APM_BMP085/APM_BMP085_hil.o diff --git a/Tools/ArdupilotMegaPlanner/Firmware/APHIL-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/APHIL-1280.size.txt index 08d18a0d1a..3c5d76aeb2 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/APHIL-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/APHIL-1280.size.txt @@ -279,8 +279,11 @@ 00000019 r handle_process_nav_cmd()::__c 00000019 r handle_process_do_command()::__c 00000019 r handle_process_condition_command()::__c +00000019 r do_jump()::__c 0000001a t startup_IMU_ground() 0000001a r failsafe_short_on_event()::__c +0000001a r do_jump()::__c +0000001a r do_jump()::__c 0000001b r failsafe_short_off_event()::__c 0000001c W AP_VarS >::unserialize(void*, unsigned int) 0000001c W AP_VarS >::unserialize(void*, unsigned int) @@ -306,8 +309,8 @@ 00000023 r verify_loiter_turns()::__c 00000023 r navigate()::__c 00000026 r init_ardupilot()::__c -00000026 r init_ardupilot()::__c 00000027 r change_command(unsigned char)::__c +00000027 r init_ardupilot()::__c 00000028 t demo_servos(unsigned char) 00000028 W AP_VarT::unserialize(void*, unsigned int) 00000028 W AP_VarT::unserialize(void*, unsigned int) @@ -410,6 +413,7 @@ 00000180 t send_extended_status1(mavlink_channel_t, unsigned int) 00000188 T GCS_MAVLINK::data_stream_send(unsigned int, unsigned int) 00000192 T init_home() +0000019c t do_jump() 000001a2 t mavlink_try_send_message(mavlink_channel_t, ap_message, unsigned int) 000001a2 t set_mode(unsigned char) 000001a2 T GCS_MAVLINK::update() @@ -422,10 +426,10 @@ 0000022a t send_gps_raw(mavlink_channel_t) 00000230 t verify_nav_command() 0000024c t update_loiter() +000002d4 t handle_process_do_command() 000002e4 t read_radio() 00000320 t __static_initialization_and_destruction_0(int, int) 0000033a W Parameters::~Parameters() -00000382 t handle_process_do_command() 00000494 t init_ardupilot() 00000920 W Parameters::Parameters() 0000092b b g diff --git a/Tools/ArdupilotMegaPlanner/Firmware/APHIL-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/APHIL-2560.build.log index 5ff5c619b3..f7c809ef2b 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/APHIL-2560.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/APHIL-2560.build.log @@ -15,9 +15,9 @@ autogenerated:36: warning: 'void send_raw_imu3(mavlink_channel_t)' declared 'sta autogenerated:49: warning: 'bool print_log_menu()' declared 'static' but never defined autogenerated:52: warning: 'void get_log_boundaries(byte, int&, int&)' declared 'static' but never defined autogenerated:53: warning: 'int find_last_log_page(int)' declared 'static' but never defined -/root/apm/ardupilot-mega/ArduPlane/Log.pde:746: warning: 'void Log_Write_Attitude(int, int, uint16_t)' defined but not used -/root/apm/ardupilot-mega/ArduPlane/Log.pde:747: warning: 'void Log_Write_Control_Tuning()' defined but not used -/root/apm/ardupilot-mega/ArduPlane/Log.pde:748: warning: 'void Log_Write_Raw()' defined but not used +/root/apm/ardupilot-mega/ArduPlane/Log.pde:749: warning: 'void Log_Write_Attitude(int, int, uint16_t)' defined but not used +/root/apm/ardupilot-mega/ArduPlane/Log.pde:750: warning: 'void Log_Write_Control_Tuning()' defined but not used +/root/apm/ardupilot-mega/ArduPlane/Log.pde:751: warning: 'void Log_Write_Raw()' defined but not used autogenerated:64: warning: 'void Log_Read_Current()' declared 'static' but never defined autogenerated:65: warning: 'void Log_Read_Control_Tuning()' declared 'static' but never defined autogenerated:66: warning: 'void Log_Read_Nav_Tuning()' declared 'static' but never defined @@ -64,7 +64,7 @@ autogenerated:199: warning: 'void test_wp_print(Location*, byte)' declared 'stat /root/apm/ardupilot-mega/ArduPlane/ArduPlane.pde:304: warning: 'airspeed_raw' defined but not used /root/apm/ardupilot-mega/ArduPlane/ArduPlane.pde:305: warning: 'airspeed_pressure' defined but not used /root/apm/ardupilot-mega/ArduPlane/ArduPlane.pde:309: warning: 'abs_pressure' defined but not used -/root/apm/ardupilot-mega/ArduPlane/Log.pde:743: warning: 'int8_t process_logs(uint8_t, const Menu::arg*)' defined but not used +/root/apm/ardupilot-mega/ArduPlane/Log.pde:746: warning: 'int8_t process_logs(uint8_t, const Menu::arg*)' defined but not used /root/apm/ardupilot-mega/ArduPlane/planner.pde:19: warning: 'int8_t planner_mode(uint8_t, const Menu::arg*)' defined but not used %% libraries/APM_BMP085/APM_BMP085.o %% libraries/APM_BMP085/APM_BMP085_hil.o diff --git a/Tools/ArdupilotMegaPlanner/Firmware/APHIL-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/APHIL-2560.size.txt index a554e6096c..8f46e490aa 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/APHIL-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/APHIL-2560.size.txt @@ -279,8 +279,11 @@ 00000019 r handle_process_nav_cmd()::__c 00000019 r handle_process_do_command()::__c 00000019 r handle_process_condition_command()::__c +00000019 r do_jump()::__c 0000001a t startup_IMU_ground() 0000001a r failsafe_short_on_event()::__c +0000001a r do_jump()::__c +0000001a r do_jump()::__c 0000001b r failsafe_short_off_event()::__c 0000001c W AP_VarS >::unserialize(void*, unsigned int) 0000001c W AP_VarS >::unserialize(void*, unsigned int) @@ -306,8 +309,8 @@ 00000023 r verify_loiter_turns()::__c 00000023 r navigate()::__c 00000026 r init_ardupilot()::__c -00000026 r init_ardupilot()::__c 00000027 r change_command(unsigned char)::__c +00000027 r init_ardupilot()::__c 00000028 t demo_servos(unsigned char) 00000028 W AP_VarT::unserialize(void*, unsigned int) 00000028 W AP_VarT::unserialize(void*, unsigned int) @@ -410,6 +413,7 @@ 00000180 t send_extended_status1(mavlink_channel_t, unsigned int) 00000188 T GCS_MAVLINK::data_stream_send(unsigned int, unsigned int) 00000190 T init_home() +0000019a t do_jump() 000001a2 t mavlink_try_send_message(mavlink_channel_t, ap_message, unsigned int) 000001a2 t set_mode(unsigned char) 000001a2 T GCS_MAVLINK::update() @@ -422,10 +426,10 @@ 0000022a t send_gps_raw(mavlink_channel_t) 00000230 t verify_nav_command() 0000024c t update_loiter() +000002d4 t handle_process_do_command() 000002e4 t read_radio() 00000320 t __static_initialization_and_destruction_0(int, int) 0000033a W Parameters::~Parameters() -00000382 t handle_process_do_command() 00000492 t init_ardupilot() 00000920 W Parameters::Parameters() 0000092b b g diff --git a/Tools/ArdupilotMegaPlanner/Firmware/firmware2.xml b/Tools/ArdupilotMegaPlanner/Firmware/firmware2.xml index 47f0610db7..306c2275a4 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/firmware2.xml +++ b/Tools/ArdupilotMegaPlanner/Firmware/firmware2.xml @@ -3,14 +3,14 @@ http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AP-1280.hex http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AP-2560.hex - ArduPlane V2.25 + ArduPlane V2.251 12 http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/APHIL-1280.hex http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/APHIL-2560.hex - ArduPlane V2.25 HIL + ArduPlane V2.251 HIL #define FLIGHT_MODE_CHANNEL 8 #define FLIGHT_MODE_1 AUTO @@ -44,7 +44,7 @@ http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-1280.hex http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-2560.hex - ArduPlane V2.25 APM trunk + ArduPlane V2.251 APM trunk 12 diff --git a/Tools/ArdupilotMegaPlanner/Firmware/git.log b/Tools/ArdupilotMegaPlanner/Firmware/git.log index 2a7bfed917..69fccc6bde 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/git.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/git.log @@ -1 +1,29 @@ -Already up-to-date. +From https://code.google.com/p/ardupilot-mega + 66cc8dd..6f4e7ec master -> origin/master +Updating 66cc8dd..6f4e7ec +Fast-forward + ArduCopter/APM_Config.h | 2 +- + ArduCopter/ArduCopter.pde | 18 ++- + ArduCopter/commands.pde | 8 +- + ArduCopter/commands_process.pde | 3 +- + ArduCopter/motors_hexa.pde | 2 +- + ArduCopter/motors_octa.pde | 2 +- + ArduCopter/motors_octa_quad.pde | 2 +- + ArduCopter/motors_y6.pde | 3 +- + ArduPlane/ArduPlane.pde | 2 +- + ArduPlane/Log.pde | 5 +- + ArduPlane/commands_logic.pde | 13 ++- + Tools/ArdupilotMegaPlanner/CurrentState.cs | 1 - + Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs | 27 +++- + .../ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs | 149 +++++++++++++++++--- + Tools/ArdupilotMegaPlanner/HIL/QuadCopter.cs | 14 ++- + .../Properties/AssemblyInfo.cs | 2 +- + .../bin/Release/ArdupilotMegaPlanner.application | 2 +- + .../bin/Release/ArdupilotMegaPlanner.exe | Bin 2194432 -> 2195456 bytes + Tools/ArdupilotMegaPlanner/bin/Release/Updater.exe | Bin 8192 -> 8192 bytes + Tools/ArdupilotMegaPlanner/bin/Release/resedit.exe | Bin 20480 -> 20480 bytes + .../ru-RU/ArdupilotMegaPlanner.resources.dll | Bin 53248 -> 53248 bytes + .../zh-Hans/ArdupilotMegaPlanner.resources.dll | Bin 380928 -> 380928 bytes + Tools/autotest/arducopter.py | 58 ++++++--- + Tools/autotest/common.py | 16 ++- + 24 files changed, 251 insertions(+), 78 deletions(-)