From c3ddcaaacbb82a6b52f6d4d252e29c67d70f5e9f Mon Sep 17 00:00:00 2001 From: Michael Oborne Date: Mon, 26 Sep 2011 05:19:16 +0800 Subject: [PATCH] firmware build --- .../Firmware/AC2-Hexa-1280.build.log | 1 - .../Firmware/AC2-Hexa-1280.size.txt | 13 +++++++++---- .../Firmware/AC2-Hexa-2560.build.log | 1 - .../Firmware/AC2-Hexa-2560.size.txt | 13 +++++++++---- .../Firmware/AC2-QUADHIL-1280.build.log | 1 - .../Firmware/AC2-QUADHIL-1280.size.txt | 13 +++++++++---- .../Firmware/AC2-QUADHIL-2560.build.log | 1 - .../Firmware/AC2-QUADHIL-2560.size.txt | 13 +++++++++---- .../Firmware/AC2-Quad-1280.build.log | 1 - .../Firmware/AC2-Quad-1280.size.txt | 13 +++++++++---- .../Firmware/AC2-Quad-2560.build.log | 1 - .../Firmware/AC2-Quad-2560.size.txt | 13 +++++++++---- .../Firmware/AC2-Tri-1280.build.log | 1 - .../Firmware/AC2-Tri-1280.size.txt | 15 ++++++++++----- .../Firmware/AC2-Tri-2560.build.log | 1 - .../Firmware/AC2-Tri-2560.size.txt | 15 ++++++++++----- .../Firmware/AC2-Y6-1280.build.log | 1 - .../Firmware/AC2-Y6-1280.size.txt | 13 +++++++++---- .../Firmware/AC2-Y6-2560.build.log | 1 - .../Firmware/AC2-Y6-2560.size.txt | 13 +++++++++---- Tools/ArdupilotMegaPlanner/Firmware/git.log | 10 +++++++++- 21 files changed, 101 insertions(+), 53 deletions(-) diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.build.log index 27cba76bde..51603ba231 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.build.log @@ -63,7 +63,6 @@ autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never de /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:464: warning: 'simple_WP' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:469: warning: 'new_location' defined but not used -/root/apm/ardupilot-mega/ArduCopter/control_modes.pde:48: warning: 'trim_flag' defined but not used %% libraries/APM_BMP085/APM_BMP085.o %% libraries/APM_PI/APM_PI.o %% libraries/APM_RC/APM_RC.o diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt index ab7f9c286b..d940c4580b 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt @@ -5,6 +5,7 @@ 00000001 b motor_light 00000001 b control_mode 00000001 b gps_watchdog +00000001 b simple_timer 00000001 d yaw_tracking 00000001 b land_complete 00000001 b throttle_mode @@ -34,7 +35,9 @@ 00000001 b led_mode 00000001 b yaw_mode 00000001 b GPS_light +00000001 b do_simple 00000001 b loop_step +00000001 b trim_flag 00000001 b dancing_light()::step 00000001 b read_control_switch()::switch_debouncer 00000001 d GCS_MAVLINK::handleMessage(__mavlink_message*)::mav_nav @@ -94,6 +97,8 @@ 00000004 b current_amps 00000004 b old_altitude 00000004 b original_alt +00000004 b simple_cos_x +00000004 b simple_sin_y 00000004 b current_total 00000004 b nav_loopTimer 00000004 d scaleLongDown @@ -483,7 +488,6 @@ 00000056 t readSwitch() 00000056 t dancing_light() 00000057 r help_log(unsigned char, Menu::arg const*)::__c -0000005a t read_control_switch() 0000005c t get_num_logs() 0000005c t setup_esc(unsigned char, Menu::arg const*) 0000005e t update_GPS_light() @@ -498,6 +502,7 @@ 0000006e T output_min() 00000078 t setup_batt_monitor(unsigned char, Menu::arg const*) 0000007a t setup_factory(unsigned char, Menu::arg const*) +0000007a t read_control_switch() 0000007a t report_flight_modes() 0000007c t send_gps_status(mavlink_channel_t) 0000007c t test_baro(unsigned char, Menu::arg const*) @@ -606,13 +611,13 @@ 00000228 t setup_radio(unsigned char, Menu::arg const*) 0000022a t send_gps_raw(mavlink_channel_t) 00000268 t send_raw_imu3(mavlink_channel_t) -000002bc T update_roll_pitch_mode() 000002ea t tuning() 00000354 t calc_nav_rate(int, int, int, int) 00000384 t print_log_menu() 000003a0 t read_battery() +000003ae T update_throttle_mode() 00000410 T update_yaw_mode() -0000042c T update_throttle_mode() +0000046e T update_roll_pitch_mode() 000005ee t init_ardupilot() 000006e6 t update_nav_wp() 000007b0 t __static_initialization_and_destruction_0(int, int) @@ -620,4 +625,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 00001228 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001c2a T loop +00001c6a T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.build.log index 27cba76bde..51603ba231 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.build.log @@ -63,7 +63,6 @@ autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never de /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:464: warning: 'simple_WP' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:469: warning: 'new_location' defined but not used -/root/apm/ardupilot-mega/ArduCopter/control_modes.pde:48: warning: 'trim_flag' defined but not used %% libraries/APM_BMP085/APM_BMP085.o %% libraries/APM_PI/APM_PI.o %% libraries/APM_RC/APM_RC.o diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt index 309c3056f6..c4d00f2ef6 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt @@ -5,6 +5,7 @@ 00000001 b motor_light 00000001 b control_mode 00000001 b gps_watchdog +00000001 b simple_timer 00000001 d yaw_tracking 00000001 b land_complete 00000001 b throttle_mode @@ -34,7 +35,9 @@ 00000001 b led_mode 00000001 b yaw_mode 00000001 b GPS_light +00000001 b do_simple 00000001 b loop_step +00000001 b trim_flag 00000001 b dancing_light()::step 00000001 b read_control_switch()::switch_debouncer 00000001 d GCS_MAVLINK::handleMessage(__mavlink_message*)::mav_nav @@ -94,6 +97,8 @@ 00000004 b current_amps 00000004 b old_altitude 00000004 b original_alt +00000004 b simple_cos_x +00000004 b simple_sin_y 00000004 b current_total 00000004 b nav_loopTimer 00000004 d scaleLongDown @@ -483,7 +488,6 @@ 00000056 t readSwitch() 00000056 t dancing_light() 00000057 r help_log(unsigned char, Menu::arg const*)::__c -0000005a t read_control_switch() 0000005c t get_num_logs() 0000005c t setup_esc(unsigned char, Menu::arg const*) 0000005e t update_GPS_light() @@ -498,6 +502,7 @@ 0000006e T output_min() 00000078 t setup_batt_monitor(unsigned char, Menu::arg const*) 0000007a t setup_factory(unsigned char, Menu::arg const*) +0000007a t read_control_switch() 0000007a t report_flight_modes() 0000007a t test_baro(unsigned char, Menu::arg const*) 0000007c t send_gps_status(mavlink_channel_t) @@ -606,13 +611,13 @@ 00000228 t setup_radio(unsigned char, Menu::arg const*) 0000022a t send_gps_raw(mavlink_channel_t) 00000268 t send_raw_imu3(mavlink_channel_t) -000002bc T update_roll_pitch_mode() 000002ea t tuning() 00000354 t calc_nav_rate(int, int, int, int) 00000382 t print_log_menu() 000003a0 t read_battery() +000003ae T update_throttle_mode() 00000410 T update_yaw_mode() -0000042c T update_throttle_mode() +0000046e T update_roll_pitch_mode() 000005ee t init_ardupilot() 000006e6 t update_nav_wp() 000007b0 t __static_initialization_and_destruction_0(int, int) @@ -620,4 +625,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 00001228 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001c28 T loop +00001c68 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.build.log index 73892dab48..4f632afe15 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.build.log @@ -73,7 +73,6 @@ autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never de /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:464: warning: 'simple_WP' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:469: warning: 'new_location' defined but not used -/root/apm/ardupilot-mega/ArduCopter/control_modes.pde:48: warning: 'trim_flag' defined but not used /root/apm/ardupilot-mega/ArduCopter/test.pde:13: warning: 'int8_t test_adc(uint8_t, const Menu::arg*)' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/test.pde:26: warning: 'int8_t test_baro(uint8_t, const Menu::arg*)' declared 'static' but never defined %% libraries/APM_BMP085/APM_BMP085.o diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt index aa28862fe9..c7af4acd1d 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt @@ -5,6 +5,7 @@ 00000001 b motor_light 00000001 b control_mode 00000001 b gps_watchdog +00000001 b simple_timer 00000001 d yaw_tracking 00000001 b land_complete 00000001 b throttle_mode @@ -34,7 +35,9 @@ 00000001 b led_mode 00000001 b yaw_mode 00000001 b GPS_light +00000001 b do_simple 00000001 b loop_step +00000001 b trim_flag 00000001 b dancing_light()::step 00000001 b read_control_switch()::switch_debouncer 00000001 d GCS_MAVLINK::handleMessage(__mavlink_message*)::mav_nav @@ -93,6 +96,8 @@ 00000004 b current_amps 00000004 b gps_base_alt 00000004 b original_alt +00000004 b simple_cos_x +00000004 b simple_sin_y 00000004 b current_total 00000004 b nav_loopTimer 00000004 d scaleLongDown @@ -478,7 +483,6 @@ 00000056 t dancing_light() 00000057 r help_log(unsigned char, Menu::arg const*)::__c 00000057 B dcm -0000005a t read_control_switch() 0000005c t get_num_logs() 0000005c t setup_esc(unsigned char, Menu::arg const*) 0000005e t update_GPS_light() @@ -494,6 +498,7 @@ 0000006e T output_min() 00000078 t setup_batt_monitor(unsigned char, Menu::arg const*) 0000007a t setup_factory(unsigned char, Menu::arg const*) +0000007a t read_control_switch() 0000007a t report_flight_modes() 0000007c t send_gps_status(mavlink_channel_t) 0000007e t test_rawgps(unsigned char, Menu::arg const*) @@ -591,13 +596,13 @@ 00000220 t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 0000022a t send_gps_raw(mavlink_channel_t) -000002bc T update_roll_pitch_mode() 000002ea t tuning() 00000354 t calc_nav_rate(int, int, int, int) 00000384 t print_log_menu() 000003a0 t read_battery() +000003ae T update_throttle_mode() 00000410 T update_yaw_mode() -0000042c T update_throttle_mode() +0000046e T update_roll_pitch_mode() 00000580 t __static_initialization_and_destruction_0(int, int) 000005d6 t init_ardupilot() 000006e6 t update_nav_wp() @@ -605,4 +610,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 000014f2 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001580 T loop +000015c0 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.build.log index 73892dab48..4f632afe15 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.build.log @@ -73,7 +73,6 @@ autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never de /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:464: warning: 'simple_WP' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:469: warning: 'new_location' defined but not used -/root/apm/ardupilot-mega/ArduCopter/control_modes.pde:48: warning: 'trim_flag' defined but not used /root/apm/ardupilot-mega/ArduCopter/test.pde:13: warning: 'int8_t test_adc(uint8_t, const Menu::arg*)' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/test.pde:26: warning: 'int8_t test_baro(uint8_t, const Menu::arg*)' declared 'static' but never defined %% libraries/APM_BMP085/APM_BMP085.o diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt index caf46c2d97..5802bfb15a 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt @@ -5,6 +5,7 @@ 00000001 b motor_light 00000001 b control_mode 00000001 b gps_watchdog +00000001 b simple_timer 00000001 d yaw_tracking 00000001 b land_complete 00000001 b throttle_mode @@ -34,7 +35,9 @@ 00000001 b led_mode 00000001 b yaw_mode 00000001 b GPS_light +00000001 b do_simple 00000001 b loop_step +00000001 b trim_flag 00000001 b dancing_light()::step 00000001 b read_control_switch()::switch_debouncer 00000001 d GCS_MAVLINK::handleMessage(__mavlink_message*)::mav_nav @@ -93,6 +96,8 @@ 00000004 b current_amps 00000004 b gps_base_alt 00000004 b original_alt +00000004 b simple_cos_x +00000004 b simple_sin_y 00000004 b current_total 00000004 b nav_loopTimer 00000004 d scaleLongDown @@ -478,7 +483,6 @@ 00000056 t dancing_light() 00000057 r help_log(unsigned char, Menu::arg const*)::__c 00000057 B dcm -0000005a t read_control_switch() 0000005c t get_num_logs() 0000005c t setup_esc(unsigned char, Menu::arg const*) 0000005e t update_GPS_light() @@ -494,6 +498,7 @@ 0000006e T output_min() 00000078 t setup_batt_monitor(unsigned char, Menu::arg const*) 0000007a t setup_factory(unsigned char, Menu::arg const*) +0000007a t read_control_switch() 0000007a t report_flight_modes() 0000007c t send_gps_status(mavlink_channel_t) 0000007e t test_rawgps(unsigned char, Menu::arg const*) @@ -591,13 +596,13 @@ 0000021c t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 0000022a t send_gps_raw(mavlink_channel_t) -000002bc T update_roll_pitch_mode() 000002ea t tuning() 00000354 t calc_nav_rate(int, int, int, int) 00000382 t print_log_menu() 000003a0 t read_battery() +000003ae T update_throttle_mode() 00000410 T update_yaw_mode() -0000042c T update_throttle_mode() +0000046e T update_roll_pitch_mode() 00000580 t __static_initialization_and_destruction_0(int, int) 000005d6 t init_ardupilot() 000006e6 t update_nav_wp() @@ -605,4 +610,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 000014f2 T GCS_MAVLINK::handleMessage(__mavlink_message*) -0000157e T loop +000015be T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.build.log index 27cba76bde..51603ba231 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.build.log @@ -63,7 +63,6 @@ autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never de /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:464: warning: 'simple_WP' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:469: warning: 'new_location' defined but not used -/root/apm/ardupilot-mega/ArduCopter/control_modes.pde:48: warning: 'trim_flag' defined but not used %% libraries/APM_BMP085/APM_BMP085.o %% libraries/APM_PI/APM_PI.o %% libraries/APM_RC/APM_RC.o diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt index caae5d1041..4ffeed7005 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt @@ -5,6 +5,7 @@ 00000001 b motor_light 00000001 b control_mode 00000001 b gps_watchdog +00000001 b simple_timer 00000001 d yaw_tracking 00000001 b land_complete 00000001 b throttle_mode @@ -34,7 +35,9 @@ 00000001 b led_mode 00000001 b yaw_mode 00000001 b GPS_light +00000001 b do_simple 00000001 b loop_step +00000001 b trim_flag 00000001 b dancing_light()::step 00000001 b read_control_switch()::switch_debouncer 00000001 d GCS_MAVLINK::handleMessage(__mavlink_message*)::mav_nav @@ -94,6 +97,8 @@ 00000004 b current_amps 00000004 b old_altitude 00000004 b original_alt +00000004 b simple_cos_x +00000004 b simple_sin_y 00000004 b current_total 00000004 b nav_loopTimer 00000004 d scaleLongDown @@ -483,7 +488,6 @@ 00000056 t readSwitch() 00000056 t dancing_light() 00000057 r help_log(unsigned char, Menu::arg const*)::__c -0000005a t read_control_switch() 0000005c t get_num_logs() 0000005c t setup_esc(unsigned char, Menu::arg const*) 0000005e t update_GPS_light() @@ -498,6 +502,7 @@ 0000006e T output_min() 00000078 t setup_batt_monitor(unsigned char, Menu::arg const*) 0000007a t setup_factory(unsigned char, Menu::arg const*) +0000007a t read_control_switch() 0000007a t report_flight_modes() 0000007c t send_gps_status(mavlink_channel_t) 0000007c t test_baro(unsigned char, Menu::arg const*) @@ -606,13 +611,13 @@ 00000228 t setup_radio(unsigned char, Menu::arg const*) 0000022a t send_gps_raw(mavlink_channel_t) 00000268 t send_raw_imu3(mavlink_channel_t) -000002bc T update_roll_pitch_mode() 000002ea t tuning() 00000354 t calc_nav_rate(int, int, int, int) 00000384 t print_log_menu() 000003a0 t read_battery() +000003ae T update_throttle_mode() 00000410 T update_yaw_mode() -0000042c T update_throttle_mode() +0000046e T update_roll_pitch_mode() 000005ee t init_ardupilot() 000006e6 t update_nav_wp() 000007b0 t __static_initialization_and_destruction_0(int, int) @@ -620,4 +625,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 00001228 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001af8 T loop +00001b38 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.build.log index 27cba76bde..51603ba231 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.build.log @@ -63,7 +63,6 @@ autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never de /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:464: warning: 'simple_WP' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:469: warning: 'new_location' defined but not used -/root/apm/ardupilot-mega/ArduCopter/control_modes.pde:48: warning: 'trim_flag' defined but not used %% libraries/APM_BMP085/APM_BMP085.o %% libraries/APM_PI/APM_PI.o %% libraries/APM_RC/APM_RC.o diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt index fa477b8615..29bf5162d3 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt @@ -5,6 +5,7 @@ 00000001 b motor_light 00000001 b control_mode 00000001 b gps_watchdog +00000001 b simple_timer 00000001 d yaw_tracking 00000001 b land_complete 00000001 b throttle_mode @@ -34,7 +35,9 @@ 00000001 b led_mode 00000001 b yaw_mode 00000001 b GPS_light +00000001 b do_simple 00000001 b loop_step +00000001 b trim_flag 00000001 b dancing_light()::step 00000001 b read_control_switch()::switch_debouncer 00000001 d GCS_MAVLINK::handleMessage(__mavlink_message*)::mav_nav @@ -94,6 +97,8 @@ 00000004 b current_amps 00000004 b old_altitude 00000004 b original_alt +00000004 b simple_cos_x +00000004 b simple_sin_y 00000004 b current_total 00000004 b nav_loopTimer 00000004 d scaleLongDown @@ -483,7 +488,6 @@ 00000056 t readSwitch() 00000056 t dancing_light() 00000057 r help_log(unsigned char, Menu::arg const*)::__c -0000005a t read_control_switch() 0000005c t get_num_logs() 0000005c t setup_esc(unsigned char, Menu::arg const*) 0000005e t update_GPS_light() @@ -498,6 +502,7 @@ 0000006e T output_min() 00000078 t setup_batt_monitor(unsigned char, Menu::arg const*) 0000007a t setup_factory(unsigned char, Menu::arg const*) +0000007a t read_control_switch() 0000007a t report_flight_modes() 0000007a t test_baro(unsigned char, Menu::arg const*) 0000007c t send_gps_status(mavlink_channel_t) @@ -606,13 +611,13 @@ 00000228 t setup_radio(unsigned char, Menu::arg const*) 0000022a t send_gps_raw(mavlink_channel_t) 00000268 t send_raw_imu3(mavlink_channel_t) -000002bc T update_roll_pitch_mode() 000002ea t tuning() 00000354 t calc_nav_rate(int, int, int, int) 00000382 t print_log_menu() 000003a0 t read_battery() +000003ae T update_throttle_mode() 00000410 T update_yaw_mode() -0000042c T update_throttle_mode() +0000046e T update_roll_pitch_mode() 000005ee t init_ardupilot() 000006e6 t update_nav_wp() 000007b0 t __static_initialization_and_destruction_0(int, int) @@ -620,4 +625,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 00001228 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001af6 T loop +00001b36 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.build.log index 27cba76bde..51603ba231 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.build.log @@ -63,7 +63,6 @@ autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never de /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:464: warning: 'simple_WP' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:469: warning: 'new_location' defined but not used -/root/apm/ardupilot-mega/ArduCopter/control_modes.pde:48: warning: 'trim_flag' defined but not used %% libraries/APM_BMP085/APM_BMP085.o %% libraries/APM_PI/APM_PI.o %% libraries/APM_RC/APM_RC.o diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt index aee327d54b..84195093a9 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt @@ -5,6 +5,7 @@ 00000001 b motor_light 00000001 b control_mode 00000001 b gps_watchdog +00000001 b simple_timer 00000001 d yaw_tracking 00000001 b land_complete 00000001 b throttle_mode @@ -34,7 +35,9 @@ 00000001 b led_mode 00000001 b yaw_mode 00000001 b GPS_light +00000001 b do_simple 00000001 b loop_step +00000001 b trim_flag 00000001 b dancing_light()::step 00000001 b read_control_switch()::switch_debouncer 00000001 d GCS_MAVLINK::handleMessage(__mavlink_message*)::mav_nav @@ -94,6 +97,8 @@ 00000004 b current_amps 00000004 b old_altitude 00000004 b original_alt +00000004 b simple_cos_x +00000004 b simple_sin_y 00000004 b current_total 00000004 b nav_loopTimer 00000004 d scaleLongDown @@ -483,7 +488,6 @@ 00000056 t readSwitch() 00000056 t dancing_light() 00000057 r help_log(unsigned char, Menu::arg const*)::__c -0000005a t read_control_switch() 0000005c t get_num_logs() 0000005c t setup_esc(unsigned char, Menu::arg const*) 0000005e t update_GPS_light() @@ -498,6 +502,7 @@ 0000006e T output_min() 00000078 t setup_batt_monitor(unsigned char, Menu::arg const*) 0000007a t setup_factory(unsigned char, Menu::arg const*) +0000007a t read_control_switch() 0000007a t report_flight_modes() 0000007c t send_gps_status(mavlink_channel_t) 0000007c t test_baro(unsigned char, Menu::arg const*) @@ -569,7 +574,7 @@ 0000010c t test_current(unsigned char, Menu::arg const*) 0000010c W RC_Channel::RC_Channel(unsigned int, prog_char_t const*) 0000010e t send_servo_out(mavlink_channel_t) -0000010e t send_extended_status1(mavlink_channel_t, unsigned int) +00000112 t send_extended_status1(mavlink_channel_t, unsigned int) 00000112 T GCS_MAVLINK::GCS_MAVLINK(unsigned int) 00000112 T GCS_MAVLINK::GCS_MAVLINK(unsigned int) 00000118 t set_command_with_index(Location, int) @@ -606,13 +611,13 @@ 00000228 t setup_radio(unsigned char, Menu::arg const*) 0000022a t send_gps_raw(mavlink_channel_t) 00000268 t send_raw_imu3(mavlink_channel_t) -000002bc T update_roll_pitch_mode() 000002ea t tuning() 00000354 t calc_nav_rate(int, int, int, int) 00000384 t print_log_menu() 000003a0 t read_battery() +000003ae T update_throttle_mode() 00000410 T update_yaw_mode() -0000042c T update_throttle_mode() +0000046e T update_roll_pitch_mode() 000005ee t init_ardupilot() 000006e6 t update_nav_wp() 000007b0 t __static_initialization_and_destruction_0(int, int) @@ -620,4 +625,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 00001228 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001a58 T loop +00001a98 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.build.log index 27cba76bde..51603ba231 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.build.log @@ -63,7 +63,6 @@ autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never de /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:464: warning: 'simple_WP' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:469: warning: 'new_location' defined but not used -/root/apm/ardupilot-mega/ArduCopter/control_modes.pde:48: warning: 'trim_flag' defined but not used %% libraries/APM_BMP085/APM_BMP085.o %% libraries/APM_PI/APM_PI.o %% libraries/APM_RC/APM_RC.o diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt index b7845231e1..1e861b9add 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt @@ -5,6 +5,7 @@ 00000001 b motor_light 00000001 b control_mode 00000001 b gps_watchdog +00000001 b simple_timer 00000001 d yaw_tracking 00000001 b land_complete 00000001 b throttle_mode @@ -34,7 +35,9 @@ 00000001 b led_mode 00000001 b yaw_mode 00000001 b GPS_light +00000001 b do_simple 00000001 b loop_step +00000001 b trim_flag 00000001 b dancing_light()::step 00000001 b read_control_switch()::switch_debouncer 00000001 d GCS_MAVLINK::handleMessage(__mavlink_message*)::mav_nav @@ -94,6 +97,8 @@ 00000004 b current_amps 00000004 b old_altitude 00000004 b original_alt +00000004 b simple_cos_x +00000004 b simple_sin_y 00000004 b current_total 00000004 b nav_loopTimer 00000004 d scaleLongDown @@ -483,7 +488,6 @@ 00000056 t readSwitch() 00000056 t dancing_light() 00000057 r help_log(unsigned char, Menu::arg const*)::__c -0000005a t read_control_switch() 0000005c t get_num_logs() 0000005c t setup_esc(unsigned char, Menu::arg const*) 0000005e t update_GPS_light() @@ -498,6 +502,7 @@ 0000006e T output_min() 00000078 t setup_batt_monitor(unsigned char, Menu::arg const*) 0000007a t setup_factory(unsigned char, Menu::arg const*) +0000007a t read_control_switch() 0000007a t report_flight_modes() 0000007a t test_baro(unsigned char, Menu::arg const*) 0000007c t send_gps_status(mavlink_channel_t) @@ -569,7 +574,7 @@ 0000010c t test_current(unsigned char, Menu::arg const*) 0000010c W RC_Channel::RC_Channel(unsigned int, prog_char_t const*) 0000010e t send_servo_out(mavlink_channel_t) -0000010e t send_extended_status1(mavlink_channel_t, unsigned int) +00000112 t send_extended_status1(mavlink_channel_t, unsigned int) 00000112 T GCS_MAVLINK::GCS_MAVLINK(unsigned int) 00000112 T GCS_MAVLINK::GCS_MAVLINK(unsigned int) 00000118 t set_command_with_index(Location, int) @@ -606,13 +611,13 @@ 00000228 t setup_radio(unsigned char, Menu::arg const*) 0000022a t send_gps_raw(mavlink_channel_t) 00000268 t send_raw_imu3(mavlink_channel_t) -000002bc T update_roll_pitch_mode() 000002ea t tuning() 00000354 t calc_nav_rate(int, int, int, int) 00000382 t print_log_menu() 000003a0 t read_battery() +000003ae T update_throttle_mode() 00000410 T update_yaw_mode() -0000042c T update_throttle_mode() +0000046e T update_roll_pitch_mode() 000005ee t init_ardupilot() 000006e6 t update_nav_wp() 000007b0 t __static_initialization_and_destruction_0(int, int) @@ -620,4 +625,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 00001228 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001a56 T loop +00001a96 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.build.log index 27cba76bde..51603ba231 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.build.log @@ -63,7 +63,6 @@ autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never de /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:464: warning: 'simple_WP' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:469: warning: 'new_location' defined but not used -/root/apm/ardupilot-mega/ArduCopter/control_modes.pde:48: warning: 'trim_flag' defined but not used %% libraries/APM_BMP085/APM_BMP085.o %% libraries/APM_PI/APM_PI.o %% libraries/APM_RC/APM_RC.o diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt index b79ba6c82d..b58eb6e773 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt @@ -5,6 +5,7 @@ 00000001 b motor_light 00000001 b control_mode 00000001 b gps_watchdog +00000001 b simple_timer 00000001 d yaw_tracking 00000001 b land_complete 00000001 b throttle_mode @@ -34,7 +35,9 @@ 00000001 b led_mode 00000001 b yaw_mode 00000001 b GPS_light +00000001 b do_simple 00000001 b loop_step +00000001 b trim_flag 00000001 b dancing_light()::step 00000001 b read_control_switch()::switch_debouncer 00000001 d GCS_MAVLINK::handleMessage(__mavlink_message*)::mav_nav @@ -94,6 +97,8 @@ 00000004 b current_amps 00000004 b old_altitude 00000004 b original_alt +00000004 b simple_cos_x +00000004 b simple_sin_y 00000004 b current_total 00000004 b nav_loopTimer 00000004 d scaleLongDown @@ -483,7 +488,6 @@ 00000056 t readSwitch() 00000056 t dancing_light() 00000057 r help_log(unsigned char, Menu::arg const*)::__c -0000005a t read_control_switch() 0000005c t get_num_logs() 0000005c t setup_esc(unsigned char, Menu::arg const*) 0000005e t update_GPS_light() @@ -498,6 +502,7 @@ 0000006e T output_min() 00000078 t setup_batt_monitor(unsigned char, Menu::arg const*) 0000007a t setup_factory(unsigned char, Menu::arg const*) +0000007a t read_control_switch() 0000007a t report_flight_modes() 0000007c t send_gps_status(mavlink_channel_t) 0000007c t test_baro(unsigned char, Menu::arg const*) @@ -606,13 +611,13 @@ 00000228 t setup_radio(unsigned char, Menu::arg const*) 0000022a t send_gps_raw(mavlink_channel_t) 00000268 t send_raw_imu3(mavlink_channel_t) -000002bc T update_roll_pitch_mode() 000002ea t tuning() 00000354 t calc_nav_rate(int, int, int, int) 00000384 t print_log_menu() 000003a0 t read_battery() +000003ae T update_throttle_mode() 00000410 T update_yaw_mode() -0000042c T update_throttle_mode() +0000046e T update_roll_pitch_mode() 000005ee t init_ardupilot() 000006e6 t update_nav_wp() 000007b0 t __static_initialization_and_destruction_0(int, int) @@ -620,4 +625,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 00001228 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001b38 T loop +00001b78 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.build.log index 27cba76bde..51603ba231 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.build.log @@ -63,7 +63,6 @@ autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never de /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:464: warning: 'simple_WP' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:469: warning: 'new_location' defined but not used -/root/apm/ardupilot-mega/ArduCopter/control_modes.pde:48: warning: 'trim_flag' defined but not used %% libraries/APM_BMP085/APM_BMP085.o %% libraries/APM_PI/APM_PI.o %% libraries/APM_RC/APM_RC.o diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt index ec2a967aaa..b7fb2ec9e6 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt @@ -5,6 +5,7 @@ 00000001 b motor_light 00000001 b control_mode 00000001 b gps_watchdog +00000001 b simple_timer 00000001 d yaw_tracking 00000001 b land_complete 00000001 b throttle_mode @@ -34,7 +35,9 @@ 00000001 b led_mode 00000001 b yaw_mode 00000001 b GPS_light +00000001 b do_simple 00000001 b loop_step +00000001 b trim_flag 00000001 b dancing_light()::step 00000001 b read_control_switch()::switch_debouncer 00000001 d GCS_MAVLINK::handleMessage(__mavlink_message*)::mav_nav @@ -94,6 +97,8 @@ 00000004 b current_amps 00000004 b old_altitude 00000004 b original_alt +00000004 b simple_cos_x +00000004 b simple_sin_y 00000004 b current_total 00000004 b nav_loopTimer 00000004 d scaleLongDown @@ -483,7 +488,6 @@ 00000056 t readSwitch() 00000056 t dancing_light() 00000057 r help_log(unsigned char, Menu::arg const*)::__c -0000005a t read_control_switch() 0000005c t get_num_logs() 0000005c t setup_esc(unsigned char, Menu::arg const*) 0000005e t update_GPS_light() @@ -498,6 +502,7 @@ 0000006e T output_min() 00000078 t setup_batt_monitor(unsigned char, Menu::arg const*) 0000007a t setup_factory(unsigned char, Menu::arg const*) +0000007a t read_control_switch() 0000007a t report_flight_modes() 0000007a t test_baro(unsigned char, Menu::arg const*) 0000007c t send_gps_status(mavlink_channel_t) @@ -606,13 +611,13 @@ 00000228 t setup_radio(unsigned char, Menu::arg const*) 0000022a t send_gps_raw(mavlink_channel_t) 00000268 t send_raw_imu3(mavlink_channel_t) -000002bc T update_roll_pitch_mode() 000002ea t tuning() 00000354 t calc_nav_rate(int, int, int, int) 00000382 t print_log_menu() 000003a0 t read_battery() +000003ae T update_throttle_mode() 00000410 T update_yaw_mode() -0000042c T update_throttle_mode() +0000046e T update_roll_pitch_mode() 000005ee t init_ardupilot() 000006e6 t update_nav_wp() 000007b0 t __static_initialization_and_destruction_0(int, int) @@ -620,4 +625,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 00001228 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001b36 T loop +00001b76 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/git.log b/Tools/ArdupilotMegaPlanner/Firmware/git.log index 2a7bfed917..eadadd9370 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/git.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/git.log @@ -1 +1,9 @@ -Already up-to-date. +From https://code.google.com/p/ardupilot-mega + e7d6202..4743949 master -> origin/master +Updating e7d6202..4743949 +Fast-forward + ArduCopter/ArduCopter.pde | 2 -- + ArduCopter/Attitude.pde | 14 +------------- + ArduCopter/config.h | 2 +- + ArduCopter/control_modes.pde | 2 +- + 4 files changed, 3 insertions(+), 17 deletions(-)