From e0b87ca23897bb04536079402cf837ed272bad83 Mon Sep 17 00:00:00 2001 From: Michael Oborne Date: Mon, 26 Sep 2011 03:40:28 +0800 Subject: [PATCH] firmware build --- .../Firmware/AC2-Hexa-1280.build.log | 6 +-- .../Firmware/AC2-Hexa-1280.size.txt | 7 ++- .../Firmware/AC2-Hexa-2560.build.log | 6 +-- .../Firmware/AC2-Hexa-2560.size.txt | 7 ++- .../Firmware/AC2-QUADHIL-1280.build.log | 8 ++-- .../Firmware/AC2-QUADHIL-1280.size.txt | 7 ++- .../Firmware/AC2-QUADHIL-2560.build.log | 8 ++-- .../Firmware/AC2-QUADHIL-2560.size.txt | 7 ++- .../Firmware/AC2-Quad-1280.build.log | 6 +-- .../Firmware/AC2-Quad-1280.size.txt | 7 ++- .../Firmware/AC2-Quad-2560.build.log | 6 +-- .../Firmware/AC2-Quad-2560.size.txt | 7 ++- .../Firmware/AC2-Tri-1280.build.log | 6 +-- .../Firmware/AC2-Tri-1280.size.txt | 7 ++- .../Firmware/AC2-Tri-2560.build.log | 6 +-- .../Firmware/AC2-Tri-2560.size.txt | 7 ++- .../Firmware/AC2-Y6-1280.build.log | 6 +-- .../Firmware/AC2-Y6-1280.size.txt | 7 ++- .../Firmware/AC2-Y6-2560.build.log | 6 +-- .../Firmware/AC2-Y6-2560.size.txt | 7 ++- .../Firmware/firmware2.xml | 10 ++--- Tools/ArdupilotMegaPlanner/Firmware/git.log | 45 ++++++++++++++----- 22 files changed, 100 insertions(+), 89 deletions(-) diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.build.log index 1770ec7e63..27cba76bde 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.build.log @@ -5,7 +5,7 @@ In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:55: /usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:76: /root/apm/ardupilot-mega/ArduCopter/Parameters.h: In constructor 'Parameters::Parameters()': -/root/apm/ardupilot-mega/ArduCopter/Parameters.h:386: warning: overflow in implicit constant conversion +/root/apm/ardupilot-mega/ArduCopter/Parameters.h:387: warning: overflow in implicit constant conversion /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'void do_loiter_turns()': /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: statement has no effect /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'bool verify_nav_wp()': @@ -56,8 +56,8 @@ autogenerated:289: warning: 'void report_gyro()' declared 'static' but never def autogenerated:296: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined autogenerated:297: warning: 'int read_num_from_serial()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/system.pde:448: warning: 'void set_failsafe(boolean)' defined but not used -autogenerated:312: warning: 'void init_optflow()' declared 'static' but never defined -autogenerated:320: warning: 'void fake_out_gps()' declared 'static' but never defined +autogenerated:311: warning: 'void init_optflow()' declared 'static' but never defined +autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/test.pde:1028: warning: 'void print_motor_out()' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:444: warning: 'undo_event' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt index 13cc366771..ab7f9c286b 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt @@ -59,7 +59,6 @@ 00000002 b superslow_loopCounter 00000002 r comma 00000002 b g_gps -00000002 b G_Dt_max 00000002 b airspeed 00000002 b baro_alt 00000002 b sonar_alt @@ -403,6 +402,7 @@ 00000021 r print_log_menu()::__c 00000021 r report_compass()::__c 00000021 r Log_Read_Current()::__c +00000021 r Log_Read_Performance()::__c 00000022 t clear_leds() 00000022 t print_blanks(int) 00000022 t reset_hold_I() @@ -419,7 +419,6 @@ 00000024 r init_ardupilot()::__c 00000024 r print_accel_offsets()::__c 00000025 r setup_factory(unsigned char, Menu::arg const*)::__c -00000025 r Log_Read_Performance()::__c 00000026 t print_done() 00000026 b mavlink_queue 00000026 t print_hit_enter() @@ -544,6 +543,7 @@ 000000c4 r setup_esc(unsigned char, Menu::arg const*)::__c 000000c6 t test_eedump(unsigned char, Menu::arg const*) 000000c6 t send_radio_in(mavlink_channel_t) +000000c6 t Log_Read_Performance() 000000c6 t test_tri(unsigned char, Menu::arg const*) 000000c7 B dcm 000000ca t init_barometer() @@ -553,7 +553,6 @@ 000000d4 t Log_Read(int, int) 000000d8 t test_radio(unsigned char, Menu::arg const*) 000000d8 t read_barometer() -000000da t Log_Read_Performance() 000000de t test_adc(unsigned char, Menu::arg const*) 000000e0 r setup_menu_commands 000000e4 t test_radio_pwm(unsigned char, Menu::arg const*) @@ -621,4 +620,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 00001228 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001c42 T loop +00001c2a T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.build.log index 1770ec7e63..27cba76bde 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.build.log @@ -5,7 +5,7 @@ In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:55: /usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:76: /root/apm/ardupilot-mega/ArduCopter/Parameters.h: In constructor 'Parameters::Parameters()': -/root/apm/ardupilot-mega/ArduCopter/Parameters.h:386: warning: overflow in implicit constant conversion +/root/apm/ardupilot-mega/ArduCopter/Parameters.h:387: warning: overflow in implicit constant conversion /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'void do_loiter_turns()': /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: statement has no effect /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'bool verify_nav_wp()': @@ -56,8 +56,8 @@ autogenerated:289: warning: 'void report_gyro()' declared 'static' but never def autogenerated:296: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined autogenerated:297: warning: 'int read_num_from_serial()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/system.pde:448: warning: 'void set_failsafe(boolean)' defined but not used -autogenerated:312: warning: 'void init_optflow()' declared 'static' but never defined -autogenerated:320: warning: 'void fake_out_gps()' declared 'static' but never defined +autogenerated:311: warning: 'void init_optflow()' declared 'static' but never defined +autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/test.pde:1028: warning: 'void print_motor_out()' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:444: warning: 'undo_event' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt index c7c39b1118..309c3056f6 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt @@ -59,7 +59,6 @@ 00000002 b superslow_loopCounter 00000002 r comma 00000002 b g_gps -00000002 b G_Dt_max 00000002 b airspeed 00000002 b baro_alt 00000002 b sonar_alt @@ -403,6 +402,7 @@ 00000021 r print_log_menu()::__c 00000021 r report_compass()::__c 00000021 r Log_Read_Current()::__c +00000021 r Log_Read_Performance()::__c 00000022 t clear_leds() 00000022 t print_blanks(int) 00000022 t reset_hold_I() @@ -419,7 +419,6 @@ 00000024 r init_ardupilot()::__c 00000024 r print_accel_offsets()::__c 00000025 r setup_factory(unsigned char, Menu::arg const*)::__c -00000025 r Log_Read_Performance()::__c 00000026 t print_done() 00000026 b mavlink_queue 00000026 t print_hit_enter() @@ -544,6 +543,7 @@ 000000c4 t update_events() 000000c4 r setup_esc(unsigned char, Menu::arg const*)::__c 000000c6 t send_radio_in(mavlink_channel_t) +000000c6 t Log_Read_Performance() 000000c6 t test_tri(unsigned char, Menu::arg const*) 000000c7 B dcm 000000ca t init_barometer() @@ -553,7 +553,6 @@ 000000d4 t Log_Read(int, int) 000000d8 t test_radio(unsigned char, Menu::arg const*) 000000d8 t read_barometer() -000000da t Log_Read_Performance() 000000dc t test_adc(unsigned char, Menu::arg const*) 000000e0 r setup_menu_commands 000000e4 t test_radio_pwm(unsigned char, Menu::arg const*) @@ -621,4 +620,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 00001228 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001c40 T loop +00001c28 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.build.log index 80169f5759..73892dab48 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.build.log @@ -5,7 +5,7 @@ In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:55: /usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:76: /root/apm/ardupilot-mega/ArduCopter/Parameters.h: In constructor 'Parameters::Parameters()': -/root/apm/ardupilot-mega/ArduCopter/Parameters.h:386: warning: overflow in implicit constant conversion +/root/apm/ardupilot-mega/ArduCopter/Parameters.h:387: warning: overflow in implicit constant conversion /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'void do_loiter_turns()': /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: statement has no effect /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'bool verify_nav_wp()': @@ -30,7 +30,7 @@ autogenerated:67: warning: 'long int convert_to_dec(float)' declared 'static' bu autogenerated:132: warning: 'void Log_Write_Raw()' declared 'static' but never defined autogenerated:136: warning: 'void Log_Write_Optflow()' declared 'static' but never defined autogenerated:138: warning: 'void Log_Write_Control_Tuning()' declared 'static' but never defined -/root/apm/ardupilot-mega/ArduCopter/Log.pde:741: warning: 'void Log_Write_Attitude()' defined but not used +/root/apm/ardupilot-mega/ArduCopter/Log.pde:738: warning: 'void Log_Write_Attitude()' defined but not used autogenerated:146: warning: 'void decrement_WP_index()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/commands.pde:132: warning: 'Location get_LOITER_home_wp()' defined but not used /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:431: warning: 'bool verify_loiter_unlim()' defined but not used @@ -61,8 +61,8 @@ autogenerated:289: warning: 'void report_gyro()' declared 'static' but never def autogenerated:296: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined autogenerated:297: warning: 'int read_num_from_serial()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/system.pde:448: warning: 'void set_failsafe(boolean)' defined but not used -autogenerated:312: warning: 'void init_optflow()' declared 'static' but never defined -autogenerated:320: warning: 'void fake_out_gps()' declared 'static' but never defined +autogenerated:311: warning: 'void init_optflow()' declared 'static' but never defined +autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/test.pde:1028: warning: 'void print_motor_out()' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:352: warning: 'old_altitude' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:370: warning: 'abs_pressure' defined but not used diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt index f28ecbbf68..aa28862fe9 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt @@ -58,7 +58,6 @@ 00000002 b superslow_loopCounter 00000002 r comma 00000002 b g_gps -00000002 b G_Dt_max 00000002 b airspeed 00000002 b sonar_alt 00000002 W AP_IMU_Shim::init_accel(void (*)(unsigned long)) @@ -399,6 +398,7 @@ 00000021 r print_log_menu()::__c 00000021 r report_compass()::__c 00000021 r Log_Read_Current()::__c +00000021 r Log_Read_Performance()::__c 00000022 t clear_leds() 00000022 t print_blanks(int) 00000022 t reset_hold_I() @@ -413,7 +413,6 @@ 00000024 r init_ardupilot()::__c 00000024 r print_accel_offsets()::__c 00000025 r setup_factory(unsigned char, Menu::arg const*)::__c -00000025 r Log_Read_Performance()::__c 00000026 t print_done() 00000026 b mavlink_queue 00000026 t print_hit_enter() @@ -536,13 +535,13 @@ 000000c4 r setup_esc(unsigned char, Menu::arg const*)::__c 000000c6 t test_eedump(unsigned char, Menu::arg const*) 000000c6 t send_radio_in(mavlink_channel_t) +000000c6 t Log_Read_Performance() 000000c6 t test_tri(unsigned char, Menu::arg const*) 000000d0 t read_radio() 000000d0 t get_bearing(Location*, Location*) 000000d2 t print_switch(unsigned char, unsigned char, bool) 000000d4 t Log_Read(int, int) 000000d8 t test_radio(unsigned char, Menu::arg const*) -000000da t Log_Read_Performance() 000000e0 r setup_menu_commands 000000e4 t test_radio_pwm(unsigned char, Menu::arg const*) 000000e4 t Log_Read_Optflow() @@ -606,4 +605,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 000014f2 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001598 T loop +00001580 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.build.log index 80169f5759..73892dab48 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.build.log @@ -5,7 +5,7 @@ In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:55: /usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:76: /root/apm/ardupilot-mega/ArduCopter/Parameters.h: In constructor 'Parameters::Parameters()': -/root/apm/ardupilot-mega/ArduCopter/Parameters.h:386: warning: overflow in implicit constant conversion +/root/apm/ardupilot-mega/ArduCopter/Parameters.h:387: warning: overflow in implicit constant conversion /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'void do_loiter_turns()': /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: statement has no effect /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'bool verify_nav_wp()': @@ -30,7 +30,7 @@ autogenerated:67: warning: 'long int convert_to_dec(float)' declared 'static' bu autogenerated:132: warning: 'void Log_Write_Raw()' declared 'static' but never defined autogenerated:136: warning: 'void Log_Write_Optflow()' declared 'static' but never defined autogenerated:138: warning: 'void Log_Write_Control_Tuning()' declared 'static' but never defined -/root/apm/ardupilot-mega/ArduCopter/Log.pde:741: warning: 'void Log_Write_Attitude()' defined but not used +/root/apm/ardupilot-mega/ArduCopter/Log.pde:738: warning: 'void Log_Write_Attitude()' defined but not used autogenerated:146: warning: 'void decrement_WP_index()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/commands.pde:132: warning: 'Location get_LOITER_home_wp()' defined but not used /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:431: warning: 'bool verify_loiter_unlim()' defined but not used @@ -61,8 +61,8 @@ autogenerated:289: warning: 'void report_gyro()' declared 'static' but never def autogenerated:296: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined autogenerated:297: warning: 'int read_num_from_serial()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/system.pde:448: warning: 'void set_failsafe(boolean)' defined but not used -autogenerated:312: warning: 'void init_optflow()' declared 'static' but never defined -autogenerated:320: warning: 'void fake_out_gps()' declared 'static' but never defined +autogenerated:311: warning: 'void init_optflow()' declared 'static' but never defined +autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/test.pde:1028: warning: 'void print_motor_out()' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:352: warning: 'old_altitude' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:370: warning: 'abs_pressure' defined but not used diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt index fb2b6e4c05..caf46c2d97 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt @@ -58,7 +58,6 @@ 00000002 b superslow_loopCounter 00000002 r comma 00000002 b g_gps -00000002 b G_Dt_max 00000002 b airspeed 00000002 b sonar_alt 00000002 W AP_IMU_Shim::init_accel(void (*)(unsigned long)) @@ -399,6 +398,7 @@ 00000021 r print_log_menu()::__c 00000021 r report_compass()::__c 00000021 r Log_Read_Current()::__c +00000021 r Log_Read_Performance()::__c 00000022 t clear_leds() 00000022 t print_blanks(int) 00000022 t reset_hold_I() @@ -413,7 +413,6 @@ 00000024 r init_ardupilot()::__c 00000024 r print_accel_offsets()::__c 00000025 r setup_factory(unsigned char, Menu::arg const*)::__c -00000025 r Log_Read_Performance()::__c 00000026 t print_done() 00000026 b mavlink_queue 00000026 t print_hit_enter() @@ -536,13 +535,13 @@ 000000c4 t update_events() 000000c4 r setup_esc(unsigned char, Menu::arg const*)::__c 000000c6 t send_radio_in(mavlink_channel_t) +000000c6 t Log_Read_Performance() 000000c6 t test_tri(unsigned char, Menu::arg const*) 000000d0 t read_radio() 000000d0 t get_bearing(Location*, Location*) 000000d0 t print_switch(unsigned char, unsigned char, bool) 000000d4 t Log_Read(int, int) 000000d8 t test_radio(unsigned char, Menu::arg const*) -000000da t Log_Read_Performance() 000000e0 r setup_menu_commands 000000e4 t test_radio_pwm(unsigned char, Menu::arg const*) 000000e4 t Log_Read_Optflow() @@ -606,4 +605,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 000014f2 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001596 T loop +0000157e T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.build.log index 1770ec7e63..27cba76bde 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.build.log @@ -5,7 +5,7 @@ In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:55: /usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:76: /root/apm/ardupilot-mega/ArduCopter/Parameters.h: In constructor 'Parameters::Parameters()': -/root/apm/ardupilot-mega/ArduCopter/Parameters.h:386: warning: overflow in implicit constant conversion +/root/apm/ardupilot-mega/ArduCopter/Parameters.h:387: warning: overflow in implicit constant conversion /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'void do_loiter_turns()': /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: statement has no effect /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'bool verify_nav_wp()': @@ -56,8 +56,8 @@ autogenerated:289: warning: 'void report_gyro()' declared 'static' but never def autogenerated:296: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined autogenerated:297: warning: 'int read_num_from_serial()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/system.pde:448: warning: 'void set_failsafe(boolean)' defined but not used -autogenerated:312: warning: 'void init_optflow()' declared 'static' but never defined -autogenerated:320: warning: 'void fake_out_gps()' declared 'static' but never defined +autogenerated:311: warning: 'void init_optflow()' declared 'static' but never defined +autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/test.pde:1028: warning: 'void print_motor_out()' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:444: warning: 'undo_event' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt index 5a9429f61f..caae5d1041 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt @@ -59,7 +59,6 @@ 00000002 b superslow_loopCounter 00000002 r comma 00000002 b g_gps -00000002 b G_Dt_max 00000002 b airspeed 00000002 b baro_alt 00000002 b sonar_alt @@ -403,6 +402,7 @@ 00000021 r print_log_menu()::__c 00000021 r report_compass()::__c 00000021 r Log_Read_Current()::__c +00000021 r Log_Read_Performance()::__c 00000022 t clear_leds() 00000022 t print_blanks(int) 00000022 t reset_hold_I() @@ -419,7 +419,6 @@ 00000024 r init_ardupilot()::__c 00000024 r print_accel_offsets()::__c 00000025 r setup_factory(unsigned char, Menu::arg const*)::__c -00000025 r Log_Read_Performance()::__c 00000026 t print_done() 00000026 b mavlink_queue 00000026 t print_hit_enter() @@ -544,6 +543,7 @@ 000000c4 r setup_esc(unsigned char, Menu::arg const*)::__c 000000c6 t test_eedump(unsigned char, Menu::arg const*) 000000c6 t send_radio_in(mavlink_channel_t) +000000c6 t Log_Read_Performance() 000000c6 t test_tri(unsigned char, Menu::arg const*) 000000c7 B dcm 000000ca t init_barometer() @@ -553,7 +553,6 @@ 000000d4 t Log_Read(int, int) 000000d8 t test_radio(unsigned char, Menu::arg const*) 000000d8 t read_barometer() -000000da t Log_Read_Performance() 000000de t test_adc(unsigned char, Menu::arg const*) 000000e0 r setup_menu_commands 000000e4 t test_radio_pwm(unsigned char, Menu::arg const*) @@ -621,4 +620,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 00001228 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001b10 T loop +00001af8 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.build.log index 1770ec7e63..27cba76bde 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.build.log @@ -5,7 +5,7 @@ In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:55: /usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:76: /root/apm/ardupilot-mega/ArduCopter/Parameters.h: In constructor 'Parameters::Parameters()': -/root/apm/ardupilot-mega/ArduCopter/Parameters.h:386: warning: overflow in implicit constant conversion +/root/apm/ardupilot-mega/ArduCopter/Parameters.h:387: warning: overflow in implicit constant conversion /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'void do_loiter_turns()': /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: statement has no effect /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'bool verify_nav_wp()': @@ -56,8 +56,8 @@ autogenerated:289: warning: 'void report_gyro()' declared 'static' but never def autogenerated:296: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined autogenerated:297: warning: 'int read_num_from_serial()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/system.pde:448: warning: 'void set_failsafe(boolean)' defined but not used -autogenerated:312: warning: 'void init_optflow()' declared 'static' but never defined -autogenerated:320: warning: 'void fake_out_gps()' declared 'static' but never defined +autogenerated:311: warning: 'void init_optflow()' declared 'static' but never defined +autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/test.pde:1028: warning: 'void print_motor_out()' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:444: warning: 'undo_event' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt index 7edd725dd7..fa477b8615 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt @@ -59,7 +59,6 @@ 00000002 b superslow_loopCounter 00000002 r comma 00000002 b g_gps -00000002 b G_Dt_max 00000002 b airspeed 00000002 b baro_alt 00000002 b sonar_alt @@ -403,6 +402,7 @@ 00000021 r print_log_menu()::__c 00000021 r report_compass()::__c 00000021 r Log_Read_Current()::__c +00000021 r Log_Read_Performance()::__c 00000022 t clear_leds() 00000022 t print_blanks(int) 00000022 t reset_hold_I() @@ -419,7 +419,6 @@ 00000024 r init_ardupilot()::__c 00000024 r print_accel_offsets()::__c 00000025 r setup_factory(unsigned char, Menu::arg const*)::__c -00000025 r Log_Read_Performance()::__c 00000026 t print_done() 00000026 b mavlink_queue 00000026 t print_hit_enter() @@ -544,6 +543,7 @@ 000000c4 t update_events() 000000c4 r setup_esc(unsigned char, Menu::arg const*)::__c 000000c6 t send_radio_in(mavlink_channel_t) +000000c6 t Log_Read_Performance() 000000c6 t test_tri(unsigned char, Menu::arg const*) 000000c7 B dcm 000000ca t init_barometer() @@ -553,7 +553,6 @@ 000000d4 t Log_Read(int, int) 000000d8 t test_radio(unsigned char, Menu::arg const*) 000000d8 t read_barometer() -000000da t Log_Read_Performance() 000000dc t test_adc(unsigned char, Menu::arg const*) 000000e0 r setup_menu_commands 000000e4 t test_radio_pwm(unsigned char, Menu::arg const*) @@ -621,4 +620,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 00001228 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001b0e T loop +00001af6 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.build.log index 1770ec7e63..27cba76bde 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.build.log @@ -5,7 +5,7 @@ In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:55: /usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:76: /root/apm/ardupilot-mega/ArduCopter/Parameters.h: In constructor 'Parameters::Parameters()': -/root/apm/ardupilot-mega/ArduCopter/Parameters.h:386: warning: overflow in implicit constant conversion +/root/apm/ardupilot-mega/ArduCopter/Parameters.h:387: warning: overflow in implicit constant conversion /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'void do_loiter_turns()': /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: statement has no effect /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'bool verify_nav_wp()': @@ -56,8 +56,8 @@ autogenerated:289: warning: 'void report_gyro()' declared 'static' but never def autogenerated:296: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined autogenerated:297: warning: 'int read_num_from_serial()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/system.pde:448: warning: 'void set_failsafe(boolean)' defined but not used -autogenerated:312: warning: 'void init_optflow()' declared 'static' but never defined -autogenerated:320: warning: 'void fake_out_gps()' declared 'static' but never defined +autogenerated:311: warning: 'void init_optflow()' declared 'static' but never defined +autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/test.pde:1028: warning: 'void print_motor_out()' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:444: warning: 'undo_event' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt index 213cd6dc1f..aee327d54b 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt @@ -59,7 +59,6 @@ 00000002 b superslow_loopCounter 00000002 r comma 00000002 b g_gps -00000002 b G_Dt_max 00000002 b airspeed 00000002 b baro_alt 00000002 b sonar_alt @@ -403,6 +402,7 @@ 00000021 r print_log_menu()::__c 00000021 r report_compass()::__c 00000021 r Log_Read_Current()::__c +00000021 r Log_Read_Performance()::__c 00000022 t clear_leds() 00000022 t print_blanks(int) 00000022 t reset_hold_I() @@ -419,7 +419,6 @@ 00000024 r init_ardupilot()::__c 00000024 r print_accel_offsets()::__c 00000025 r setup_factory(unsigned char, Menu::arg const*)::__c -00000025 r Log_Read_Performance()::__c 00000026 t print_done() 00000026 b mavlink_queue 00000026 t print_hit_enter() @@ -544,6 +543,7 @@ 000000c4 r setup_esc(unsigned char, Menu::arg const*)::__c 000000c6 t test_eedump(unsigned char, Menu::arg const*) 000000c6 t send_radio_in(mavlink_channel_t) +000000c6 t Log_Read_Performance() 000000c6 t test_tri(unsigned char, Menu::arg const*) 000000c7 B dcm 000000ca t init_barometer() @@ -553,7 +553,6 @@ 000000d4 t Log_Read(int, int) 000000d8 t test_radio(unsigned char, Menu::arg const*) 000000d8 t read_barometer() -000000da t Log_Read_Performance() 000000de t setup_motors(unsigned char, Menu::arg const*) 000000de t test_adc(unsigned char, Menu::arg const*) 000000e0 r setup_menu_commands @@ -621,4 +620,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 00001228 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001a70 T loop +00001a58 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.build.log index 1770ec7e63..27cba76bde 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.build.log @@ -5,7 +5,7 @@ In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:55: /usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:76: /root/apm/ardupilot-mega/ArduCopter/Parameters.h: In constructor 'Parameters::Parameters()': -/root/apm/ardupilot-mega/ArduCopter/Parameters.h:386: warning: overflow in implicit constant conversion +/root/apm/ardupilot-mega/ArduCopter/Parameters.h:387: warning: overflow in implicit constant conversion /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'void do_loiter_turns()': /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: statement has no effect /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'bool verify_nav_wp()': @@ -56,8 +56,8 @@ autogenerated:289: warning: 'void report_gyro()' declared 'static' but never def autogenerated:296: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined autogenerated:297: warning: 'int read_num_from_serial()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/system.pde:448: warning: 'void set_failsafe(boolean)' defined but not used -autogenerated:312: warning: 'void init_optflow()' declared 'static' but never defined -autogenerated:320: warning: 'void fake_out_gps()' declared 'static' but never defined +autogenerated:311: warning: 'void init_optflow()' declared 'static' but never defined +autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/test.pde:1028: warning: 'void print_motor_out()' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:444: warning: 'undo_event' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt index 0879f40bef..b7845231e1 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt @@ -59,7 +59,6 @@ 00000002 b superslow_loopCounter 00000002 r comma 00000002 b g_gps -00000002 b G_Dt_max 00000002 b airspeed 00000002 b baro_alt 00000002 b sonar_alt @@ -403,6 +402,7 @@ 00000021 r print_log_menu()::__c 00000021 r report_compass()::__c 00000021 r Log_Read_Current()::__c +00000021 r Log_Read_Performance()::__c 00000022 t clear_leds() 00000022 t print_blanks(int) 00000022 t reset_hold_I() @@ -419,7 +419,6 @@ 00000024 r init_ardupilot()::__c 00000024 r print_accel_offsets()::__c 00000025 r setup_factory(unsigned char, Menu::arg const*)::__c -00000025 r Log_Read_Performance()::__c 00000026 t print_done() 00000026 b mavlink_queue 00000026 t print_hit_enter() @@ -544,6 +543,7 @@ 000000c4 t update_events() 000000c4 r setup_esc(unsigned char, Menu::arg const*)::__c 000000c6 t send_radio_in(mavlink_channel_t) +000000c6 t Log_Read_Performance() 000000c6 t test_tri(unsigned char, Menu::arg const*) 000000c7 B dcm 000000ca t init_barometer() @@ -553,7 +553,6 @@ 000000d4 t Log_Read(int, int) 000000d8 t test_radio(unsigned char, Menu::arg const*) 000000d8 t read_barometer() -000000da t Log_Read_Performance() 000000dc t test_adc(unsigned char, Menu::arg const*) 000000de t setup_motors(unsigned char, Menu::arg const*) 000000e0 r setup_menu_commands @@ -621,4 +620,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 00001228 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001a6e T loop +00001a56 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.build.log index 1770ec7e63..27cba76bde 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.build.log @@ -5,7 +5,7 @@ In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:55: /usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:76: /root/apm/ardupilot-mega/ArduCopter/Parameters.h: In constructor 'Parameters::Parameters()': -/root/apm/ardupilot-mega/ArduCopter/Parameters.h:386: warning: overflow in implicit constant conversion +/root/apm/ardupilot-mega/ArduCopter/Parameters.h:387: warning: overflow in implicit constant conversion /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'void do_loiter_turns()': /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: statement has no effect /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'bool verify_nav_wp()': @@ -56,8 +56,8 @@ autogenerated:289: warning: 'void report_gyro()' declared 'static' but never def autogenerated:296: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined autogenerated:297: warning: 'int read_num_from_serial()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/system.pde:448: warning: 'void set_failsafe(boolean)' defined but not used -autogenerated:312: warning: 'void init_optflow()' declared 'static' but never defined -autogenerated:320: warning: 'void fake_out_gps()' declared 'static' but never defined +autogenerated:311: warning: 'void init_optflow()' declared 'static' but never defined +autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/test.pde:1028: warning: 'void print_motor_out()' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:444: warning: 'undo_event' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt index 838b5deae4..b79ba6c82d 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt @@ -59,7 +59,6 @@ 00000002 b superslow_loopCounter 00000002 r comma 00000002 b g_gps -00000002 b G_Dt_max 00000002 b airspeed 00000002 b baro_alt 00000002 b sonar_alt @@ -403,6 +402,7 @@ 00000021 r print_log_menu()::__c 00000021 r report_compass()::__c 00000021 r Log_Read_Current()::__c +00000021 r Log_Read_Performance()::__c 00000022 t clear_leds() 00000022 t print_blanks(int) 00000022 t reset_hold_I() @@ -419,7 +419,6 @@ 00000024 r init_ardupilot()::__c 00000024 r print_accel_offsets()::__c 00000025 r setup_factory(unsigned char, Menu::arg const*)::__c -00000025 r Log_Read_Performance()::__c 00000026 t print_done() 00000026 b mavlink_queue 00000026 t print_hit_enter() @@ -544,6 +543,7 @@ 000000c4 r setup_esc(unsigned char, Menu::arg const*)::__c 000000c6 t test_eedump(unsigned char, Menu::arg const*) 000000c6 t send_radio_in(mavlink_channel_t) +000000c6 t Log_Read_Performance() 000000c6 t test_tri(unsigned char, Menu::arg const*) 000000c7 B dcm 000000ca t init_barometer() @@ -553,7 +553,6 @@ 000000d4 t Log_Read(int, int) 000000d8 t test_radio(unsigned char, Menu::arg const*) 000000d8 t read_barometer() -000000da t Log_Read_Performance() 000000de t test_adc(unsigned char, Menu::arg const*) 000000e0 r setup_menu_commands 000000e4 t test_radio_pwm(unsigned char, Menu::arg const*) @@ -621,4 +620,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 00001228 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001b50 T loop +00001b38 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.build.log index 1770ec7e63..27cba76bde 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.build.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.build.log @@ -5,7 +5,7 @@ In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:55: /usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:76: /root/apm/ardupilot-mega/ArduCopter/Parameters.h: In constructor 'Parameters::Parameters()': -/root/apm/ardupilot-mega/ArduCopter/Parameters.h:386: warning: overflow in implicit constant conversion +/root/apm/ardupilot-mega/ArduCopter/Parameters.h:387: warning: overflow in implicit constant conversion /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'void do_loiter_turns()': /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: statement has no effect /root/apm/ardupilot-mega/ArduCopter/commands_logic.pde: In function 'bool verify_nav_wp()': @@ -56,8 +56,8 @@ autogenerated:289: warning: 'void report_gyro()' declared 'static' but never def autogenerated:296: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined autogenerated:297: warning: 'int read_num_from_serial()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/system.pde:448: warning: 'void set_failsafe(boolean)' defined but not used -autogenerated:312: warning: 'void init_optflow()' declared 'static' but never defined -autogenerated:320: warning: 'void fake_out_gps()' declared 'static' but never defined +autogenerated:311: warning: 'void init_optflow()' declared 'static' but never defined +autogenerated:319: warning: 'void fake_out_gps()' declared 'static' but never defined /root/apm/ardupilot-mega/ArduCopter/test.pde:1028: warning: 'void print_motor_out()' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:444: warning: 'undo_event' defined but not used /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:450: warning: 'condition_rate' defined but not used diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt index 78828f4315..ec2a967aaa 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt @@ -59,7 +59,6 @@ 00000002 b superslow_loopCounter 00000002 r comma 00000002 b g_gps -00000002 b G_Dt_max 00000002 b airspeed 00000002 b baro_alt 00000002 b sonar_alt @@ -403,6 +402,7 @@ 00000021 r print_log_menu()::__c 00000021 r report_compass()::__c 00000021 r Log_Read_Current()::__c +00000021 r Log_Read_Performance()::__c 00000022 t clear_leds() 00000022 t print_blanks(int) 00000022 t reset_hold_I() @@ -419,7 +419,6 @@ 00000024 r init_ardupilot()::__c 00000024 r print_accel_offsets()::__c 00000025 r setup_factory(unsigned char, Menu::arg const*)::__c -00000025 r Log_Read_Performance()::__c 00000026 t print_done() 00000026 b mavlink_queue 00000026 t print_hit_enter() @@ -544,6 +543,7 @@ 000000c4 t update_events() 000000c4 r setup_esc(unsigned char, Menu::arg const*)::__c 000000c6 t send_radio_in(mavlink_channel_t) +000000c6 t Log_Read_Performance() 000000c6 t test_tri(unsigned char, Menu::arg const*) 000000c7 B dcm 000000ca t init_barometer() @@ -553,7 +553,6 @@ 000000d4 t Log_Read(int, int) 000000d8 t test_radio(unsigned char, Menu::arg const*) 000000d8 t read_barometer() -000000da t Log_Read_Performance() 000000dc t test_adc(unsigned char, Menu::arg const*) 000000e0 r setup_menu_commands 000000e4 t test_radio_pwm(unsigned char, Menu::arg const*) @@ -621,4 +620,4 @@ 00000874 t process_next_command() 00000894 W Parameters::Parameters() 00001228 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001b4e T loop +00001b36 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/firmware2.xml b/Tools/ArdupilotMegaPlanner/Firmware/firmware2.xml index 2fafeaa560..583339250a 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/firmware2.xml +++ b/Tools/ArdupilotMegaPlanner/Firmware/firmware2.xml @@ -64,7 +64,7 @@ #define FRAME_ORIENTATION X_FRAME - 108 + 110 http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.hex @@ -75,7 +75,7 @@ #define FRAME_ORIENTATION X_FRAME - 108 + 110 http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.hex @@ -86,7 +86,7 @@ #define FRAME_ORIENTATION X_FRAME - 108 + 110 http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.hex @@ -97,7 +97,7 @@ #define FRAME_ORIENTATION X_FRAME - 108 + 110 http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AC2-Heli-1280.hex @@ -158,6 +158,6 @@ - 108 + 110 diff --git a/Tools/ArdupilotMegaPlanner/Firmware/git.log b/Tools/ArdupilotMegaPlanner/Firmware/git.log index 6e2816492f..c1c5499cfe 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/git.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/git.log @@ -1,14 +1,35 @@ From https://code.google.com/p/ardupilot-mega - 27704d4..61a4415 APM_Camera -> origin/APM_Camera - f7f1c0b..43c6a23 master -> origin/master -Updating f7f1c0b..43c6a23 + 61a4415..c9f4213 APM_Camera -> origin/APM_Camera + ef1372b..5f4c529 master -> origin/master +Updating ef1372b..5f4c529 Fast-forward - ArduCopter/APM_Config.h | 5 +++- - ArduCopter/ArduCopter.pde | 50 +++++++++++++++++++----------------- - ArduCopter/Attitude.pde | 2 +- - ArduCopter/commands_logic.pde | 44 ++++++++++++++++++++++++-------- - ArduCopter/config.h | 10 +++--- - ArduCopter/heli.pde | 7 ++++- - ArduCopter/navigation.pde | 56 +++++++++++++++++++++++++++++++++++++++++ - ArduCopter/test.pde | 36 ++++++++++++++++++++++++++ - 8 files changed, 167 insertions(+), 43 deletions(-) + ArduCopter/ArduCopter.pde | 17 +- + ArduCopter/GCS_Standard.pde | 2 +- + ArduCopter/Log.pde | 5 +- + ArduCopter/Parameters.h | 49 +- + ArduCopter/flip.pde | 9 +- + ArduCopter/heli.pde | 118 +- + ArduCopter/setup.pde | 34 +- + ArduCopter/system.pde | 8 - + ArduPlane/radio.pde | 2 +- + Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj | 4 + + .../GCSViews/Configuration.Designer.cs | 328 +- + .../GCSViews/Configuration.resx | 27 +- + Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs | 1 - + .../GCSViews/FlightPlanner.Designer.cs | 103 +- + .../GCSViews/FlightPlanner.resx | 47 +- + Tools/ArdupilotMegaPlanner/Log.cs | 15 + + Tools/ArdupilotMegaPlanner/MAVLink.cs | 3 + + Tools/ArdupilotMegaPlanner/MAVLinkTypes.cs | 2 - + Tools/ArdupilotMegaPlanner/MainV2.cs | 135 +- + .../Properties/AssemblyInfo.cs | 2 +- + Tools/ArdupilotMegaPlanner/Setup/Setup.cs | 40 +- + .../bin/Release/ArdupilotMegaPlanner.exe | Bin 2098176 -> 2112512 bytes + .../bin/Release/GCSViews/Configuration.resx | 8124 +++++++++++--------- + .../bin/Release/GCSViews/FlightPlanner.resx | 2725 ++++---- + Tools/ArdupilotMegaPlanner/bin/Release/Updater.exe | Bin 8192 -> 8192 bytes + .../bin/Release/dataflashlog.xml | 18 +- + Tools/ArdupilotMegaPlanner/bin/Release/resedit.exe | Bin 13312 -> 13312 bytes + .../zh-Hans/ArdupilotMegaPlanner.resources.dll | Bin 397312 -> 380928 bytes + Tools/ArdupilotMegaPlanner/dataflashlog.xml | 18 +- + 29 files changed, 6234 insertions(+), 5602 deletions(-)