From 82596721619d07a274d4d9e3ffbd93ca37658ee9 Mon Sep 17 00:00:00 2001 From: Michael Oborne Date: Sun, 11 Sep 2011 09:47:03 +0800 Subject: [PATCH] firmware build --- .../Firmware/AC2-Hexa-1280.size.txt | 11 ++++++----- .../Firmware/AC2-Hexa-2560.size.txt | 11 ++++++----- .../Firmware/AC2-QUADHIL-1280.size.txt | 11 ++++++----- .../Firmware/AC2-QUADHIL-2560.size.txt | 11 ++++++----- .../Firmware/AC2-Quad-1280.size.txt | 11 ++++++----- .../Firmware/AC2-Quad-2560.size.txt | 11 ++++++----- .../Firmware/AC2-Tri-1280.size.txt | 11 ++++++----- .../Firmware/AC2-Tri-2560.size.txt | 11 ++++++----- .../Firmware/AC2-Y6-1280.size.txt | 11 ++++++----- .../Firmware/AC2-Y6-2560.size.txt | 11 ++++++----- Tools/ArdupilotMegaPlanner/Firmware/git.log | 11 +++++++---- 11 files changed, 67 insertions(+), 54 deletions(-) diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt index 32abac3437..ee9cf57691 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt @@ -233,6 +233,7 @@ 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c +00000008 V Parameters::Parameters()::__c 00000008 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c 00000009 r print_switch(unsigned char, unsigned char)::__c 00000009 r print_log_menu()::__c @@ -600,18 +601,18 @@ 00000220 t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 00000286 t test_imu(unsigned char, Menu::arg const*) -000002a8 t tuning() -0000031e t read_battery() +000002ea t tuning() 00000330 t calc_nav_rate(int, int, int, int) 00000358 T update_throttle_mode() 00000384 t print_log_menu() +000003be t read_battery() 000003dc T update_yaw_mode() 000004b2 t mavlink_parse_char 000005ea T update_roll_pitch_mode() 0000062e t init_ardupilot() -000007a0 t __static_initialization_and_destruction_0(int, int) -000007cd b g -000007e8 W Parameters::Parameters() +000007a8 t __static_initialization_and_destruction_0(int, int) +000007dc b g +0000083c W Parameters::Parameters() 000008e4 t process_next_command() 000011d8 T GCS_MAVLINK::handleMessage(__mavlink_message*) 000017ac t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int) diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt index 0eec1008c4..84dec1b6a0 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt @@ -233,6 +233,7 @@ 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c +00000008 V Parameters::Parameters()::__c 00000008 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c 00000009 r print_switch(unsigned char, unsigned char)::__c 00000009 r print_log_menu()::__c @@ -600,18 +601,18 @@ 0000021c t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 00000286 t test_imu(unsigned char, Menu::arg const*) -000002a8 t tuning() -0000031e t read_battery() +000002ea t tuning() 00000330 t calc_nav_rate(int, int, int, int) 00000358 T update_throttle_mode() 00000382 t print_log_menu() +000003be t read_battery() 000003dc T update_yaw_mode() 000004b2 t mavlink_parse_char 000005ea T update_roll_pitch_mode() 0000062e t init_ardupilot() -000007a0 t __static_initialization_and_destruction_0(int, int) -000007cd b g -000007e8 W Parameters::Parameters() +000007a8 t __static_initialization_and_destruction_0(int, int) +000007dc b g +0000083c W Parameters::Parameters() 000008e4 t process_next_command() 000011d8 T GCS_MAVLINK::handleMessage(__mavlink_message*) 000017ac t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int) diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt index 460519974d..300eeeb23c 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt @@ -230,6 +230,7 @@ 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c +00000008 V Parameters::Parameters()::__c 00000008 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c 00000009 r print_switch(unsigned char, unsigned char)::__c 00000009 r print_log_menu()::__c @@ -588,18 +589,18 @@ 00000220 t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 0000029e t test_imu(unsigned char, Menu::arg const*) -000002a8 t tuning() -0000031e t read_battery() +000002ea t tuning() 00000330 t calc_nav_rate(int, int, int, int) 00000358 T update_throttle_mode() 00000384 t print_log_menu() +000003be t read_battery() 000003dc T update_yaw_mode() 000004b2 t mavlink_parse_char -00000570 t __static_initialization_and_destruction_0(int, int) +00000578 t __static_initialization_and_destruction_0(int, int) 000005ea T update_roll_pitch_mode() 00000616 t init_ardupilot() -000007cd b g -000007e8 W Parameters::Parameters() +000007dc b g +0000083c W Parameters::Parameters() 000008e4 t process_next_command() 00001196 t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int) 00001494 T GCS_MAVLINK::handleMessage(__mavlink_message*) diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt index b7f17d09f3..9781e6a0e6 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt @@ -230,6 +230,7 @@ 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c +00000008 V Parameters::Parameters()::__c 00000008 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c 00000009 r print_switch(unsigned char, unsigned char)::__c 00000009 r print_log_menu()::__c @@ -588,18 +589,18 @@ 0000021c t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 0000029e t test_imu(unsigned char, Menu::arg const*) -000002a8 t tuning() -0000031e t read_battery() +000002ea t tuning() 00000330 t calc_nav_rate(int, int, int, int) 00000358 T update_throttle_mode() 00000382 t print_log_menu() +000003be t read_battery() 000003dc T update_yaw_mode() 000004b2 t mavlink_parse_char -00000570 t __static_initialization_and_destruction_0(int, int) +00000578 t __static_initialization_and_destruction_0(int, int) 000005ea T update_roll_pitch_mode() 00000616 t init_ardupilot() -000007cd b g -000007e8 W Parameters::Parameters() +000007dc b g +0000083c W Parameters::Parameters() 000008e4 t process_next_command() 00001196 t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int) 00001494 T GCS_MAVLINK::handleMessage(__mavlink_message*) diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt index 0438f5d10f..a48a9b82be 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt @@ -233,6 +233,7 @@ 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c +00000008 V Parameters::Parameters()::__c 00000008 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c 00000009 r print_switch(unsigned char, unsigned char)::__c 00000009 r print_log_menu()::__c @@ -600,18 +601,18 @@ 00000220 t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 00000286 t test_imu(unsigned char, Menu::arg const*) -000002a8 t tuning() -0000031e t read_battery() +000002ea t tuning() 00000330 t calc_nav_rate(int, int, int, int) 00000358 T update_throttle_mode() 00000384 t print_log_menu() +000003be t read_battery() 000003dc T update_yaw_mode() 000004b2 t mavlink_parse_char 000005ea T update_roll_pitch_mode() 0000062e t init_ardupilot() -000007a0 t __static_initialization_and_destruction_0(int, int) -000007cd b g -000007e8 W Parameters::Parameters() +000007a8 t __static_initialization_and_destruction_0(int, int) +000007dc b g +0000083c W Parameters::Parameters() 000008e4 t process_next_command() 000011d8 T GCS_MAVLINK::handleMessage(__mavlink_message*) 000017ac t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int) diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt index b91f764e5a..b8ece535cd 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt @@ -233,6 +233,7 @@ 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c +00000008 V Parameters::Parameters()::__c 00000008 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c 00000009 r print_switch(unsigned char, unsigned char)::__c 00000009 r print_log_menu()::__c @@ -600,18 +601,18 @@ 0000021c t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 00000286 t test_imu(unsigned char, Menu::arg const*) -000002a8 t tuning() -0000031e t read_battery() +000002ea t tuning() 00000330 t calc_nav_rate(int, int, int, int) 00000358 T update_throttle_mode() 00000382 t print_log_menu() +000003be t read_battery() 000003dc T update_yaw_mode() 000004b2 t mavlink_parse_char 000005ea T update_roll_pitch_mode() 0000062e t init_ardupilot() -000007a0 t __static_initialization_and_destruction_0(int, int) -000007cd b g -000007e8 W Parameters::Parameters() +000007a8 t __static_initialization_and_destruction_0(int, int) +000007dc b g +0000083c W Parameters::Parameters() 000008e4 t process_next_command() 000011d8 T GCS_MAVLINK::handleMessage(__mavlink_message*) 000017ac t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int) diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt index 2e43c40bbf..02d799cbcd 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt @@ -233,6 +233,7 @@ 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c +00000008 V Parameters::Parameters()::__c 00000008 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c 00000009 r print_switch(unsigned char, unsigned char)::__c 00000009 r print_log_menu()::__c @@ -600,18 +601,18 @@ 00000220 t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 00000286 t test_imu(unsigned char, Menu::arg const*) -000002a8 t tuning() -0000031e t read_battery() +000002ea t tuning() 00000330 t calc_nav_rate(int, int, int, int) 00000358 T update_throttle_mode() 00000384 t print_log_menu() +000003be t read_battery() 000003dc T update_yaw_mode() 000004b2 t mavlink_parse_char 000005ea T update_roll_pitch_mode() 0000062e t init_ardupilot() -000007a0 t __static_initialization_and_destruction_0(int, int) -000007cd b g -000007e8 W Parameters::Parameters() +000007a8 t __static_initialization_and_destruction_0(int, int) +000007dc b g +0000083c W Parameters::Parameters() 000008e4 t process_next_command() 000011d8 T GCS_MAVLINK::handleMessage(__mavlink_message*) 000017ac t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int) diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt index 6eb9d0dfc9..e093161912 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt @@ -233,6 +233,7 @@ 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c +00000008 V Parameters::Parameters()::__c 00000008 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c 00000009 r print_switch(unsigned char, unsigned char)::__c 00000009 r print_log_menu()::__c @@ -600,18 +601,18 @@ 0000021c t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 00000286 t test_imu(unsigned char, Menu::arg const*) -000002a8 t tuning() -0000031e t read_battery() +000002ea t tuning() 00000330 t calc_nav_rate(int, int, int, int) 00000358 T update_throttle_mode() 00000382 t print_log_menu() +000003be t read_battery() 000003dc T update_yaw_mode() 000004b2 t mavlink_parse_char 000005ea T update_roll_pitch_mode() 0000062e t init_ardupilot() -000007a0 t __static_initialization_and_destruction_0(int, int) -000007cd b g -000007e8 W Parameters::Parameters() +000007a8 t __static_initialization_and_destruction_0(int, int) +000007dc b g +0000083c W Parameters::Parameters() 000008e4 t process_next_command() 000011d8 T GCS_MAVLINK::handleMessage(__mavlink_message*) 000017ac t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int) diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt index 4d68a192b0..5d308cf013 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt @@ -233,6 +233,7 @@ 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c +00000008 V Parameters::Parameters()::__c 00000008 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c 00000009 r print_switch(unsigned char, unsigned char)::__c 00000009 r print_log_menu()::__c @@ -600,18 +601,18 @@ 00000220 t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 00000286 t test_imu(unsigned char, Menu::arg const*) -000002a8 t tuning() -0000031e t read_battery() +000002ea t tuning() 00000330 t calc_nav_rate(int, int, int, int) 00000358 T update_throttle_mode() 00000384 t print_log_menu() +000003be t read_battery() 000003dc T update_yaw_mode() 000004b2 t mavlink_parse_char 000005ea T update_roll_pitch_mode() 0000062e t init_ardupilot() -000007a0 t __static_initialization_and_destruction_0(int, int) -000007cd b g -000007e8 W Parameters::Parameters() +000007a8 t __static_initialization_and_destruction_0(int, int) +000007dc b g +0000083c W Parameters::Parameters() 000008e4 t process_next_command() 000011d8 T GCS_MAVLINK::handleMessage(__mavlink_message*) 000017ac t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int) diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt index 7b2bb0fd0e..98b0c692ae 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt @@ -233,6 +233,7 @@ 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c 00000008 V Parameters::Parameters()::__c +00000008 V Parameters::Parameters()::__c 00000008 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c 00000009 r print_switch(unsigned char, unsigned char)::__c 00000009 r print_log_menu()::__c @@ -600,18 +601,18 @@ 0000021c t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 00000286 t test_imu(unsigned char, Menu::arg const*) -000002a8 t tuning() -0000031e t read_battery() +000002ea t tuning() 00000330 t calc_nav_rate(int, int, int, int) 00000358 T update_throttle_mode() 00000382 t print_log_menu() +000003be t read_battery() 000003dc T update_yaw_mode() 000004b2 t mavlink_parse_char 000005ea T update_roll_pitch_mode() 0000062e t init_ardupilot() -000007a0 t __static_initialization_and_destruction_0(int, int) -000007cd b g -000007e8 W Parameters::Parameters() +000007a8 t __static_initialization_and_destruction_0(int, int) +000007dc b g +0000083c W Parameters::Parameters() 000008e4 t process_next_command() 000011d8 T GCS_MAVLINK::handleMessage(__mavlink_message*) 000017ac t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int) diff --git a/Tools/ArdupilotMegaPlanner/Firmware/git.log b/Tools/ArdupilotMegaPlanner/Firmware/git.log index 896bcb6fb2..d43656d340 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/git.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/git.log @@ -1,6 +1,9 @@ From https://code.google.com/p/ardupilot-mega - 4e3e372..ebb25b6 master -> origin/master -Updating 4e3e372..ebb25b6 + 22593cc..5e95582 APM_Camera -> origin/APM_Camera + 0448983..dc0031c master -> origin/master +Updating 0448983..dc0031c Fast-forward - ArduCopter/defines.h | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) + ArduCopter/ArduCopter.pde | 6 ++++++ + ArduCopter/Parameters.h | 3 +++ + ArduCopter/defines.h | 6 ++++-- + 3 files changed, 13 insertions(+), 2 deletions(-)