diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt index 9ff2b1f235..d84d3fb9ee 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt @@ -597,7 +597,7 @@ 000001ca t mavlink_delay(unsigned long) 000001ce t start_new_log() 000001fc t setup_motors(unsigned char, Menu::arg const*) -00000200 t set_mode(unsigned char) +00000202 t set_mode(unsigned char) 00000220 t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 000002ea t tuning() diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt index bc16bd7f7a..da96f935e5 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt @@ -597,7 +597,7 @@ 000001ca t mavlink_delay(unsigned long) 000001ce t start_new_log() 000001fc t setup_motors(unsigned char, Menu::arg const*) -00000200 t set_mode(unsigned char) +00000202 t set_mode(unsigned char) 0000021c t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 000002ea t tuning() diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt index 053b0687c4..c058444df4 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt @@ -597,7 +597,7 @@ 000001ca t arm_motors() 000001ca t mavlink_delay(unsigned long) 000001ce t start_new_log() -00000200 t set_mode(unsigned char) +00000202 t set_mode(unsigned char) 00000220 t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 000002ea t tuning() diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt index 8adec51a70..ccc1134565 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt @@ -597,7 +597,7 @@ 000001ca t arm_motors() 000001ca t mavlink_delay(unsigned long) 000001ce t start_new_log() -00000200 t set_mode(unsigned char) +00000202 t set_mode(unsigned char) 0000021c t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 000002ea t tuning() diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt index 98da5c5fa8..189044ca08 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt @@ -597,7 +597,7 @@ 000001ca t arm_motors() 000001ca t mavlink_delay(unsigned long) 000001ce t start_new_log() -00000200 t set_mode(unsigned char) +00000202 t set_mode(unsigned char) 00000220 t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 000002ea t tuning() diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt index f9e573a410..0a4a5f04fa 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt @@ -597,7 +597,7 @@ 000001ca t arm_motors() 000001ca t mavlink_delay(unsigned long) 000001ce t start_new_log() -00000200 t set_mode(unsigned char) +00000202 t set_mode(unsigned char) 0000021c t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 000002ea t tuning() diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt index 3a14243098..1e082c332d 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt @@ -597,7 +597,7 @@ 000001ca t arm_motors() 000001ca t mavlink_delay(unsigned long) 000001ce t start_new_log() -00000200 t set_mode(unsigned char) +00000202 t set_mode(unsigned char) 00000220 t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 000002ea t tuning() diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt index bd43df11d9..09fc850668 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt @@ -597,7 +597,7 @@ 000001ca t arm_motors() 000001ca t mavlink_delay(unsigned long) 000001ce t start_new_log() -00000200 t set_mode(unsigned char) +00000202 t set_mode(unsigned char) 0000021c t test_wp(unsigned char, Menu::arg const*) 00000228 t setup_radio(unsigned char, Menu::arg const*) 000002ea t tuning() diff --git a/Tools/ArdupilotMegaPlanner/Firmware/git.log b/Tools/ArdupilotMegaPlanner/Firmware/git.log index b0921e0e03..eb1aa83247 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/git.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/git.log @@ -1,12 +1,6 @@ From https://code.google.com/p/ardupilot-mega - 5e95582..28bb6fd APM_Camera -> origin/APM_Camera - 5e48582..45a85df master -> origin/master -Updating 5e48582..45a85df + a543a5c..fe617ae master -> origin/master +Updating a543a5c..fe617ae Fast-forward - ArduCopter/ArduCopter.pde | 13 +++----- - ArduCopter/motors.pde | 9 +++-- - ArduCopter/system.pde | 2 +- - ArduCopter/test.pde | 2 +- - libraries/AP_DCM/AP_DCM.cpp | 71 ++++++++++++++++++++++++++++++++++++++----- - libraries/AP_DCM/AP_DCM.h | 7 ++++- - 6 files changed, 81 insertions(+), 23 deletions(-) + ArduCopter/config.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-)