diff --git a/Tools/ArdupilotMegaPlanner/.gitignore b/Tools/ArdupilotMegaPlanner/.gitignore
new file mode 100644
index 0000000000..1ae796f5b6
--- /dev/null
+++ b/Tools/ArdupilotMegaPlanner/.gitignore
@@ -0,0 +1,4 @@
+
+*.pfx
+*.suo
+*.user
\ No newline at end of file
diff --git a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
index 56026b165e..6ac38ed914 100644
--- a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
+++ b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj
@@ -346,6 +346,7 @@
AGauge.cs
+ Designer
Log.cs
diff --git a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj.user b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj.user
deleted file mode 100644
index 175f1fb055..0000000000
--- a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj.user
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- publish/|ftp://vps.oborne.me/ardupilotmegaplanner/|ftp://vps.oborne.me/|ftp://www.vps.oborne.me/ardupilotmegaplanner/|http://www.vps.oborne.me/dav/ardupilotmegaplanner/
- http://www.vps.oborne.me/ardupilotmegaplanner/|http://ardupilot-mega.googlecode.com/svn/Tools/trunk/ArdupilotMegaPlanner/publish/
- http://www.diydrones.com/
- http://www.vps.oborne.me/ardupilotmegaplanner/|http://ardupilot-mega.googlecode.com/svn/Tools/trunk/ArdupilotMegaPlanner/publish/|http://ardupilot-mega.googlecode.com/svn/Tools/trunk/ArdupilotMegaPlanner/Publish/
-
-
- en-US
- false
-
-
\ No newline at end of file
diff --git a/Tools/ArdupilotMegaPlanner/Common.cs b/Tools/ArdupilotMegaPlanner/Common.cs
index dfcfa8ff09..a9c7314de0 100644
--- a/Tools/ArdupilotMegaPlanner/Common.cs
+++ b/Tools/ArdupilotMegaPlanner/Common.cs
@@ -384,7 +384,7 @@ namespace ArdupilotMega
public static Type getModes()
{
- if (MainV2.cs.firmware == MainV2.Firmwares.ArduPilotMega)
+ if (MainV2.cs.firmware == MainV2.Firmwares.ArduPlane)
{
return typeof(apmmodes);
}
diff --git a/Tools/ArdupilotMegaPlanner/CurrentState.cs b/Tools/ArdupilotMegaPlanner/CurrentState.cs
index 8165732b3a..71db65033b 100644
--- a/Tools/ArdupilotMegaPlanner/CurrentState.cs
+++ b/Tools/ArdupilotMegaPlanner/CurrentState.cs
@@ -145,7 +145,7 @@ namespace ArdupilotMega
public ushort rcoverridech4 { get; set; }
// current firmware
- public MainV2.Firmwares firmware = MainV2.Firmwares.ArduPilotMega;
+ public MainV2.Firmwares firmware = MainV2.Firmwares.ArduPlane;
public float freemem { get; set; }
public float brklevel { get; set; }
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.build.log
index a14f53e7d7..6d390dc9bd 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.build.log
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.build.log
@@ -1,13 +1,9 @@
-
-%%%% Making all in ArduCopterMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-%% ArduCopterMega.cpp
-%% ArduCopterMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:53:
+%% ArduCopter.cpp
+%% ArduCopter.o
+In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:53:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:1412: warning: 'void tuning()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:1398: warning: 'void tuning()' defined but not used
autogenerated:34: warning: 'int alt_hold_velocity()' declared 'static' but never defined
autogenerated:86: warning: 'void acknowledge(byte, byte, byte)' declared 'static' but never defined
autogenerated:87: warning: 'void send_message(byte)' declared 'static' but never defined
@@ -22,39 +18,40 @@ autogenerated:97: warning: 'void print_waypoints()' declared 'static' but never
autogenerated:70: warning: 'long int convert_to_dec(float)' declared 'static' but never defined
autogenerated:139: warning: 'void Log_Write_Optflow()' declared 'static' but never defined
autogenerated:150: warning: 'void decrement_WP_index()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/events.pde:46: warning: 'void low_battery_event()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/events.pde:46: warning: 'void low_battery_event()' defined but not used
autogenerated:210: warning: 'void heli_init_swash()' declared 'static' but never defined
autogenerated:211: warning: 'void heli_move_servos_to_mid()' declared 'static' but never defined
autogenerated:212: warning: 'void heli_move_swash(int, int, int, int)' declared 'static' but never defined
autogenerated:235: warning: 'void debug_motors()' declared 'static' but never defined
autogenerated:250: warning: 'void calc_altitude_smoothing_error()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:212: warning: 'void trim_yaw()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:159: warning: 'int get_loiter_angle()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:212: warning: 'void trim_yaw()' defined but not used
autogenerated:268: warning: 'void readCommands()' declared 'static' but never defined
autogenerated:269: warning: 'void parseCommand(char*)' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:6: warning: 'void ReadSCP1000()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:6: warning: 'void ReadSCP1000()' defined but not used
autogenerated:272: warning: 'long int read_baro_filtered()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
autogenerated:286: warning: 'void report_heli()' declared 'static' but never defined
autogenerated:287: warning: 'void report_gyro()' declared 'static' but never defined
autogenerated:295: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined
autogenerated:296: warning: 'int read_num_from_serial()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
autogenerated:310: warning: 'void init_optflow()' declared 'static' but never defined
autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/test.pde:1040: warning: 'void print_motor_out()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:442: warning: 'undo_event' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:448: warning: 'condition_rate' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:462: warning: 'simple_WP' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:467: warning: 'optflow_offset' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:468: warning: 'new_location' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/test.pde:1040: warning: 'void print_motor_out()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:442: warning: 'undo_event' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:448: warning: 'condition_rate' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:462: warning: 'simple_WP' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:467: warning: 'optflow_offset' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:468: warning: 'new_location' defined but not used
%% libraries/APM_BMP085/APM_BMP085.o
%% libraries/APM_PI/APM_PI.o
%% libraries/APM_RC/APM_RC.o
@@ -85,41 +82,41 @@ autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never de
%% libraries/AP_GPS/GPS.o
%% libraries/AP_IMU/AP_IMU_Oilpan.o
%% libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.o
-In file included from /root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
+In file included from /root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
%% libraries/AP_OpticalFlow/AP_OpticalFlow.o
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
%% libraries/AP_RangeFinder/RangeFinder.o
%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
+In file included from /root/apm/ardupilot-mega/libraries/DataFlash/DataFlash.cpp:35:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
%% libraries/FastSerial/BetterStream.o
@@ -203,141 +200,6 @@ In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wi
from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
%% arduino/core.a
-%% ArduCopterMega.elf
-%% ArduCopterMega.eep
-%% ArduCopterMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-
-%%%% Making all in ArduPilotMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
-%% ArduPilotMega.cpp
-%% ArduPilotMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduPilotMega/ArduPilotMega.pde:32:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-autogenerated:63: warning: 'void add_altitude_data(long unsigned int, long int)' declared 'static' but never defined
-autogenerated:64: warning: 'void recalc_climb_rate()' declared 'static' but never defined
-autogenerated:65: warning: 'void print_climb_debug_info()' declared 'static' but never defined
-autogenerated:126: warning: 'void low_battery_event()' declared 'static' but never defined
-%% libraries/APM_BMP085/APM_BMP085.o
-%% libraries/APM_RC/APM_RC.o
-%% libraries/AP_ADC/AP_ADC_ADS7844.o
-%% libraries/AP_ADC/AP_ADC.o
-%% libraries/AP_ADC/AP_ADC_HIL.o
-%% libraries/AP_Common/AP_Common.o
-%% libraries/AP_Common/AP_Loop.o
-%% libraries/AP_Common/AP_MetaClass.o
-%% libraries/AP_Common/AP_Var.o
-%% libraries/AP_Common/AP_Var_menufuncs.o
-%% libraries/AP_Common/c++.o
-%% libraries/AP_Common/menu.o
-%% libraries/AP_Compass/AP_Compass_HIL.o
-%% libraries/AP_Compass/AP_Compass_HMC5843.o
-%% libraries/AP_Compass/Compass.o
-%% libraries/AP_DCM/AP_DCM.o
-%% libraries/AP_DCM/AP_DCM_HIL.o
-%% libraries/AP_GPS/AP_GPS_406.o
-%% libraries/AP_GPS/AP_GPS_Auto.o
-%% libraries/AP_GPS/AP_GPS_HIL.o
-%% libraries/AP_GPS/AP_GPS_IMU.o
-%% libraries/AP_GPS/AP_GPS_MTK16.o
-%% libraries/AP_GPS/AP_GPS_MTK.o
-%% libraries/AP_GPS/AP_GPS_NMEA.o
-%% libraries/AP_GPS/AP_GPS_SIRF.o
-%% libraries/AP_GPS/AP_GPS_UBLOX.o
-%% libraries/AP_GPS/GPS.o
-%% libraries/AP_IMU/AP_IMU_Oilpan.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
-%% libraries/AP_RangeFinder/RangeFinder.o
-%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/FastSerial/BetterStream.o
-%% libraries/FastSerial/FastSerial.o
-%% libraries/FastSerial/vprintf.o
-%% libraries/GCS_MAVLink/GCS_MAVLink.o
-%% libraries/ModeFilter/ModeFilter.o
-%% libraries/PID/PID.o
-%% libraries/RC_Channel/RC_Channel.o
-%% libraries/memcheck/memcheck.o
-%% libraries/FastSerial/ftoa_engine.o
-%% libraries/FastSerial/ultoa_invert.o
-%% libraries/SPI/SPI.o
-In file included from /usr/local/share/arduino/libraries/SPI/SPI.cpp:12:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/Wire/Wire.o
-%% libraries/Wire/utility/twi.o
-cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C
-%% arduino/HardwareSerial.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/HardwareSerial.cpp:28:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/main.o
-%% arduino/Print.o
-%% arduino/Tone.o
-/usr/local/share/arduino/hardware/arduino/cores/arduino/Tone.cpp:93: warning: only initialized variables can be placed into program memory area
-%% arduino/WMath.o
-%% arduino/WString.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:26:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:84: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:85: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:86: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:87: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:88: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:89: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:90: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:91: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:93: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:94: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:95: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:100: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:101: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:102: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:103: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:104: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:105: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:106: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:107: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:109: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:110: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:111: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:116: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:117: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:118: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:119: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:120: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:121: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:122: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:123: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:125: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:126: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:127: warning: initialization makes integer from pointer without a cast
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/WInterrupts.c:34:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_analog.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_digital.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_pulse.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/core.a
-%% ArduPilotMega.elf
-%% ArduPilotMega.eep
-%% ArduPilotMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
+%% ArduCopter.elf
+%% ArduCopter.eep
+%% ArduCopter.hex
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt
index e5f05c1872..d8f061f4bc 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt
@@ -97,6 +97,7 @@
00000004 b sin_pitch_y
00000004 b wp_distance
00000004 b abs_pressure
+00000004 b circle_angle
00000004 b current_amps
00000004 b old_altitude
00000004 b original_alt
@@ -329,7 +330,6 @@
0000000e V Parameters::Parameters()::__c
0000000f b current_loc
0000000f b next_command
-0000000f r __menu_name__main_menu
0000000f b home
0000000f b next_WP
0000000f b prev_WP
@@ -383,6 +383,7 @@
00000016 r init_ardupilot()::__c
00000016 r GCS_MAVLINK::update()::__c
00000016 B sonar
+00000017 r __menu_name__main_menu
00000018 t setup_accel(unsigned char, Menu::arg const*)
00000018 W AP_VarT::serialize(void*, unsigned int) const
00000018 b mavlink_get_channel_status::m_mavlink_status
@@ -608,4 +609,4 @@
000008e4 t process_next_command()
000011d8 T GCS_MAVLINK::handleMessage(__mavlink_message*)
000017d0 t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int)
-0000212a T loop
+00002000 T loop
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.build.log
index a14f53e7d7..6d390dc9bd 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.build.log
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.build.log
@@ -1,13 +1,9 @@
-
-%%%% Making all in ArduCopterMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-%% ArduCopterMega.cpp
-%% ArduCopterMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:53:
+%% ArduCopter.cpp
+%% ArduCopter.o
+In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:53:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:1412: warning: 'void tuning()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:1398: warning: 'void tuning()' defined but not used
autogenerated:34: warning: 'int alt_hold_velocity()' declared 'static' but never defined
autogenerated:86: warning: 'void acknowledge(byte, byte, byte)' declared 'static' but never defined
autogenerated:87: warning: 'void send_message(byte)' declared 'static' but never defined
@@ -22,39 +18,40 @@ autogenerated:97: warning: 'void print_waypoints()' declared 'static' but never
autogenerated:70: warning: 'long int convert_to_dec(float)' declared 'static' but never defined
autogenerated:139: warning: 'void Log_Write_Optflow()' declared 'static' but never defined
autogenerated:150: warning: 'void decrement_WP_index()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/events.pde:46: warning: 'void low_battery_event()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/events.pde:46: warning: 'void low_battery_event()' defined but not used
autogenerated:210: warning: 'void heli_init_swash()' declared 'static' but never defined
autogenerated:211: warning: 'void heli_move_servos_to_mid()' declared 'static' but never defined
autogenerated:212: warning: 'void heli_move_swash(int, int, int, int)' declared 'static' but never defined
autogenerated:235: warning: 'void debug_motors()' declared 'static' but never defined
autogenerated:250: warning: 'void calc_altitude_smoothing_error()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:212: warning: 'void trim_yaw()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:159: warning: 'int get_loiter_angle()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:212: warning: 'void trim_yaw()' defined but not used
autogenerated:268: warning: 'void readCommands()' declared 'static' but never defined
autogenerated:269: warning: 'void parseCommand(char*)' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:6: warning: 'void ReadSCP1000()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:6: warning: 'void ReadSCP1000()' defined but not used
autogenerated:272: warning: 'long int read_baro_filtered()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
autogenerated:286: warning: 'void report_heli()' declared 'static' but never defined
autogenerated:287: warning: 'void report_gyro()' declared 'static' but never defined
autogenerated:295: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined
autogenerated:296: warning: 'int read_num_from_serial()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
autogenerated:310: warning: 'void init_optflow()' declared 'static' but never defined
autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/test.pde:1040: warning: 'void print_motor_out()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:442: warning: 'undo_event' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:448: warning: 'condition_rate' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:462: warning: 'simple_WP' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:467: warning: 'optflow_offset' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:468: warning: 'new_location' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/test.pde:1040: warning: 'void print_motor_out()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:442: warning: 'undo_event' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:448: warning: 'condition_rate' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:462: warning: 'simple_WP' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:467: warning: 'optflow_offset' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:468: warning: 'new_location' defined but not used
%% libraries/APM_BMP085/APM_BMP085.o
%% libraries/APM_PI/APM_PI.o
%% libraries/APM_RC/APM_RC.o
@@ -85,41 +82,41 @@ autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never de
%% libraries/AP_GPS/GPS.o
%% libraries/AP_IMU/AP_IMU_Oilpan.o
%% libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.o
-In file included from /root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
+In file included from /root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
%% libraries/AP_OpticalFlow/AP_OpticalFlow.o
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
%% libraries/AP_RangeFinder/RangeFinder.o
%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
+In file included from /root/apm/ardupilot-mega/libraries/DataFlash/DataFlash.cpp:35:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
%% libraries/FastSerial/BetterStream.o
@@ -203,141 +200,6 @@ In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wi
from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
%% arduino/core.a
-%% ArduCopterMega.elf
-%% ArduCopterMega.eep
-%% ArduCopterMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-
-%%%% Making all in ArduPilotMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
-%% ArduPilotMega.cpp
-%% ArduPilotMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduPilotMega/ArduPilotMega.pde:32:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-autogenerated:63: warning: 'void add_altitude_data(long unsigned int, long int)' declared 'static' but never defined
-autogenerated:64: warning: 'void recalc_climb_rate()' declared 'static' but never defined
-autogenerated:65: warning: 'void print_climb_debug_info()' declared 'static' but never defined
-autogenerated:126: warning: 'void low_battery_event()' declared 'static' but never defined
-%% libraries/APM_BMP085/APM_BMP085.o
-%% libraries/APM_RC/APM_RC.o
-%% libraries/AP_ADC/AP_ADC_ADS7844.o
-%% libraries/AP_ADC/AP_ADC.o
-%% libraries/AP_ADC/AP_ADC_HIL.o
-%% libraries/AP_Common/AP_Common.o
-%% libraries/AP_Common/AP_Loop.o
-%% libraries/AP_Common/AP_MetaClass.o
-%% libraries/AP_Common/AP_Var.o
-%% libraries/AP_Common/AP_Var_menufuncs.o
-%% libraries/AP_Common/c++.o
-%% libraries/AP_Common/menu.o
-%% libraries/AP_Compass/AP_Compass_HIL.o
-%% libraries/AP_Compass/AP_Compass_HMC5843.o
-%% libraries/AP_Compass/Compass.o
-%% libraries/AP_DCM/AP_DCM.o
-%% libraries/AP_DCM/AP_DCM_HIL.o
-%% libraries/AP_GPS/AP_GPS_406.o
-%% libraries/AP_GPS/AP_GPS_Auto.o
-%% libraries/AP_GPS/AP_GPS_HIL.o
-%% libraries/AP_GPS/AP_GPS_IMU.o
-%% libraries/AP_GPS/AP_GPS_MTK16.o
-%% libraries/AP_GPS/AP_GPS_MTK.o
-%% libraries/AP_GPS/AP_GPS_NMEA.o
-%% libraries/AP_GPS/AP_GPS_SIRF.o
-%% libraries/AP_GPS/AP_GPS_UBLOX.o
-%% libraries/AP_GPS/GPS.o
-%% libraries/AP_IMU/AP_IMU_Oilpan.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
-%% libraries/AP_RangeFinder/RangeFinder.o
-%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/FastSerial/BetterStream.o
-%% libraries/FastSerial/FastSerial.o
-%% libraries/FastSerial/vprintf.o
-%% libraries/GCS_MAVLink/GCS_MAVLink.o
-%% libraries/ModeFilter/ModeFilter.o
-%% libraries/PID/PID.o
-%% libraries/RC_Channel/RC_Channel.o
-%% libraries/memcheck/memcheck.o
-%% libraries/FastSerial/ftoa_engine.o
-%% libraries/FastSerial/ultoa_invert.o
-%% libraries/SPI/SPI.o
-In file included from /usr/local/share/arduino/libraries/SPI/SPI.cpp:12:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/Wire/Wire.o
-%% libraries/Wire/utility/twi.o
-cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C
-%% arduino/HardwareSerial.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/HardwareSerial.cpp:28:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/main.o
-%% arduino/Print.o
-%% arduino/Tone.o
-/usr/local/share/arduino/hardware/arduino/cores/arduino/Tone.cpp:93: warning: only initialized variables can be placed into program memory area
-%% arduino/WMath.o
-%% arduino/WString.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:26:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:84: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:85: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:86: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:87: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:88: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:89: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:90: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:91: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:93: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:94: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:95: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:100: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:101: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:102: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:103: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:104: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:105: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:106: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:107: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:109: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:110: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:111: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:116: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:117: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:118: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:119: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:120: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:121: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:122: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:123: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:125: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:126: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:127: warning: initialization makes integer from pointer without a cast
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/WInterrupts.c:34:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_analog.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_digital.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_pulse.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/core.a
-%% ArduPilotMega.elf
-%% ArduPilotMega.eep
-%% ArduPilotMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
+%% ArduCopter.elf
+%% ArduCopter.eep
+%% ArduCopter.hex
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt
index 839a43e53a..d6992b33c3 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt
@@ -97,6 +97,7 @@
00000004 b sin_pitch_y
00000004 b wp_distance
00000004 b abs_pressure
+00000004 b circle_angle
00000004 b current_amps
00000004 b old_altitude
00000004 b original_alt
@@ -329,7 +330,6 @@
0000000e V Parameters::Parameters()::__c
0000000f b current_loc
0000000f b next_command
-0000000f r __menu_name__main_menu
0000000f b home
0000000f b next_WP
0000000f b prev_WP
@@ -383,6 +383,7 @@
00000016 r init_ardupilot()::__c
00000016 r GCS_MAVLINK::update()::__c
00000016 B sonar
+00000017 r __menu_name__main_menu
00000018 t setup_accel(unsigned char, Menu::arg const*)
00000018 W AP_VarT::serialize(void*, unsigned int) const
00000018 b mavlink_get_channel_status::m_mavlink_status
@@ -608,4 +609,4 @@
000008e4 t process_next_command()
000011d8 T GCS_MAVLINK::handleMessage(__mavlink_message*)
000017d0 t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int)
-00002128 T loop
+00001ffe T loop
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.build.log
index 5d0b2c5154..f9ac117a10 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.build.log
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.build.log
@@ -1,13 +1,9 @@
-
-%%%% Making all in ArduCopterMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-%% ArduCopterMega.cpp
-%% ArduCopterMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:53:
+%% ArduCopter.cpp
+%% ArduCopter.o
+In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:53:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:1412: warning: 'void tuning()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:1398: warning: 'void tuning()' defined but not used
autogenerated:34: warning: 'int alt_hold_velocity()' declared 'static' but never defined
autogenerated:86: warning: 'void acknowledge(byte, byte, byte)' declared 'static' but never defined
autogenerated:87: warning: 'void send_message(byte)' declared 'static' but never defined
@@ -23,22 +19,23 @@ autogenerated:70: warning: 'long int convert_to_dec(float)' declared 'static' bu
autogenerated:135: warning: 'void Log_Write_Raw()' declared 'static' but never defined
autogenerated:139: warning: 'void Log_Write_Optflow()' declared 'static' but never defined
autogenerated:141: warning: 'void Log_Write_Control_Tuning()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/Log.pde:760: warning: 'void Log_Write_Attitude()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/Log.pde:760: warning: 'void Log_Write_Attitude()' defined but not used
autogenerated:150: warning: 'void decrement_WP_index()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/events.pde:46: warning: 'void low_battery_event()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/events.pde:46: warning: 'void low_battery_event()' defined but not used
autogenerated:210: warning: 'void heli_init_swash()' declared 'static' but never defined
autogenerated:211: warning: 'void heli_move_servos_to_mid()' declared 'static' but never defined
autogenerated:212: warning: 'void heli_move_swash(int, int, int, int)' declared 'static' but never defined
autogenerated:235: warning: 'void debug_motors()' declared 'static' but never defined
autogenerated:250: warning: 'void calc_altitude_smoothing_error()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:212: warning: 'void trim_yaw()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:159: warning: 'int get_loiter_angle()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:212: warning: 'void trim_yaw()' defined but not used
autogenerated:268: warning: 'void readCommands()' declared 'static' but never defined
autogenerated:269: warning: 'void parseCommand(char*)' declared 'static' but never defined
autogenerated:270: warning: 'void ReadSCP1000()' declared 'static' but never defined
@@ -51,22 +48,22 @@ autogenerated:286: warning: 'void report_heli()' declared 'static' but never def
autogenerated:287: warning: 'void report_gyro()' declared 'static' but never defined
autogenerated:295: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined
autogenerated:296: warning: 'int read_num_from_serial()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
autogenerated:310: warning: 'void init_optflow()' declared 'static' but never defined
autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/test.pde:1040: warning: 'void print_motor_out()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:353: warning: 'old_altitude' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:371: warning: 'abs_pressure' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:372: warning: 'ground_pressure' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:373: warning: 'ground_temperature' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:378: warning: 'baro_alt' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:442: warning: 'undo_event' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:448: warning: 'condition_rate' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:462: warning: 'simple_WP' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:467: warning: 'optflow_offset' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:468: warning: 'new_location' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/test.pde:13: warning: 'int8_t test_adc(uint8_t, const Menu::arg*)' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/test.pde:24: warning: 'int8_t test_baro(uint8_t, const Menu::arg*)' declared 'static' but never defined
+/root/apm/ardupilot-mega/ArduCopter/test.pde:1040: warning: 'void print_motor_out()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:353: warning: 'old_altitude' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:371: warning: 'abs_pressure' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:372: warning: 'ground_pressure' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:373: warning: 'ground_temperature' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:378: warning: 'baro_alt' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:442: warning: 'undo_event' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:448: warning: 'condition_rate' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:462: warning: 'simple_WP' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:467: warning: 'optflow_offset' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:468: warning: 'new_location' 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:24: warning: 'int8_t test_baro(uint8_t, const Menu::arg*)' declared 'static' but never defined
%% libraries/APM_BMP085/APM_BMP085.o
%% libraries/APM_PI/APM_PI.o
%% libraries/APM_RC/APM_RC.o
@@ -97,41 +94,41 @@ autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never de
%% libraries/AP_GPS/GPS.o
%% libraries/AP_IMU/AP_IMU_Oilpan.o
%% libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.o
-In file included from /root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
+In file included from /root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
%% libraries/AP_OpticalFlow/AP_OpticalFlow.o
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
%% libraries/AP_RangeFinder/RangeFinder.o
%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
+In file included from /root/apm/ardupilot-mega/libraries/DataFlash/DataFlash.cpp:35:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
%% libraries/FastSerial/BetterStream.o
@@ -215,141 +212,6 @@ In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wi
from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
%% arduino/core.a
-%% ArduCopterMega.elf
-%% ArduCopterMega.eep
-%% ArduCopterMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-
-%%%% Making all in ArduPilotMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
-%% ArduPilotMega.cpp
-%% ArduPilotMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduPilotMega/ArduPilotMega.pde:32:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-autogenerated:63: warning: 'void add_altitude_data(long unsigned int, long int)' declared 'static' but never defined
-autogenerated:64: warning: 'void recalc_climb_rate()' declared 'static' but never defined
-autogenerated:65: warning: 'void print_climb_debug_info()' declared 'static' but never defined
-autogenerated:126: warning: 'void low_battery_event()' declared 'static' but never defined
-%% libraries/APM_BMP085/APM_BMP085.o
-%% libraries/APM_RC/APM_RC.o
-%% libraries/AP_ADC/AP_ADC_ADS7844.o
-%% libraries/AP_ADC/AP_ADC.o
-%% libraries/AP_ADC/AP_ADC_HIL.o
-%% libraries/AP_Common/AP_Common.o
-%% libraries/AP_Common/AP_Loop.o
-%% libraries/AP_Common/AP_MetaClass.o
-%% libraries/AP_Common/AP_Var.o
-%% libraries/AP_Common/AP_Var_menufuncs.o
-%% libraries/AP_Common/c++.o
-%% libraries/AP_Common/menu.o
-%% libraries/AP_Compass/AP_Compass_HIL.o
-%% libraries/AP_Compass/AP_Compass_HMC5843.o
-%% libraries/AP_Compass/Compass.o
-%% libraries/AP_DCM/AP_DCM.o
-%% libraries/AP_DCM/AP_DCM_HIL.o
-%% libraries/AP_GPS/AP_GPS_406.o
-%% libraries/AP_GPS/AP_GPS_Auto.o
-%% libraries/AP_GPS/AP_GPS_HIL.o
-%% libraries/AP_GPS/AP_GPS_IMU.o
-%% libraries/AP_GPS/AP_GPS_MTK16.o
-%% libraries/AP_GPS/AP_GPS_MTK.o
-%% libraries/AP_GPS/AP_GPS_NMEA.o
-%% libraries/AP_GPS/AP_GPS_SIRF.o
-%% libraries/AP_GPS/AP_GPS_UBLOX.o
-%% libraries/AP_GPS/GPS.o
-%% libraries/AP_IMU/AP_IMU_Oilpan.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
-%% libraries/AP_RangeFinder/RangeFinder.o
-%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/FastSerial/BetterStream.o
-%% libraries/FastSerial/FastSerial.o
-%% libraries/FastSerial/vprintf.o
-%% libraries/GCS_MAVLink/GCS_MAVLink.o
-%% libraries/ModeFilter/ModeFilter.o
-%% libraries/PID/PID.o
-%% libraries/RC_Channel/RC_Channel.o
-%% libraries/memcheck/memcheck.o
-%% libraries/FastSerial/ftoa_engine.o
-%% libraries/FastSerial/ultoa_invert.o
-%% libraries/SPI/SPI.o
-In file included from /usr/local/share/arduino/libraries/SPI/SPI.cpp:12:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/Wire/Wire.o
-%% libraries/Wire/utility/twi.o
-cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C
-%% arduino/HardwareSerial.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/HardwareSerial.cpp:28:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/main.o
-%% arduino/Print.o
-%% arduino/Tone.o
-/usr/local/share/arduino/hardware/arduino/cores/arduino/Tone.cpp:93: warning: only initialized variables can be placed into program memory area
-%% arduino/WMath.o
-%% arduino/WString.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:26:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:84: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:85: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:86: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:87: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:88: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:89: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:90: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:91: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:93: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:94: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:95: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:100: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:101: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:102: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:103: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:104: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:105: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:106: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:107: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:109: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:110: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:111: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:116: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:117: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:118: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:119: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:120: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:121: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:122: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:123: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:125: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:126: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:127: warning: initialization makes integer from pointer without a cast
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/WInterrupts.c:34:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_analog.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_digital.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_pulse.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/core.a
-%% ArduPilotMega.elf
-%% ArduPilotMega.eep
-%% ArduPilotMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
+%% ArduCopter.elf
+%% ArduCopter.eep
+%% ArduCopter.hex
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt
index 4d5ae12427..49251a6ae6 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt
@@ -96,6 +96,7 @@
00000004 d scaleLongUp
00000004 b sin_pitch_y
00000004 b wp_distance
+00000004 b circle_angle
00000004 b current_amps
00000004 b gps_base_alt
00000004 b original_alt
@@ -327,7 +328,6 @@
0000000e V Parameters::Parameters()::__c
0000000f b current_loc
0000000f b next_command
-0000000f r __menu_name__main_menu
0000000f b home
0000000f b next_WP
0000000f b prev_WP
@@ -382,6 +382,7 @@
00000016 r init_ardupilot()::__c
00000016 r GCS_MAVLINK::update()::__c
00000016 B sonar
+00000017 r __menu_name__main_menu
00000018 W AP_VarT::serialize(void*, unsigned int) const
00000018 b mavlink_get_channel_status::m_mavlink_status
00000019 r GCS_MAVLINK::update()::__c
@@ -596,4 +597,4 @@
000008e4 t process_next_command()
000011be t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int)
00001494 T GCS_MAVLINK::handleMessage(__mavlink_message*)
-00001a6a T loop
+0000194a T loop
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.build.log
index 5d0b2c5154..f9ac117a10 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.build.log
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.build.log
@@ -1,13 +1,9 @@
-
-%%%% Making all in ArduCopterMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-%% ArduCopterMega.cpp
-%% ArduCopterMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:53:
+%% ArduCopter.cpp
+%% ArduCopter.o
+In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:53:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:1412: warning: 'void tuning()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:1398: warning: 'void tuning()' defined but not used
autogenerated:34: warning: 'int alt_hold_velocity()' declared 'static' but never defined
autogenerated:86: warning: 'void acknowledge(byte, byte, byte)' declared 'static' but never defined
autogenerated:87: warning: 'void send_message(byte)' declared 'static' but never defined
@@ -23,22 +19,23 @@ autogenerated:70: warning: 'long int convert_to_dec(float)' declared 'static' bu
autogenerated:135: warning: 'void Log_Write_Raw()' declared 'static' but never defined
autogenerated:139: warning: 'void Log_Write_Optflow()' declared 'static' but never defined
autogenerated:141: warning: 'void Log_Write_Control_Tuning()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/Log.pde:760: warning: 'void Log_Write_Attitude()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/Log.pde:760: warning: 'void Log_Write_Attitude()' defined but not used
autogenerated:150: warning: 'void decrement_WP_index()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/events.pde:46: warning: 'void low_battery_event()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/events.pde:46: warning: 'void low_battery_event()' defined but not used
autogenerated:210: warning: 'void heli_init_swash()' declared 'static' but never defined
autogenerated:211: warning: 'void heli_move_servos_to_mid()' declared 'static' but never defined
autogenerated:212: warning: 'void heli_move_swash(int, int, int, int)' declared 'static' but never defined
autogenerated:235: warning: 'void debug_motors()' declared 'static' but never defined
autogenerated:250: warning: 'void calc_altitude_smoothing_error()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:212: warning: 'void trim_yaw()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:159: warning: 'int get_loiter_angle()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:212: warning: 'void trim_yaw()' defined but not used
autogenerated:268: warning: 'void readCommands()' declared 'static' but never defined
autogenerated:269: warning: 'void parseCommand(char*)' declared 'static' but never defined
autogenerated:270: warning: 'void ReadSCP1000()' declared 'static' but never defined
@@ -51,22 +48,22 @@ autogenerated:286: warning: 'void report_heli()' declared 'static' but never def
autogenerated:287: warning: 'void report_gyro()' declared 'static' but never defined
autogenerated:295: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined
autogenerated:296: warning: 'int read_num_from_serial()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
autogenerated:310: warning: 'void init_optflow()' declared 'static' but never defined
autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/test.pde:1040: warning: 'void print_motor_out()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:353: warning: 'old_altitude' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:371: warning: 'abs_pressure' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:372: warning: 'ground_pressure' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:373: warning: 'ground_temperature' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:378: warning: 'baro_alt' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:442: warning: 'undo_event' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:448: warning: 'condition_rate' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:462: warning: 'simple_WP' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:467: warning: 'optflow_offset' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:468: warning: 'new_location' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/test.pde:13: warning: 'int8_t test_adc(uint8_t, const Menu::arg*)' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/test.pde:24: warning: 'int8_t test_baro(uint8_t, const Menu::arg*)' declared 'static' but never defined
+/root/apm/ardupilot-mega/ArduCopter/test.pde:1040: warning: 'void print_motor_out()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:353: warning: 'old_altitude' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:371: warning: 'abs_pressure' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:372: warning: 'ground_pressure' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:373: warning: 'ground_temperature' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:378: warning: 'baro_alt' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:442: warning: 'undo_event' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:448: warning: 'condition_rate' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:462: warning: 'simple_WP' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:467: warning: 'optflow_offset' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:468: warning: 'new_location' 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:24: warning: 'int8_t test_baro(uint8_t, const Menu::arg*)' declared 'static' but never defined
%% libraries/APM_BMP085/APM_BMP085.o
%% libraries/APM_PI/APM_PI.o
%% libraries/APM_RC/APM_RC.o
@@ -97,41 +94,41 @@ autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never de
%% libraries/AP_GPS/GPS.o
%% libraries/AP_IMU/AP_IMU_Oilpan.o
%% libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.o
-In file included from /root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
+In file included from /root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
%% libraries/AP_OpticalFlow/AP_OpticalFlow.o
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
%% libraries/AP_RangeFinder/RangeFinder.o
%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
+In file included from /root/apm/ardupilot-mega/libraries/DataFlash/DataFlash.cpp:35:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
%% libraries/FastSerial/BetterStream.o
@@ -215,141 +212,6 @@ In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wi
from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
%% arduino/core.a
-%% ArduCopterMega.elf
-%% ArduCopterMega.eep
-%% ArduCopterMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-
-%%%% Making all in ArduPilotMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
-%% ArduPilotMega.cpp
-%% ArduPilotMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduPilotMega/ArduPilotMega.pde:32:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-autogenerated:63: warning: 'void add_altitude_data(long unsigned int, long int)' declared 'static' but never defined
-autogenerated:64: warning: 'void recalc_climb_rate()' declared 'static' but never defined
-autogenerated:65: warning: 'void print_climb_debug_info()' declared 'static' but never defined
-autogenerated:126: warning: 'void low_battery_event()' declared 'static' but never defined
-%% libraries/APM_BMP085/APM_BMP085.o
-%% libraries/APM_RC/APM_RC.o
-%% libraries/AP_ADC/AP_ADC_ADS7844.o
-%% libraries/AP_ADC/AP_ADC.o
-%% libraries/AP_ADC/AP_ADC_HIL.o
-%% libraries/AP_Common/AP_Common.o
-%% libraries/AP_Common/AP_Loop.o
-%% libraries/AP_Common/AP_MetaClass.o
-%% libraries/AP_Common/AP_Var.o
-%% libraries/AP_Common/AP_Var_menufuncs.o
-%% libraries/AP_Common/c++.o
-%% libraries/AP_Common/menu.o
-%% libraries/AP_Compass/AP_Compass_HIL.o
-%% libraries/AP_Compass/AP_Compass_HMC5843.o
-%% libraries/AP_Compass/Compass.o
-%% libraries/AP_DCM/AP_DCM.o
-%% libraries/AP_DCM/AP_DCM_HIL.o
-%% libraries/AP_GPS/AP_GPS_406.o
-%% libraries/AP_GPS/AP_GPS_Auto.o
-%% libraries/AP_GPS/AP_GPS_HIL.o
-%% libraries/AP_GPS/AP_GPS_IMU.o
-%% libraries/AP_GPS/AP_GPS_MTK16.o
-%% libraries/AP_GPS/AP_GPS_MTK.o
-%% libraries/AP_GPS/AP_GPS_NMEA.o
-%% libraries/AP_GPS/AP_GPS_SIRF.o
-%% libraries/AP_GPS/AP_GPS_UBLOX.o
-%% libraries/AP_GPS/GPS.o
-%% libraries/AP_IMU/AP_IMU_Oilpan.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
-%% libraries/AP_RangeFinder/RangeFinder.o
-%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/FastSerial/BetterStream.o
-%% libraries/FastSerial/FastSerial.o
-%% libraries/FastSerial/vprintf.o
-%% libraries/GCS_MAVLink/GCS_MAVLink.o
-%% libraries/ModeFilter/ModeFilter.o
-%% libraries/PID/PID.o
-%% libraries/RC_Channel/RC_Channel.o
-%% libraries/memcheck/memcheck.o
-%% libraries/FastSerial/ftoa_engine.o
-%% libraries/FastSerial/ultoa_invert.o
-%% libraries/SPI/SPI.o
-In file included from /usr/local/share/arduino/libraries/SPI/SPI.cpp:12:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/Wire/Wire.o
-%% libraries/Wire/utility/twi.o
-cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C
-%% arduino/HardwareSerial.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/HardwareSerial.cpp:28:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/main.o
-%% arduino/Print.o
-%% arduino/Tone.o
-/usr/local/share/arduino/hardware/arduino/cores/arduino/Tone.cpp:93: warning: only initialized variables can be placed into program memory area
-%% arduino/WMath.o
-%% arduino/WString.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:26:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:84: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:85: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:86: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:87: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:88: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:89: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:90: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:91: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:93: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:94: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:95: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:100: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:101: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:102: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:103: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:104: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:105: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:106: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:107: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:109: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:110: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:111: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:116: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:117: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:118: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:119: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:120: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:121: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:122: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:123: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:125: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:126: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:127: warning: initialization makes integer from pointer without a cast
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/WInterrupts.c:34:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_analog.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_digital.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_pulse.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/core.a
-%% ArduPilotMega.elf
-%% ArduPilotMega.eep
-%% ArduPilotMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
+%% ArduCopter.elf
+%% ArduCopter.eep
+%% ArduCopter.hex
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt
index 93350c4a38..77b38118ab 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt
@@ -96,6 +96,7 @@
00000004 d scaleLongUp
00000004 b sin_pitch_y
00000004 b wp_distance
+00000004 b circle_angle
00000004 b current_amps
00000004 b gps_base_alt
00000004 b original_alt
@@ -327,7 +328,6 @@
0000000e V Parameters::Parameters()::__c
0000000f b current_loc
0000000f b next_command
-0000000f r __menu_name__main_menu
0000000f b home
0000000f b next_WP
0000000f b prev_WP
@@ -382,6 +382,7 @@
00000016 r init_ardupilot()::__c
00000016 r GCS_MAVLINK::update()::__c
00000016 B sonar
+00000017 r __menu_name__main_menu
00000018 W AP_VarT::serialize(void*, unsigned int) const
00000018 b mavlink_get_channel_status::m_mavlink_status
00000019 r GCS_MAVLINK::update()::__c
@@ -596,4 +597,4 @@
000008e4 t process_next_command()
000011be t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int)
00001494 T GCS_MAVLINK::handleMessage(__mavlink_message*)
-00001a68 T loop
+00001948 T loop
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.build.log
index a14f53e7d7..6d390dc9bd 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.build.log
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.build.log
@@ -1,13 +1,9 @@
-
-%%%% Making all in ArduCopterMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-%% ArduCopterMega.cpp
-%% ArduCopterMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:53:
+%% ArduCopter.cpp
+%% ArduCopter.o
+In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:53:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:1412: warning: 'void tuning()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:1398: warning: 'void tuning()' defined but not used
autogenerated:34: warning: 'int alt_hold_velocity()' declared 'static' but never defined
autogenerated:86: warning: 'void acknowledge(byte, byte, byte)' declared 'static' but never defined
autogenerated:87: warning: 'void send_message(byte)' declared 'static' but never defined
@@ -22,39 +18,40 @@ autogenerated:97: warning: 'void print_waypoints()' declared 'static' but never
autogenerated:70: warning: 'long int convert_to_dec(float)' declared 'static' but never defined
autogenerated:139: warning: 'void Log_Write_Optflow()' declared 'static' but never defined
autogenerated:150: warning: 'void decrement_WP_index()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/events.pde:46: warning: 'void low_battery_event()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/events.pde:46: warning: 'void low_battery_event()' defined but not used
autogenerated:210: warning: 'void heli_init_swash()' declared 'static' but never defined
autogenerated:211: warning: 'void heli_move_servos_to_mid()' declared 'static' but never defined
autogenerated:212: warning: 'void heli_move_swash(int, int, int, int)' declared 'static' but never defined
autogenerated:235: warning: 'void debug_motors()' declared 'static' but never defined
autogenerated:250: warning: 'void calc_altitude_smoothing_error()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:212: warning: 'void trim_yaw()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:159: warning: 'int get_loiter_angle()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:212: warning: 'void trim_yaw()' defined but not used
autogenerated:268: warning: 'void readCommands()' declared 'static' but never defined
autogenerated:269: warning: 'void parseCommand(char*)' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:6: warning: 'void ReadSCP1000()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:6: warning: 'void ReadSCP1000()' defined but not used
autogenerated:272: warning: 'long int read_baro_filtered()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
autogenerated:286: warning: 'void report_heli()' declared 'static' but never defined
autogenerated:287: warning: 'void report_gyro()' declared 'static' but never defined
autogenerated:295: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined
autogenerated:296: warning: 'int read_num_from_serial()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
autogenerated:310: warning: 'void init_optflow()' declared 'static' but never defined
autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/test.pde:1040: warning: 'void print_motor_out()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:442: warning: 'undo_event' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:448: warning: 'condition_rate' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:462: warning: 'simple_WP' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:467: warning: 'optflow_offset' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:468: warning: 'new_location' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/test.pde:1040: warning: 'void print_motor_out()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:442: warning: 'undo_event' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:448: warning: 'condition_rate' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:462: warning: 'simple_WP' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:467: warning: 'optflow_offset' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:468: warning: 'new_location' defined but not used
%% libraries/APM_BMP085/APM_BMP085.o
%% libraries/APM_PI/APM_PI.o
%% libraries/APM_RC/APM_RC.o
@@ -85,41 +82,41 @@ autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never de
%% libraries/AP_GPS/GPS.o
%% libraries/AP_IMU/AP_IMU_Oilpan.o
%% libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.o
-In file included from /root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
+In file included from /root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
%% libraries/AP_OpticalFlow/AP_OpticalFlow.o
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
%% libraries/AP_RangeFinder/RangeFinder.o
%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
+In file included from /root/apm/ardupilot-mega/libraries/DataFlash/DataFlash.cpp:35:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
%% libraries/FastSerial/BetterStream.o
@@ -203,141 +200,6 @@ In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wi
from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
%% arduino/core.a
-%% ArduCopterMega.elf
-%% ArduCopterMega.eep
-%% ArduCopterMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-
-%%%% Making all in ArduPilotMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
-%% ArduPilotMega.cpp
-%% ArduPilotMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduPilotMega/ArduPilotMega.pde:32:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-autogenerated:63: warning: 'void add_altitude_data(long unsigned int, long int)' declared 'static' but never defined
-autogenerated:64: warning: 'void recalc_climb_rate()' declared 'static' but never defined
-autogenerated:65: warning: 'void print_climb_debug_info()' declared 'static' but never defined
-autogenerated:126: warning: 'void low_battery_event()' declared 'static' but never defined
-%% libraries/APM_BMP085/APM_BMP085.o
-%% libraries/APM_RC/APM_RC.o
-%% libraries/AP_ADC/AP_ADC_ADS7844.o
-%% libraries/AP_ADC/AP_ADC.o
-%% libraries/AP_ADC/AP_ADC_HIL.o
-%% libraries/AP_Common/AP_Common.o
-%% libraries/AP_Common/AP_Loop.o
-%% libraries/AP_Common/AP_MetaClass.o
-%% libraries/AP_Common/AP_Var.o
-%% libraries/AP_Common/AP_Var_menufuncs.o
-%% libraries/AP_Common/c++.o
-%% libraries/AP_Common/menu.o
-%% libraries/AP_Compass/AP_Compass_HIL.o
-%% libraries/AP_Compass/AP_Compass_HMC5843.o
-%% libraries/AP_Compass/Compass.o
-%% libraries/AP_DCM/AP_DCM.o
-%% libraries/AP_DCM/AP_DCM_HIL.o
-%% libraries/AP_GPS/AP_GPS_406.o
-%% libraries/AP_GPS/AP_GPS_Auto.o
-%% libraries/AP_GPS/AP_GPS_HIL.o
-%% libraries/AP_GPS/AP_GPS_IMU.o
-%% libraries/AP_GPS/AP_GPS_MTK16.o
-%% libraries/AP_GPS/AP_GPS_MTK.o
-%% libraries/AP_GPS/AP_GPS_NMEA.o
-%% libraries/AP_GPS/AP_GPS_SIRF.o
-%% libraries/AP_GPS/AP_GPS_UBLOX.o
-%% libraries/AP_GPS/GPS.o
-%% libraries/AP_IMU/AP_IMU_Oilpan.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
-%% libraries/AP_RangeFinder/RangeFinder.o
-%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/FastSerial/BetterStream.o
-%% libraries/FastSerial/FastSerial.o
-%% libraries/FastSerial/vprintf.o
-%% libraries/GCS_MAVLink/GCS_MAVLink.o
-%% libraries/ModeFilter/ModeFilter.o
-%% libraries/PID/PID.o
-%% libraries/RC_Channel/RC_Channel.o
-%% libraries/memcheck/memcheck.o
-%% libraries/FastSerial/ftoa_engine.o
-%% libraries/FastSerial/ultoa_invert.o
-%% libraries/SPI/SPI.o
-In file included from /usr/local/share/arduino/libraries/SPI/SPI.cpp:12:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/Wire/Wire.o
-%% libraries/Wire/utility/twi.o
-cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C
-%% arduino/HardwareSerial.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/HardwareSerial.cpp:28:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/main.o
-%% arduino/Print.o
-%% arduino/Tone.o
-/usr/local/share/arduino/hardware/arduino/cores/arduino/Tone.cpp:93: warning: only initialized variables can be placed into program memory area
-%% arduino/WMath.o
-%% arduino/WString.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:26:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:84: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:85: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:86: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:87: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:88: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:89: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:90: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:91: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:93: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:94: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:95: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:100: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:101: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:102: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:103: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:104: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:105: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:106: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:107: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:109: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:110: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:111: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:116: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:117: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:118: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:119: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:120: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:121: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:122: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:123: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:125: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:126: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:127: warning: initialization makes integer from pointer without a cast
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/WInterrupts.c:34:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_analog.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_digital.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_pulse.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/core.a
-%% ArduPilotMega.elf
-%% ArduPilotMega.eep
-%% ArduPilotMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
+%% ArduCopter.elf
+%% ArduCopter.eep
+%% ArduCopter.hex
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt
index 906de7c8d8..d880bfc7ae 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt
@@ -97,6 +97,7 @@
00000004 b sin_pitch_y
00000004 b wp_distance
00000004 b abs_pressure
+00000004 b circle_angle
00000004 b current_amps
00000004 b old_altitude
00000004 b original_alt
@@ -329,7 +330,6 @@
0000000e V Parameters::Parameters()::__c
0000000f b current_loc
0000000f b next_command
-0000000f r __menu_name__main_menu
0000000f b home
0000000f b next_WP
0000000f b prev_WP
@@ -383,6 +383,7 @@
00000016 r init_ardupilot()::__c
00000016 r GCS_MAVLINK::update()::__c
00000016 B sonar
+00000017 r __menu_name__main_menu
00000018 t setup_accel(unsigned char, Menu::arg const*)
00000018 W AP_VarT::serialize(void*, unsigned int) const
00000018 b mavlink_get_channel_status::m_mavlink_status
@@ -608,4 +609,4 @@
000008e4 t process_next_command()
000011d8 T GCS_MAVLINK::handleMessage(__mavlink_message*)
000017d0 t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int)
-00001ff8 T loop
+00001ece T loop
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.build.log
index a14f53e7d7..6d390dc9bd 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.build.log
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.build.log
@@ -1,13 +1,9 @@
-
-%%%% Making all in ArduCopterMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-%% ArduCopterMega.cpp
-%% ArduCopterMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:53:
+%% ArduCopter.cpp
+%% ArduCopter.o
+In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:53:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:1412: warning: 'void tuning()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:1398: warning: 'void tuning()' defined but not used
autogenerated:34: warning: 'int alt_hold_velocity()' declared 'static' but never defined
autogenerated:86: warning: 'void acknowledge(byte, byte, byte)' declared 'static' but never defined
autogenerated:87: warning: 'void send_message(byte)' declared 'static' but never defined
@@ -22,39 +18,40 @@ autogenerated:97: warning: 'void print_waypoints()' declared 'static' but never
autogenerated:70: warning: 'long int convert_to_dec(float)' declared 'static' but never defined
autogenerated:139: warning: 'void Log_Write_Optflow()' declared 'static' but never defined
autogenerated:150: warning: 'void decrement_WP_index()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/events.pde:46: warning: 'void low_battery_event()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/events.pde:46: warning: 'void low_battery_event()' defined but not used
autogenerated:210: warning: 'void heli_init_swash()' declared 'static' but never defined
autogenerated:211: warning: 'void heli_move_servos_to_mid()' declared 'static' but never defined
autogenerated:212: warning: 'void heli_move_swash(int, int, int, int)' declared 'static' but never defined
autogenerated:235: warning: 'void debug_motors()' declared 'static' but never defined
autogenerated:250: warning: 'void calc_altitude_smoothing_error()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:212: warning: 'void trim_yaw()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:159: warning: 'int get_loiter_angle()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:212: warning: 'void trim_yaw()' defined but not used
autogenerated:268: warning: 'void readCommands()' declared 'static' but never defined
autogenerated:269: warning: 'void parseCommand(char*)' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:6: warning: 'void ReadSCP1000()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:6: warning: 'void ReadSCP1000()' defined but not used
autogenerated:272: warning: 'long int read_baro_filtered()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
autogenerated:286: warning: 'void report_heli()' declared 'static' but never defined
autogenerated:287: warning: 'void report_gyro()' declared 'static' but never defined
autogenerated:295: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined
autogenerated:296: warning: 'int read_num_from_serial()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
autogenerated:310: warning: 'void init_optflow()' declared 'static' but never defined
autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/test.pde:1040: warning: 'void print_motor_out()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:442: warning: 'undo_event' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:448: warning: 'condition_rate' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:462: warning: 'simple_WP' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:467: warning: 'optflow_offset' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:468: warning: 'new_location' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/test.pde:1040: warning: 'void print_motor_out()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:442: warning: 'undo_event' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:448: warning: 'condition_rate' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:462: warning: 'simple_WP' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:467: warning: 'optflow_offset' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:468: warning: 'new_location' defined but not used
%% libraries/APM_BMP085/APM_BMP085.o
%% libraries/APM_PI/APM_PI.o
%% libraries/APM_RC/APM_RC.o
@@ -85,41 +82,41 @@ autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never de
%% libraries/AP_GPS/GPS.o
%% libraries/AP_IMU/AP_IMU_Oilpan.o
%% libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.o
-In file included from /root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
+In file included from /root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
%% libraries/AP_OpticalFlow/AP_OpticalFlow.o
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
%% libraries/AP_RangeFinder/RangeFinder.o
%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
+In file included from /root/apm/ardupilot-mega/libraries/DataFlash/DataFlash.cpp:35:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
%% libraries/FastSerial/BetterStream.o
@@ -203,141 +200,6 @@ In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wi
from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
%% arduino/core.a
-%% ArduCopterMega.elf
-%% ArduCopterMega.eep
-%% ArduCopterMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-
-%%%% Making all in ArduPilotMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
-%% ArduPilotMega.cpp
-%% ArduPilotMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduPilotMega/ArduPilotMega.pde:32:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-autogenerated:63: warning: 'void add_altitude_data(long unsigned int, long int)' declared 'static' but never defined
-autogenerated:64: warning: 'void recalc_climb_rate()' declared 'static' but never defined
-autogenerated:65: warning: 'void print_climb_debug_info()' declared 'static' but never defined
-autogenerated:126: warning: 'void low_battery_event()' declared 'static' but never defined
-%% libraries/APM_BMP085/APM_BMP085.o
-%% libraries/APM_RC/APM_RC.o
-%% libraries/AP_ADC/AP_ADC_ADS7844.o
-%% libraries/AP_ADC/AP_ADC.o
-%% libraries/AP_ADC/AP_ADC_HIL.o
-%% libraries/AP_Common/AP_Common.o
-%% libraries/AP_Common/AP_Loop.o
-%% libraries/AP_Common/AP_MetaClass.o
-%% libraries/AP_Common/AP_Var.o
-%% libraries/AP_Common/AP_Var_menufuncs.o
-%% libraries/AP_Common/c++.o
-%% libraries/AP_Common/menu.o
-%% libraries/AP_Compass/AP_Compass_HIL.o
-%% libraries/AP_Compass/AP_Compass_HMC5843.o
-%% libraries/AP_Compass/Compass.o
-%% libraries/AP_DCM/AP_DCM.o
-%% libraries/AP_DCM/AP_DCM_HIL.o
-%% libraries/AP_GPS/AP_GPS_406.o
-%% libraries/AP_GPS/AP_GPS_Auto.o
-%% libraries/AP_GPS/AP_GPS_HIL.o
-%% libraries/AP_GPS/AP_GPS_IMU.o
-%% libraries/AP_GPS/AP_GPS_MTK16.o
-%% libraries/AP_GPS/AP_GPS_MTK.o
-%% libraries/AP_GPS/AP_GPS_NMEA.o
-%% libraries/AP_GPS/AP_GPS_SIRF.o
-%% libraries/AP_GPS/AP_GPS_UBLOX.o
-%% libraries/AP_GPS/GPS.o
-%% libraries/AP_IMU/AP_IMU_Oilpan.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
-%% libraries/AP_RangeFinder/RangeFinder.o
-%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/FastSerial/BetterStream.o
-%% libraries/FastSerial/FastSerial.o
-%% libraries/FastSerial/vprintf.o
-%% libraries/GCS_MAVLink/GCS_MAVLink.o
-%% libraries/ModeFilter/ModeFilter.o
-%% libraries/PID/PID.o
-%% libraries/RC_Channel/RC_Channel.o
-%% libraries/memcheck/memcheck.o
-%% libraries/FastSerial/ftoa_engine.o
-%% libraries/FastSerial/ultoa_invert.o
-%% libraries/SPI/SPI.o
-In file included from /usr/local/share/arduino/libraries/SPI/SPI.cpp:12:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/Wire/Wire.o
-%% libraries/Wire/utility/twi.o
-cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C
-%% arduino/HardwareSerial.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/HardwareSerial.cpp:28:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/main.o
-%% arduino/Print.o
-%% arduino/Tone.o
-/usr/local/share/arduino/hardware/arduino/cores/arduino/Tone.cpp:93: warning: only initialized variables can be placed into program memory area
-%% arduino/WMath.o
-%% arduino/WString.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:26:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:84: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:85: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:86: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:87: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:88: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:89: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:90: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:91: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:93: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:94: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:95: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:100: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:101: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:102: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:103: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:104: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:105: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:106: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:107: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:109: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:110: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:111: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:116: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:117: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:118: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:119: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:120: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:121: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:122: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:123: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:125: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:126: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:127: warning: initialization makes integer from pointer without a cast
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/WInterrupts.c:34:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_analog.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_digital.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_pulse.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/core.a
-%% ArduPilotMega.elf
-%% ArduPilotMega.eep
-%% ArduPilotMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
+%% ArduCopter.elf
+%% ArduCopter.eep
+%% ArduCopter.hex
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt
index 5f38b3c4f2..d06cc7853f 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt
@@ -97,6 +97,7 @@
00000004 b sin_pitch_y
00000004 b wp_distance
00000004 b abs_pressure
+00000004 b circle_angle
00000004 b current_amps
00000004 b old_altitude
00000004 b original_alt
@@ -329,7 +330,6 @@
0000000e V Parameters::Parameters()::__c
0000000f b current_loc
0000000f b next_command
-0000000f r __menu_name__main_menu
0000000f b home
0000000f b next_WP
0000000f b prev_WP
@@ -383,6 +383,7 @@
00000016 r init_ardupilot()::__c
00000016 r GCS_MAVLINK::update()::__c
00000016 B sonar
+00000017 r __menu_name__main_menu
00000018 t setup_accel(unsigned char, Menu::arg const*)
00000018 W AP_VarT::serialize(void*, unsigned int) const
00000018 b mavlink_get_channel_status::m_mavlink_status
@@ -608,4 +609,4 @@
000008e4 t process_next_command()
000011d8 T GCS_MAVLINK::handleMessage(__mavlink_message*)
000017d0 t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int)
-00001ff6 T loop
+00001ecc T loop
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.build.log
index a14f53e7d7..6d390dc9bd 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.build.log
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.build.log
@@ -1,13 +1,9 @@
-
-%%%% Making all in ArduCopterMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-%% ArduCopterMega.cpp
-%% ArduCopterMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:53:
+%% ArduCopter.cpp
+%% ArduCopter.o
+In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:53:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:1412: warning: 'void tuning()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:1398: warning: 'void tuning()' defined but not used
autogenerated:34: warning: 'int alt_hold_velocity()' declared 'static' but never defined
autogenerated:86: warning: 'void acknowledge(byte, byte, byte)' declared 'static' but never defined
autogenerated:87: warning: 'void send_message(byte)' declared 'static' but never defined
@@ -22,39 +18,40 @@ autogenerated:97: warning: 'void print_waypoints()' declared 'static' but never
autogenerated:70: warning: 'long int convert_to_dec(float)' declared 'static' but never defined
autogenerated:139: warning: 'void Log_Write_Optflow()' declared 'static' but never defined
autogenerated:150: warning: 'void decrement_WP_index()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/events.pde:46: warning: 'void low_battery_event()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/events.pde:46: warning: 'void low_battery_event()' defined but not used
autogenerated:210: warning: 'void heli_init_swash()' declared 'static' but never defined
autogenerated:211: warning: 'void heli_move_servos_to_mid()' declared 'static' but never defined
autogenerated:212: warning: 'void heli_move_swash(int, int, int, int)' declared 'static' but never defined
autogenerated:235: warning: 'void debug_motors()' declared 'static' but never defined
autogenerated:250: warning: 'void calc_altitude_smoothing_error()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:212: warning: 'void trim_yaw()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:159: warning: 'int get_loiter_angle()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:212: warning: 'void trim_yaw()' defined but not used
autogenerated:268: warning: 'void readCommands()' declared 'static' but never defined
autogenerated:269: warning: 'void parseCommand(char*)' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:6: warning: 'void ReadSCP1000()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:6: warning: 'void ReadSCP1000()' defined but not used
autogenerated:272: warning: 'long int read_baro_filtered()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
autogenerated:286: warning: 'void report_heli()' declared 'static' but never defined
autogenerated:287: warning: 'void report_gyro()' declared 'static' but never defined
autogenerated:295: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined
autogenerated:296: warning: 'int read_num_from_serial()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
autogenerated:310: warning: 'void init_optflow()' declared 'static' but never defined
autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/test.pde:1040: warning: 'void print_motor_out()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:442: warning: 'undo_event' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:448: warning: 'condition_rate' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:462: warning: 'simple_WP' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:467: warning: 'optflow_offset' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:468: warning: 'new_location' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/test.pde:1040: warning: 'void print_motor_out()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:442: warning: 'undo_event' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:448: warning: 'condition_rate' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:462: warning: 'simple_WP' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:467: warning: 'optflow_offset' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:468: warning: 'new_location' defined but not used
%% libraries/APM_BMP085/APM_BMP085.o
%% libraries/APM_PI/APM_PI.o
%% libraries/APM_RC/APM_RC.o
@@ -85,41 +82,41 @@ autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never de
%% libraries/AP_GPS/GPS.o
%% libraries/AP_IMU/AP_IMU_Oilpan.o
%% libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.o
-In file included from /root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
+In file included from /root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
%% libraries/AP_OpticalFlow/AP_OpticalFlow.o
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
%% libraries/AP_RangeFinder/RangeFinder.o
%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
+In file included from /root/apm/ardupilot-mega/libraries/DataFlash/DataFlash.cpp:35:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
%% libraries/FastSerial/BetterStream.o
@@ -203,141 +200,6 @@ In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wi
from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
%% arduino/core.a
-%% ArduCopterMega.elf
-%% ArduCopterMega.eep
-%% ArduCopterMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-
-%%%% Making all in ArduPilotMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
-%% ArduPilotMega.cpp
-%% ArduPilotMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduPilotMega/ArduPilotMega.pde:32:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-autogenerated:63: warning: 'void add_altitude_data(long unsigned int, long int)' declared 'static' but never defined
-autogenerated:64: warning: 'void recalc_climb_rate()' declared 'static' but never defined
-autogenerated:65: warning: 'void print_climb_debug_info()' declared 'static' but never defined
-autogenerated:126: warning: 'void low_battery_event()' declared 'static' but never defined
-%% libraries/APM_BMP085/APM_BMP085.o
-%% libraries/APM_RC/APM_RC.o
-%% libraries/AP_ADC/AP_ADC_ADS7844.o
-%% libraries/AP_ADC/AP_ADC.o
-%% libraries/AP_ADC/AP_ADC_HIL.o
-%% libraries/AP_Common/AP_Common.o
-%% libraries/AP_Common/AP_Loop.o
-%% libraries/AP_Common/AP_MetaClass.o
-%% libraries/AP_Common/AP_Var.o
-%% libraries/AP_Common/AP_Var_menufuncs.o
-%% libraries/AP_Common/c++.o
-%% libraries/AP_Common/menu.o
-%% libraries/AP_Compass/AP_Compass_HIL.o
-%% libraries/AP_Compass/AP_Compass_HMC5843.o
-%% libraries/AP_Compass/Compass.o
-%% libraries/AP_DCM/AP_DCM.o
-%% libraries/AP_DCM/AP_DCM_HIL.o
-%% libraries/AP_GPS/AP_GPS_406.o
-%% libraries/AP_GPS/AP_GPS_Auto.o
-%% libraries/AP_GPS/AP_GPS_HIL.o
-%% libraries/AP_GPS/AP_GPS_IMU.o
-%% libraries/AP_GPS/AP_GPS_MTK16.o
-%% libraries/AP_GPS/AP_GPS_MTK.o
-%% libraries/AP_GPS/AP_GPS_NMEA.o
-%% libraries/AP_GPS/AP_GPS_SIRF.o
-%% libraries/AP_GPS/AP_GPS_UBLOX.o
-%% libraries/AP_GPS/GPS.o
-%% libraries/AP_IMU/AP_IMU_Oilpan.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
-%% libraries/AP_RangeFinder/RangeFinder.o
-%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/FastSerial/BetterStream.o
-%% libraries/FastSerial/FastSerial.o
-%% libraries/FastSerial/vprintf.o
-%% libraries/GCS_MAVLink/GCS_MAVLink.o
-%% libraries/ModeFilter/ModeFilter.o
-%% libraries/PID/PID.o
-%% libraries/RC_Channel/RC_Channel.o
-%% libraries/memcheck/memcheck.o
-%% libraries/FastSerial/ftoa_engine.o
-%% libraries/FastSerial/ultoa_invert.o
-%% libraries/SPI/SPI.o
-In file included from /usr/local/share/arduino/libraries/SPI/SPI.cpp:12:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/Wire/Wire.o
-%% libraries/Wire/utility/twi.o
-cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C
-%% arduino/HardwareSerial.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/HardwareSerial.cpp:28:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/main.o
-%% arduino/Print.o
-%% arduino/Tone.o
-/usr/local/share/arduino/hardware/arduino/cores/arduino/Tone.cpp:93: warning: only initialized variables can be placed into program memory area
-%% arduino/WMath.o
-%% arduino/WString.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:26:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:84: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:85: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:86: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:87: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:88: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:89: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:90: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:91: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:93: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:94: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:95: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:100: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:101: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:102: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:103: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:104: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:105: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:106: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:107: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:109: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:110: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:111: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:116: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:117: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:118: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:119: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:120: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:121: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:122: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:123: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:125: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:126: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:127: warning: initialization makes integer from pointer without a cast
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/WInterrupts.c:34:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_analog.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_digital.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_pulse.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/core.a
-%% ArduPilotMega.elf
-%% ArduPilotMega.eep
-%% ArduPilotMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
+%% ArduCopter.elf
+%% ArduCopter.eep
+%% ArduCopter.hex
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt
index 0c5025217b..0ab5cc71b9 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt
@@ -97,6 +97,7 @@
00000004 b sin_pitch_y
00000004 b wp_distance
00000004 b abs_pressure
+00000004 b circle_angle
00000004 b current_amps
00000004 b old_altitude
00000004 b original_alt
@@ -329,7 +330,6 @@
0000000e V Parameters::Parameters()::__c
0000000f b current_loc
0000000f b next_command
-0000000f r __menu_name__main_menu
0000000f b home
0000000f b next_WP
0000000f b prev_WP
@@ -383,6 +383,7 @@
00000016 r init_ardupilot()::__c
00000016 r GCS_MAVLINK::update()::__c
00000016 B sonar
+00000017 r __menu_name__main_menu
00000018 t setup_accel(unsigned char, Menu::arg const*)
00000018 W AP_VarT::serialize(void*, unsigned int) const
00000018 b mavlink_get_channel_status::m_mavlink_status
@@ -608,4 +609,4 @@
000008e4 t process_next_command()
000011d8 T GCS_MAVLINK::handleMessage(__mavlink_message*)
000017d0 t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int)
-00001f58 T loop
+00001e2e T loop
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.build.log
index a14f53e7d7..6d390dc9bd 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.build.log
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.build.log
@@ -1,13 +1,9 @@
-
-%%%% Making all in ArduCopterMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-%% ArduCopterMega.cpp
-%% ArduCopterMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:53:
+%% ArduCopter.cpp
+%% ArduCopter.o
+In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:53:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:1412: warning: 'void tuning()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:1398: warning: 'void tuning()' defined but not used
autogenerated:34: warning: 'int alt_hold_velocity()' declared 'static' but never defined
autogenerated:86: warning: 'void acknowledge(byte, byte, byte)' declared 'static' but never defined
autogenerated:87: warning: 'void send_message(byte)' declared 'static' but never defined
@@ -22,39 +18,40 @@ autogenerated:97: warning: 'void print_waypoints()' declared 'static' but never
autogenerated:70: warning: 'long int convert_to_dec(float)' declared 'static' but never defined
autogenerated:139: warning: 'void Log_Write_Optflow()' declared 'static' but never defined
autogenerated:150: warning: 'void decrement_WP_index()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/events.pde:46: warning: 'void low_battery_event()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/events.pde:46: warning: 'void low_battery_event()' defined but not used
autogenerated:210: warning: 'void heli_init_swash()' declared 'static' but never defined
autogenerated:211: warning: 'void heli_move_servos_to_mid()' declared 'static' but never defined
autogenerated:212: warning: 'void heli_move_swash(int, int, int, int)' declared 'static' but never defined
autogenerated:235: warning: 'void debug_motors()' declared 'static' but never defined
autogenerated:250: warning: 'void calc_altitude_smoothing_error()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:212: warning: 'void trim_yaw()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:159: warning: 'int get_loiter_angle()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:212: warning: 'void trim_yaw()' defined but not used
autogenerated:268: warning: 'void readCommands()' declared 'static' but never defined
autogenerated:269: warning: 'void parseCommand(char*)' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:6: warning: 'void ReadSCP1000()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:6: warning: 'void ReadSCP1000()' defined but not used
autogenerated:272: warning: 'long int read_baro_filtered()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
autogenerated:286: warning: 'void report_heli()' declared 'static' but never defined
autogenerated:287: warning: 'void report_gyro()' declared 'static' but never defined
autogenerated:295: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined
autogenerated:296: warning: 'int read_num_from_serial()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
autogenerated:310: warning: 'void init_optflow()' declared 'static' but never defined
autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/test.pde:1040: warning: 'void print_motor_out()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:442: warning: 'undo_event' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:448: warning: 'condition_rate' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:462: warning: 'simple_WP' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:467: warning: 'optflow_offset' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:468: warning: 'new_location' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/test.pde:1040: warning: 'void print_motor_out()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:442: warning: 'undo_event' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:448: warning: 'condition_rate' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:462: warning: 'simple_WP' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:467: warning: 'optflow_offset' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:468: warning: 'new_location' defined but not used
%% libraries/APM_BMP085/APM_BMP085.o
%% libraries/APM_PI/APM_PI.o
%% libraries/APM_RC/APM_RC.o
@@ -85,41 +82,41 @@ autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never de
%% libraries/AP_GPS/GPS.o
%% libraries/AP_IMU/AP_IMU_Oilpan.o
%% libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.o
-In file included from /root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
+In file included from /root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
%% libraries/AP_OpticalFlow/AP_OpticalFlow.o
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
%% libraries/AP_RangeFinder/RangeFinder.o
%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
+In file included from /root/apm/ardupilot-mega/libraries/DataFlash/DataFlash.cpp:35:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
%% libraries/FastSerial/BetterStream.o
@@ -203,141 +200,6 @@ In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wi
from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
%% arduino/core.a
-%% ArduCopterMega.elf
-%% ArduCopterMega.eep
-%% ArduCopterMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-
-%%%% Making all in ArduPilotMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
-%% ArduPilotMega.cpp
-%% ArduPilotMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduPilotMega/ArduPilotMega.pde:32:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-autogenerated:63: warning: 'void add_altitude_data(long unsigned int, long int)' declared 'static' but never defined
-autogenerated:64: warning: 'void recalc_climb_rate()' declared 'static' but never defined
-autogenerated:65: warning: 'void print_climb_debug_info()' declared 'static' but never defined
-autogenerated:126: warning: 'void low_battery_event()' declared 'static' but never defined
-%% libraries/APM_BMP085/APM_BMP085.o
-%% libraries/APM_RC/APM_RC.o
-%% libraries/AP_ADC/AP_ADC_ADS7844.o
-%% libraries/AP_ADC/AP_ADC.o
-%% libraries/AP_ADC/AP_ADC_HIL.o
-%% libraries/AP_Common/AP_Common.o
-%% libraries/AP_Common/AP_Loop.o
-%% libraries/AP_Common/AP_MetaClass.o
-%% libraries/AP_Common/AP_Var.o
-%% libraries/AP_Common/AP_Var_menufuncs.o
-%% libraries/AP_Common/c++.o
-%% libraries/AP_Common/menu.o
-%% libraries/AP_Compass/AP_Compass_HIL.o
-%% libraries/AP_Compass/AP_Compass_HMC5843.o
-%% libraries/AP_Compass/Compass.o
-%% libraries/AP_DCM/AP_DCM.o
-%% libraries/AP_DCM/AP_DCM_HIL.o
-%% libraries/AP_GPS/AP_GPS_406.o
-%% libraries/AP_GPS/AP_GPS_Auto.o
-%% libraries/AP_GPS/AP_GPS_HIL.o
-%% libraries/AP_GPS/AP_GPS_IMU.o
-%% libraries/AP_GPS/AP_GPS_MTK16.o
-%% libraries/AP_GPS/AP_GPS_MTK.o
-%% libraries/AP_GPS/AP_GPS_NMEA.o
-%% libraries/AP_GPS/AP_GPS_SIRF.o
-%% libraries/AP_GPS/AP_GPS_UBLOX.o
-%% libraries/AP_GPS/GPS.o
-%% libraries/AP_IMU/AP_IMU_Oilpan.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
-%% libraries/AP_RangeFinder/RangeFinder.o
-%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/FastSerial/BetterStream.o
-%% libraries/FastSerial/FastSerial.o
-%% libraries/FastSerial/vprintf.o
-%% libraries/GCS_MAVLink/GCS_MAVLink.o
-%% libraries/ModeFilter/ModeFilter.o
-%% libraries/PID/PID.o
-%% libraries/RC_Channel/RC_Channel.o
-%% libraries/memcheck/memcheck.o
-%% libraries/FastSerial/ftoa_engine.o
-%% libraries/FastSerial/ultoa_invert.o
-%% libraries/SPI/SPI.o
-In file included from /usr/local/share/arduino/libraries/SPI/SPI.cpp:12:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/Wire/Wire.o
-%% libraries/Wire/utility/twi.o
-cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C
-%% arduino/HardwareSerial.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/HardwareSerial.cpp:28:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/main.o
-%% arduino/Print.o
-%% arduino/Tone.o
-/usr/local/share/arduino/hardware/arduino/cores/arduino/Tone.cpp:93: warning: only initialized variables can be placed into program memory area
-%% arduino/WMath.o
-%% arduino/WString.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:26:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:84: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:85: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:86: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:87: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:88: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:89: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:90: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:91: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:93: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:94: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:95: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:100: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:101: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:102: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:103: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:104: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:105: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:106: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:107: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:109: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:110: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:111: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:116: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:117: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:118: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:119: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:120: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:121: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:122: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:123: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:125: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:126: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:127: warning: initialization makes integer from pointer without a cast
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/WInterrupts.c:34:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_analog.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_digital.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_pulse.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/core.a
-%% ArduPilotMega.elf
-%% ArduPilotMega.eep
-%% ArduPilotMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
+%% ArduCopter.elf
+%% ArduCopter.eep
+%% ArduCopter.hex
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt
index 521bd50f82..28a12d499f 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt
@@ -97,6 +97,7 @@
00000004 b sin_pitch_y
00000004 b wp_distance
00000004 b abs_pressure
+00000004 b circle_angle
00000004 b current_amps
00000004 b old_altitude
00000004 b original_alt
@@ -329,7 +330,6 @@
0000000e V Parameters::Parameters()::__c
0000000f b current_loc
0000000f b next_command
-0000000f r __menu_name__main_menu
0000000f b home
0000000f b next_WP
0000000f b prev_WP
@@ -383,6 +383,7 @@
00000016 r init_ardupilot()::__c
00000016 r GCS_MAVLINK::update()::__c
00000016 B sonar
+00000017 r __menu_name__main_menu
00000018 t setup_accel(unsigned char, Menu::arg const*)
00000018 W AP_VarT::serialize(void*, unsigned int) const
00000018 b mavlink_get_channel_status::m_mavlink_status
@@ -608,4 +609,4 @@
000008e4 t process_next_command()
000011d8 T GCS_MAVLINK::handleMessage(__mavlink_message*)
000017d0 t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int)
-00001f56 T loop
+00001e2c T loop
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.build.log
index a14f53e7d7..6d390dc9bd 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.build.log
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.build.log
@@ -1,13 +1,9 @@
-
-%%%% Making all in ArduCopterMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-%% ArduCopterMega.cpp
-%% ArduCopterMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:53:
+%% ArduCopter.cpp
+%% ArduCopter.o
+In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:53:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:1412: warning: 'void tuning()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:1398: warning: 'void tuning()' defined but not used
autogenerated:34: warning: 'int alt_hold_velocity()' declared 'static' but never defined
autogenerated:86: warning: 'void acknowledge(byte, byte, byte)' declared 'static' but never defined
autogenerated:87: warning: 'void send_message(byte)' declared 'static' but never defined
@@ -22,39 +18,40 @@ autogenerated:97: warning: 'void print_waypoints()' declared 'static' but never
autogenerated:70: warning: 'long int convert_to_dec(float)' declared 'static' but never defined
autogenerated:139: warning: 'void Log_Write_Optflow()' declared 'static' but never defined
autogenerated:150: warning: 'void decrement_WP_index()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/events.pde:46: warning: 'void low_battery_event()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/events.pde:46: warning: 'void low_battery_event()' defined but not used
autogenerated:210: warning: 'void heli_init_swash()' declared 'static' but never defined
autogenerated:211: warning: 'void heli_move_servos_to_mid()' declared 'static' but never defined
autogenerated:212: warning: 'void heli_move_swash(int, int, int, int)' declared 'static' but never defined
autogenerated:235: warning: 'void debug_motors()' declared 'static' but never defined
autogenerated:250: warning: 'void calc_altitude_smoothing_error()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:212: warning: 'void trim_yaw()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:159: warning: 'int get_loiter_angle()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:212: warning: 'void trim_yaw()' defined but not used
autogenerated:268: warning: 'void readCommands()' declared 'static' but never defined
autogenerated:269: warning: 'void parseCommand(char*)' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:6: warning: 'void ReadSCP1000()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:6: warning: 'void ReadSCP1000()' defined but not used
autogenerated:272: warning: 'long int read_baro_filtered()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
autogenerated:286: warning: 'void report_heli()' declared 'static' but never defined
autogenerated:287: warning: 'void report_gyro()' declared 'static' but never defined
autogenerated:295: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined
autogenerated:296: warning: 'int read_num_from_serial()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
autogenerated:310: warning: 'void init_optflow()' declared 'static' but never defined
autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/test.pde:1040: warning: 'void print_motor_out()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:442: warning: 'undo_event' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:448: warning: 'condition_rate' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:462: warning: 'simple_WP' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:467: warning: 'optflow_offset' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:468: warning: 'new_location' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/test.pde:1040: warning: 'void print_motor_out()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:442: warning: 'undo_event' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:448: warning: 'condition_rate' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:462: warning: 'simple_WP' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:467: warning: 'optflow_offset' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:468: warning: 'new_location' defined but not used
%% libraries/APM_BMP085/APM_BMP085.o
%% libraries/APM_PI/APM_PI.o
%% libraries/APM_RC/APM_RC.o
@@ -85,41 +82,41 @@ autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never de
%% libraries/AP_GPS/GPS.o
%% libraries/AP_IMU/AP_IMU_Oilpan.o
%% libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.o
-In file included from /root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
+In file included from /root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
%% libraries/AP_OpticalFlow/AP_OpticalFlow.o
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
%% libraries/AP_RangeFinder/RangeFinder.o
%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
+In file included from /root/apm/ardupilot-mega/libraries/DataFlash/DataFlash.cpp:35:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
%% libraries/FastSerial/BetterStream.o
@@ -203,141 +200,6 @@ In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wi
from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
%% arduino/core.a
-%% ArduCopterMega.elf
-%% ArduCopterMega.eep
-%% ArduCopterMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-
-%%%% Making all in ArduPilotMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
-%% ArduPilotMega.cpp
-%% ArduPilotMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduPilotMega/ArduPilotMega.pde:32:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-autogenerated:63: warning: 'void add_altitude_data(long unsigned int, long int)' declared 'static' but never defined
-autogenerated:64: warning: 'void recalc_climb_rate()' declared 'static' but never defined
-autogenerated:65: warning: 'void print_climb_debug_info()' declared 'static' but never defined
-autogenerated:126: warning: 'void low_battery_event()' declared 'static' but never defined
-%% libraries/APM_BMP085/APM_BMP085.o
-%% libraries/APM_RC/APM_RC.o
-%% libraries/AP_ADC/AP_ADC_ADS7844.o
-%% libraries/AP_ADC/AP_ADC.o
-%% libraries/AP_ADC/AP_ADC_HIL.o
-%% libraries/AP_Common/AP_Common.o
-%% libraries/AP_Common/AP_Loop.o
-%% libraries/AP_Common/AP_MetaClass.o
-%% libraries/AP_Common/AP_Var.o
-%% libraries/AP_Common/AP_Var_menufuncs.o
-%% libraries/AP_Common/c++.o
-%% libraries/AP_Common/menu.o
-%% libraries/AP_Compass/AP_Compass_HIL.o
-%% libraries/AP_Compass/AP_Compass_HMC5843.o
-%% libraries/AP_Compass/Compass.o
-%% libraries/AP_DCM/AP_DCM.o
-%% libraries/AP_DCM/AP_DCM_HIL.o
-%% libraries/AP_GPS/AP_GPS_406.o
-%% libraries/AP_GPS/AP_GPS_Auto.o
-%% libraries/AP_GPS/AP_GPS_HIL.o
-%% libraries/AP_GPS/AP_GPS_IMU.o
-%% libraries/AP_GPS/AP_GPS_MTK16.o
-%% libraries/AP_GPS/AP_GPS_MTK.o
-%% libraries/AP_GPS/AP_GPS_NMEA.o
-%% libraries/AP_GPS/AP_GPS_SIRF.o
-%% libraries/AP_GPS/AP_GPS_UBLOX.o
-%% libraries/AP_GPS/GPS.o
-%% libraries/AP_IMU/AP_IMU_Oilpan.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
-%% libraries/AP_RangeFinder/RangeFinder.o
-%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/FastSerial/BetterStream.o
-%% libraries/FastSerial/FastSerial.o
-%% libraries/FastSerial/vprintf.o
-%% libraries/GCS_MAVLink/GCS_MAVLink.o
-%% libraries/ModeFilter/ModeFilter.o
-%% libraries/PID/PID.o
-%% libraries/RC_Channel/RC_Channel.o
-%% libraries/memcheck/memcheck.o
-%% libraries/FastSerial/ftoa_engine.o
-%% libraries/FastSerial/ultoa_invert.o
-%% libraries/SPI/SPI.o
-In file included from /usr/local/share/arduino/libraries/SPI/SPI.cpp:12:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/Wire/Wire.o
-%% libraries/Wire/utility/twi.o
-cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C
-%% arduino/HardwareSerial.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/HardwareSerial.cpp:28:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/main.o
-%% arduino/Print.o
-%% arduino/Tone.o
-/usr/local/share/arduino/hardware/arduino/cores/arduino/Tone.cpp:93: warning: only initialized variables can be placed into program memory area
-%% arduino/WMath.o
-%% arduino/WString.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:26:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:84: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:85: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:86: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:87: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:88: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:89: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:90: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:91: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:93: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:94: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:95: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:100: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:101: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:102: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:103: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:104: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:105: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:106: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:107: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:109: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:110: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:111: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:116: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:117: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:118: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:119: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:120: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:121: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:122: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:123: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:125: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:126: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:127: warning: initialization makes integer from pointer without a cast
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/WInterrupts.c:34:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_analog.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_digital.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_pulse.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/core.a
-%% ArduPilotMega.elf
-%% ArduPilotMega.eep
-%% ArduPilotMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
+%% ArduCopter.elf
+%% ArduCopter.eep
+%% ArduCopter.hex
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt
index 8b670e8b55..b765d03870 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt
@@ -97,6 +97,7 @@
00000004 b sin_pitch_y
00000004 b wp_distance
00000004 b abs_pressure
+00000004 b circle_angle
00000004 b current_amps
00000004 b old_altitude
00000004 b original_alt
@@ -329,7 +330,6 @@
0000000e V Parameters::Parameters()::__c
0000000f b current_loc
0000000f b next_command
-0000000f r __menu_name__main_menu
0000000f b home
0000000f b next_WP
0000000f b prev_WP
@@ -383,6 +383,7 @@
00000016 r init_ardupilot()::__c
00000016 r GCS_MAVLINK::update()::__c
00000016 B sonar
+00000017 r __menu_name__main_menu
00000018 t setup_accel(unsigned char, Menu::arg const*)
00000018 W AP_VarT::serialize(void*, unsigned int) const
00000018 b mavlink_get_channel_status::m_mavlink_status
@@ -608,4 +609,4 @@
000008e4 t process_next_command()
000011d8 T GCS_MAVLINK::handleMessage(__mavlink_message*)
000017d0 t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int)
-00002038 T loop
+00001f0e T loop
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.build.log
index a14f53e7d7..6d390dc9bd 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.build.log
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.build.log
@@ -1,13 +1,9 @@
-
-%%%% Making all in ArduCopterMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-%% ArduCopterMega.cpp
-%% ArduCopterMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:53:
+%% ArduCopter.cpp
+%% ArduCopter.o
+In file included from /root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:53:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:1412: warning: 'void tuning()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:1398: warning: 'void tuning()' defined but not used
autogenerated:34: warning: 'int alt_hold_velocity()' declared 'static' but never defined
autogenerated:86: warning: 'void acknowledge(byte, byte, byte)' declared 'static' but never defined
autogenerated:87: warning: 'void send_message(byte)' declared 'static' but never defined
@@ -22,39 +18,40 @@ autogenerated:97: warning: 'void print_waypoints()' declared 'static' but never
autogenerated:70: warning: 'long int convert_to_dec(float)' declared 'static' but never defined
autogenerated:139: warning: 'void Log_Write_Optflow()' declared 'static' but never defined
autogenerated:150: warning: 'void decrement_WP_index()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/events.pde:46: warning: 'void low_battery_event()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands.pde:149: warning: 'Location get_LOITER_home_wp()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:301: warning: 'void do_loiter_turns()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/commands_logic.pde:427: warning: 'bool verify_loiter_unlim()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/events.pde:46: warning: 'void low_battery_event()' defined but not used
autogenerated:210: warning: 'void heli_init_swash()' declared 'static' but never defined
autogenerated:211: warning: 'void heli_move_servos_to_mid()' declared 'static' but never defined
autogenerated:212: warning: 'void heli_move_swash(int, int, int, int)' declared 'static' but never defined
autogenerated:235: warning: 'void debug_motors()' declared 'static' but never defined
autogenerated:250: warning: 'void calc_altitude_smoothing_error()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/radio.pde:212: warning: 'void trim_yaw()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:159: warning: 'int get_loiter_angle()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:217: warning: 'void reset_crosstrack()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:222: warning: 'long int get_altitude_above_home()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/navigation.pde:243: warning: 'long int get_alt_distance(Location*, Location*)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:155: warning: 'void throttle_failsafe(uint16_t)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/radio.pde:212: warning: 'void trim_yaw()' defined but not used
autogenerated:268: warning: 'void readCommands()' declared 'static' but never defined
autogenerated:269: warning: 'void parseCommand(char*)' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:6: warning: 'void ReadSCP1000()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:6: warning: 'void ReadSCP1000()' defined but not used
autogenerated:272: warning: 'long int read_baro_filtered()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:95: warning: 'void read_airspeed()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/sensors.pde:100: warning: 'void zero_airspeed()' defined but not used
autogenerated:286: warning: 'void report_heli()' declared 'static' but never defined
autogenerated:287: warning: 'void report_gyro()' declared 'static' but never defined
autogenerated:295: warning: 'RC_Channel* heli_get_servo(int)' declared 'static' but never defined
autogenerated:296: warning: 'int read_num_from_serial()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/system.pde:465: warning: 'void set_failsafe(boolean)' defined but not used
autogenerated:310: warning: 'void init_optflow()' declared 'static' but never defined
autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never defined
-/root/apm/Sketchbook/trunk/ArduCopterMega/test.pde:1040: warning: 'void print_motor_out()' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:442: warning: 'undo_event' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:448: warning: 'condition_rate' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:462: warning: 'simple_WP' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:467: warning: 'optflow_offset' defined but not used
-/root/apm/Sketchbook/trunk/ArduCopterMega/ArduCopterMega.pde:468: warning: 'new_location' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/test.pde:1040: warning: 'void print_motor_out()' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:442: warning: 'undo_event' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:448: warning: 'condition_rate' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:462: warning: 'simple_WP' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:467: warning: 'optflow_offset' defined but not used
+/root/apm/ardupilot-mega/ArduCopter/ArduCopter.pde:468: warning: 'new_location' defined but not used
%% libraries/APM_BMP085/APM_BMP085.o
%% libraries/APM_PI/APM_PI.o
%% libraries/APM_RC/APM_RC.o
@@ -85,41 +82,41 @@ autogenerated:318: warning: 'void fake_out_gps()' declared 'static' but never de
%% libraries/AP_GPS/GPS.o
%% libraries/AP_IMU/AP_IMU_Oilpan.o
%% libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.o
-In file included from /root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
+In file included from /root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:28:
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/../SPI/SPI.h:20:1: warning: this is the location of the previous definition
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_led_always_on(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:221: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'bool AP_OpticalFlow_ADNS3080::get_frame_rate_auto()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:257: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'void AP_OpticalFlow_ADNS3080::set_shutter_speed_auto(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:361: warning: suggest parentheses around arithmetic in operand of |
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'int AP_OpticalFlow_ADNS3080::print_pixel_data(Stream*)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:441: warning: suggest parentheses around comparison in operand of &
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:456: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'unsigned int AP_OpticalFlow_ADNS3080::set_shutter_speed(unsigned int)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:408: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp: In member function 'virtual bool AP_OpticalFlow_ADNS3080::init(bool)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow_ADNS3080.cpp:80: warning: control reaches end of non-void function
%% libraries/AP_OpticalFlow/AP_OpticalFlow.o
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
-/root/apm/Sketchbook/trunk/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: no return statement in function returning non-void
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual void AP_OpticalFlow::get_position(float, float, float, float)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:88: warning: unused variable 'i'
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual byte AP_OpticalFlow::read_register(byte)':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:44: warning: control reaches end of non-void function
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp: In member function 'virtual int AP_OpticalFlow::read()':
+/root/apm/ardupilot-mega/libraries/AP_OpticalFlow/AP_OpticalFlow.cpp:38: warning: control reaches end of non-void function
%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
%% libraries/AP_RangeFinder/RangeFinder.o
%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
+In file included from /root/apm/ardupilot-mega/libraries/DataFlash/DataFlash.cpp:35:
/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
%% libraries/FastSerial/BetterStream.o
@@ -203,141 +200,6 @@ In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wi
from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
%% arduino/core.a
-%% ArduCopterMega.elf
-%% ArduCopterMega.eep
-%% ArduCopterMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduCopterMega'
-
-%%%% Making all in ArduPilotMega/ %%%%
-
-make[1]: Entering directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
-%% ArduPilotMega.cpp
-%% ArduPilotMega.o
-In file included from /root/apm/Sketchbook/trunk/ArduPilotMega/ArduPilotMega.pde:32:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-autogenerated:63: warning: 'void add_altitude_data(long unsigned int, long int)' declared 'static' but never defined
-autogenerated:64: warning: 'void recalc_climb_rate()' declared 'static' but never defined
-autogenerated:65: warning: 'void print_climb_debug_info()' declared 'static' but never defined
-autogenerated:126: warning: 'void low_battery_event()' declared 'static' but never defined
-%% libraries/APM_BMP085/APM_BMP085.o
-%% libraries/APM_RC/APM_RC.o
-%% libraries/AP_ADC/AP_ADC_ADS7844.o
-%% libraries/AP_ADC/AP_ADC.o
-%% libraries/AP_ADC/AP_ADC_HIL.o
-%% libraries/AP_Common/AP_Common.o
-%% libraries/AP_Common/AP_Loop.o
-%% libraries/AP_Common/AP_MetaClass.o
-%% libraries/AP_Common/AP_Var.o
-%% libraries/AP_Common/AP_Var_menufuncs.o
-%% libraries/AP_Common/c++.o
-%% libraries/AP_Common/menu.o
-%% libraries/AP_Compass/AP_Compass_HIL.o
-%% libraries/AP_Compass/AP_Compass_HMC5843.o
-%% libraries/AP_Compass/Compass.o
-%% libraries/AP_DCM/AP_DCM.o
-%% libraries/AP_DCM/AP_DCM_HIL.o
-%% libraries/AP_GPS/AP_GPS_406.o
-%% libraries/AP_GPS/AP_GPS_Auto.o
-%% libraries/AP_GPS/AP_GPS_HIL.o
-%% libraries/AP_GPS/AP_GPS_IMU.o
-%% libraries/AP_GPS/AP_GPS_MTK16.o
-%% libraries/AP_GPS/AP_GPS_MTK.o
-%% libraries/AP_GPS/AP_GPS_NMEA.o
-%% libraries/AP_GPS/AP_GPS_SIRF.o
-%% libraries/AP_GPS/AP_GPS_UBLOX.o
-%% libraries/AP_GPS/GPS.o
-%% libraries/AP_IMU/AP_IMU_Oilpan.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
-%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
-%% libraries/AP_RangeFinder/RangeFinder.o
-%% libraries/DataFlash/DataFlash.o
-In file included from /root/apm/Sketchbook/trunk/libraries/DataFlash/DataFlash.cpp:35:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/FastSerial/BetterStream.o
-%% libraries/FastSerial/FastSerial.o
-%% libraries/FastSerial/vprintf.o
-%% libraries/GCS_MAVLink/GCS_MAVLink.o
-%% libraries/ModeFilter/ModeFilter.o
-%% libraries/PID/PID.o
-%% libraries/RC_Channel/RC_Channel.o
-%% libraries/memcheck/memcheck.o
-%% libraries/FastSerial/ftoa_engine.o
-%% libraries/FastSerial/ultoa_invert.o
-%% libraries/SPI/SPI.o
-In file included from /usr/local/share/arduino/libraries/SPI/SPI.cpp:12:
-/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
-/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
-%% libraries/Wire/Wire.o
-%% libraries/Wire/utility/twi.o
-cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C
-%% arduino/HardwareSerial.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/HardwareSerial.cpp:28:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/main.o
-%% arduino/Print.o
-%% arduino/Tone.o
-/usr/local/share/arduino/hardware/arduino/cores/arduino/Tone.cpp:93: warning: only initialized variables can be placed into program memory area
-%% arduino/WMath.o
-%% arduino/WString.o
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:26:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:84: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:85: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:86: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:87: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:88: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:89: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:90: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:91: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:93: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:94: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:95: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:100: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:101: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:102: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:103: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:104: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:105: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:106: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:107: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:109: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:110: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:111: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:116: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:117: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:118: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:119: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:120: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:121: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:122: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:123: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:125: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:126: warning: initialization makes integer from pointer without a cast
-/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:127: warning: initialization makes integer from pointer without a cast
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/WInterrupts.c:34:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_analog.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_digital.c:27:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_pulse.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
- from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
-/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
-%% arduino/core.a
-%% ArduPilotMega.elf
-%% ArduPilotMega.eep
-%% ArduPilotMega.hex
-make[1]: Leaving directory `/root/apm/Sketchbook/trunk/ArduPilotMega'
+%% ArduCopter.elf
+%% ArduCopter.eep
+%% ArduCopter.hex
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt
index aa5d9f6e9e..a70917bb1a 100644
--- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt
@@ -97,6 +97,7 @@
00000004 b sin_pitch_y
00000004 b wp_distance
00000004 b abs_pressure
+00000004 b circle_angle
00000004 b current_amps
00000004 b old_altitude
00000004 b original_alt
@@ -329,7 +330,6 @@
0000000e V Parameters::Parameters()::__c
0000000f b current_loc
0000000f b next_command
-0000000f r __menu_name__main_menu
0000000f b home
0000000f b next_WP
0000000f b prev_WP
@@ -383,6 +383,7 @@
00000016 r init_ardupilot()::__c
00000016 r GCS_MAVLINK::update()::__c
00000016 B sonar
+00000017 r __menu_name__main_menu
00000018 t setup_accel(unsigned char, Menu::arg const*)
00000018 W AP_VarT::serialize(void*, unsigned int) const
00000018 b mavlink_get_channel_status::m_mavlink_status
@@ -608,4 +609,4 @@
000008e4 t process_next_command()
000011d8 T GCS_MAVLINK::handleMessage(__mavlink_message*)
000017d0 t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int)
-00002036 T loop
+00001f0c T loop
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AP-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AP-1280.build.log
new file mode 100644
index 0000000000..ceb4b3914d
--- /dev/null
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AP-1280.build.log
@@ -0,0 +1,129 @@
+%% ArduPlane.cpp
+%% ArduPlane.o
+In file included from /root/apm/ardupilot-mega/ArduPlane/ArduPlane.pde:32:
+/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
+/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
+autogenerated:63: warning: 'void add_altitude_data(long unsigned int, long int)' declared 'static' but never defined
+autogenerated:64: warning: 'void recalc_climb_rate()' declared 'static' but never defined
+autogenerated:65: warning: 'void print_climb_debug_info()' declared 'static' but never defined
+autogenerated:126: warning: 'void low_battery_event()' declared 'static' but never defined
+%% libraries/APM_BMP085/APM_BMP085.o
+%% libraries/APM_RC/APM_RC.o
+%% libraries/AP_ADC/AP_ADC_ADS7844.o
+%% libraries/AP_ADC/AP_ADC.o
+%% libraries/AP_ADC/AP_ADC_HIL.o
+%% libraries/AP_Common/AP_Common.o
+%% libraries/AP_Common/AP_Loop.o
+%% libraries/AP_Common/AP_MetaClass.o
+%% libraries/AP_Common/AP_Var.o
+%% libraries/AP_Common/AP_Var_menufuncs.o
+%% libraries/AP_Common/c++.o
+%% libraries/AP_Common/menu.o
+%% libraries/AP_Compass/AP_Compass_HIL.o
+%% libraries/AP_Compass/AP_Compass_HMC5843.o
+%% libraries/AP_Compass/Compass.o
+%% libraries/AP_DCM/AP_DCM.o
+%% libraries/AP_DCM/AP_DCM_HIL.o
+%% libraries/AP_GPS/AP_GPS_406.o
+%% libraries/AP_GPS/AP_GPS_Auto.o
+%% libraries/AP_GPS/AP_GPS_HIL.o
+%% libraries/AP_GPS/AP_GPS_IMU.o
+%% libraries/AP_GPS/AP_GPS_MTK16.o
+%% libraries/AP_GPS/AP_GPS_MTK.o
+%% libraries/AP_GPS/AP_GPS_NMEA.o
+%% libraries/AP_GPS/AP_GPS_SIRF.o
+%% libraries/AP_GPS/AP_GPS_UBLOX.o
+%% libraries/AP_GPS/GPS.o
+%% libraries/AP_IMU/AP_IMU_Oilpan.o
+%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
+%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
+%% libraries/AP_RangeFinder/RangeFinder.o
+%% libraries/DataFlash/DataFlash.o
+In file included from /root/apm/ardupilot-mega/libraries/DataFlash/DataFlash.cpp:35:
+/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
+/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
+%% libraries/FastSerial/BetterStream.o
+%% libraries/FastSerial/FastSerial.o
+%% libraries/FastSerial/vprintf.o
+%% libraries/GCS_MAVLink/GCS_MAVLink.o
+%% libraries/ModeFilter/ModeFilter.o
+%% libraries/PID/PID.o
+%% libraries/RC_Channel/RC_Channel.o
+%% libraries/memcheck/memcheck.o
+%% libraries/FastSerial/ftoa_engine.o
+%% libraries/FastSerial/ultoa_invert.o
+%% libraries/SPI/SPI.o
+In file included from /usr/local/share/arduino/libraries/SPI/SPI.cpp:12:
+/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
+/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
+%% libraries/Wire/Wire.o
+%% libraries/Wire/utility/twi.o
+cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C
+%% arduino/HardwareSerial.o
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/HardwareSerial.cpp:28:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+%% arduino/main.o
+%% arduino/Print.o
+%% arduino/Tone.o
+/usr/local/share/arduino/hardware/arduino/cores/arduino/Tone.cpp:93: warning: only initialized variables can be placed into program memory area
+%% arduino/WMath.o
+%% arduino/WString.o
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:26:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:84: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:85: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:86: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:87: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:88: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:89: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:90: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:91: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:93: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:94: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:95: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:100: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:101: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:102: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:103: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:104: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:105: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:106: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:107: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:109: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:110: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:111: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:116: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:117: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:118: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:119: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:120: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:121: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:122: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:123: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:125: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:126: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:127: warning: initialization makes integer from pointer without a cast
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/WInterrupts.c:34:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_analog.c:27:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring.c:25:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_digital.c:27:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_pulse.c:25:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+%% arduino/core.a
+%% ArduPlane.elf
+%% ArduPlane.eep
+%% ArduPlane.hex
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AP-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AP-1280.size.txt
new file mode 100644
index 0000000000..eb429c3672
--- /dev/null
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AP-1280.size.txt
@@ -0,0 +1,699 @@
+00000001 b GPS_enabled
+00000001 b crash_timer
+00000001 b home_is_set
+00000001 b ch3_failsafe
+00000001 b land_complete
+00000001 b command_may_ID
+00000001 b command_must_ID
+00000001 b failsafeCounter
+00000001 b counter_one_herz
+00000001 b in_mavlink_delay
+00000001 b slow_loopCounter
+00000001 d takeoff_complete
+00000001 b command_may_index
+00000001 b command_must_index
+00000001 b delta_ms_fast_loop
+00000001 d ground_start_count
+00000001 b medium_loopCounter
+00000001 b rc_override_active
+00000001 b delta_ms_medium_loop
+00000001 b superslow_loopCounter
+00000001 b event_id
+00000001 b GPS_light
+00000001 b radio_input_switch()::bouncer
+00000001 d GCS_MAVLINK::handleMessage(__mavlink_message*)::mav_nav
+00000001 D control_mode
+00000001 B hindex
+00000001 B inverted_flight
+00000001 B mavdelay
+00000001 B n
+00000001 B oldSwitchPosition
+00000002 T ReadSCP1000()
+00000002 T mavlink_acknowledge(mavlink_channel_t, unsigned char, unsigned char, unsigned char)
+00000002 b climb_rate
+00000002 b loiter_sum
+00000002 b event_delay
+00000002 b event_value
+00000002 d elevon1_trim
+00000002 d elevon2_trim
+00000002 b event_repeat
+00000002 b loiter_delta
+00000002 b loiter_total
+00000002 b gps_fix_count
+00000002 b landing_pitch
+00000002 b takeoff_pitch
+00000002 b airspeed_nudge
+00000002 b condition_rate
+00000002 b mainLoop_count
+00000002 b throttle_nudge
+00000002 b loiter_time_max
+00000002 b event_undo_value
+00000002 b ground_start_avg
+00000002 b airspeed_pressure
+00000002 b adc
+00000002 r comma
+00000002 b g_gps
+00000002 b pmTest1
+00000002 b G_Dt_max
+00000002 b airspeed
+00000002 d ch1_temp
+00000002 d ch2_temp
+00000002 b failsafe
+00000002 b sonar_alt
+00000002 T GCS_MAVLINK::acknowledge(unsigned char, unsigned char, unsigned char)
+00000002 r print_divider()::__c
+00000002 d throttle_slew_limit()::last
+00000002 r test_gps(unsigned char, Menu::arg const*)::__c
+00000002 V PID::PID(unsigned int, prog_char_t const*, float const&, float const&, float const&, int const&)::__c
+00000002 V PID::PID(unsigned int, prog_char_t const*, float const&, float const&, float const&, int const&)::__c
+00000002 V PID::PID(unsigned int, prog_char_t const*, float const&, float const&, float const&, int const&)::__c
+00000003 r select_logs(unsigned char, Menu::arg const*)::__c
+00000003 r print_enabled(bool)::__c
+00000003 r setup_compass(unsigned char, Menu::arg const*)::__c
+00000003 r print_log_menu()::__c
+00000003 r report_compass()::__c
+00000004 b event_timer
+00000004 d hold_course
+00000004 b loiter_time
+00000004 b nav_bearing
+00000004 d scaleLongUp
+00000004 b wp_distance
+00000004 b abs_pressure
+00000004 b airspeed_raw
+00000004 b current_amps
+00000004 b energy_error
+00000004 b bearing_error
+00000004 b current_total
+00000004 b nav_loopTimer
+00000004 d scaleLongDown
+00000004 b airspeed_error
+00000004 b altitude_error
+00000004 b fast_loopTimer
+00000004 b perf_mon_timer
+00000004 b target_bearing
+00000004 d battery_voltage
+00000004 b condition_start
+00000004 b condition_value
+00000004 d nav_gain_scaler
+00000004 b offset_altitude
+00000004 b target_altitude
+00000004 d battery_voltage1
+00000004 d battery_voltage2
+00000004 d battery_voltage3
+00000004 d battery_voltage4
+00000004 b crosstrack_error
+00000004 b medium_loopTimer
+00000004 b takeoff_altitude
+00000004 b wp_totalDistance
+00000004 b ch3_failsafe_timer
+00000004 b crosstrack_bearing
+00000004 b fast_loopTimeStamp
+00000004 b old_target_bearing
+00000004 b rc_override_fs_timer
+00000004 r __menu_name__log_menu
+00000004 b airspeed_energy_error
+00000004 d G_Dt
+00000004 b load
+00000004 b dTnav
+00000004 b nav_roll
+00000004 b nav_pitch
+00000004 r select_logs(unsigned char, Menu::arg const*)::__c
+00000004 r select_logs(unsigned char, Menu::arg const*)::__c
+00000004 r select_logs(unsigned char, Menu::arg const*)::__c
+00000004 r select_logs(unsigned char, Menu::arg const*)::__c
+00000004 r select_logs(unsigned char, Menu::arg const*)::__c
+00000004 b mavlink_delay(unsigned long)::last_1hz
+00000004 b mavlink_delay(unsigned long)::last_3hz
+00000004 b mavlink_delay(unsigned long)::last_10hz
+00000004 b mavlink_delay(unsigned long)::last_50hz
+00000004 r print_enabled(bool)::__c
+00000004 r setup_compass(unsigned char, Menu::arg const*)::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r report_compass()::__c
+00000004 r Log_Read_Performance()::__c
+00000004 r test_adc(unsigned char, Menu::arg const*)::__c
+00000004 V RC_Channel::RC_Channel(unsigned int, prog_char_t const*)::__c
+00000004 V RC_Channel::RC_Channel(unsigned int, prog_char_t const*)::__c
+00000004 V RC_Channel::RC_Channel(unsigned int, prog_char_t const*)::__c
+00000004 B xi
+00000004 B xi2
+00000004 B xiyi
+00000004 B xoffset
+00000004 B yi
+00000005 r __menu_name__test_menu
+00000005 r report_imu()::__c
+00000005 r select_logs(unsigned char, Menu::arg const*)::__c
+00000005 r select_logs(unsigned char, Menu::arg const*)::__c
+00000005 r select_logs(unsigned char, Menu::arg const*)::__c
+00000005 r Log_Read_Cmd()::__c
+00000005 r Log_Read_Raw()::__c
+00000005 r Log_Read_Mode()::__c
+00000005 r print_log_menu()::__c
+00000005 r print_log_menu()::__c
+00000005 r print_log_menu()::__c
+00000005 r print_log_menu()::__c
+00000005 r test_adc(unsigned char, Menu::arg const*)::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V RC_Channel::RC_Channel(unsigned int, prog_char_t const*)::__c
+00000005 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000005 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000005 V PID::PID(unsigned int, prog_char_t const*, float const&, float const&, float const&, int const&)::__c
+00000006 r __menu_name__setup_menu
+00000006 r test_eedump(unsigned char, Menu::arg const*)::__c
+00000006 r test_eedump(unsigned char, Menu::arg const*)::__c
+00000006 r zero_eeprom()::__c
+00000006 r init_ardupilot()::__c
+00000006 r Log_Read_Control_Tuning()::__c
+00000007 b setup_menu
+00000007 b planner_menu
+00000007 b log_menu
+00000007 b main_menu
+00000007 b test_menu
+00000007 r select_logs(unsigned char, Menu::arg const*)::__c
+00000007 r report_gains()::__c
+00000007 r report_radio()::__c
+00000007 r print_enabled(bool)::__c
+00000007 r test_airspeed(unsigned char, Menu::arg const*)::__c
+00000007 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000007 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000007 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000008 r __menu_name__planner_menu
+00000008 r report_compass()::__c
+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 report_compass()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000009 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000009 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000009 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+0000000a r __menu_name__main_menu
+0000000a r test_relay(unsigned char, Menu::arg const*)::__c
+0000000a r report_compass()::__c
+0000000a r report_throttle()::__c
+0000000a r test_mag(unsigned char, Menu::arg const*)::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a T setup
+0000000b r test_relay(unsigned char, Menu::arg const*)::__c
+0000000b r report_gains()::__c
+0000000b r test_airspeed(unsigned char, Menu::arg const*)::__c
+0000000b r test_airspeed(unsigned char, Menu::arg const*)::__c
+0000000b r control_failsafe(unsigned int)::__c
+0000000b V Parameters::Parameters()::__c
+0000000b V Parameters::Parameters()::__c
+0000000b V Parameters::Parameters()::__c
+0000000b V Parameters::Parameters()::__c
+0000000c t process_logs(unsigned char, Menu::arg const*)
+0000000c T GCS_MAVLINK::send_text(unsigned char, char const*)
+0000000c V vtable for IMU
+0000000c r setup_show(unsigned char, Menu::arg const*)::__c
+0000000c r report_xtrack()::__c
+0000000c r test_modeswitch(unsigned char, Menu::arg const*)::__c
+0000000c r control_failsafe(unsigned int)::__c
+0000000c r test_mode(unsigned char, Menu::arg const*)::__c
+0000000c V Parameters::Parameters()::__c
+0000000c V Parameters::Parameters()::__c
+0000000c V Parameters::Parameters()::__c
+0000000c V Parameters::Parameters()::__c
+0000000c V Parameters::Parameters()::__c
+0000000d r init_home()::__c
+0000000d r verify_RTL()::__c
+0000000d r demo_servos(unsigned char)::__c
+0000000d r select_logs(unsigned char, Menu::arg const*)::__c
+0000000d r report_gains()::__c
+0000000d r test_battery(unsigned char, Menu::arg const*)::__c
+0000000d r test_current(unsigned char, Menu::arg const*)::__c
+0000000d r print_log_menu()::__c
+0000000d r test_modeswitch(unsigned char, Menu::arg const*)::__c
+0000000d r Log_Read_Startup()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d B sonar_mode_filter
+0000000e t global destructors keyed to Serial
+0000000e t global constructors keyed to Serial
+0000000e V vtable for AP_Float16
+0000000e V vtable for AP_VarA
+0000000e V vtable for AP_VarS >
+0000000e V vtable for AP_VarS >
+0000000e V vtable for AP_VarT
+0000000e V vtable for AP_VarT
+0000000e V vtable for AP_VarT
+0000000e V vtable for AP_VarT
+0000000e r erase_logs(unsigned char, Menu::arg const*)::__c
+0000000e r process_may()::__c
+0000000e r select_logs(unsigned char, Menu::arg const*)::__c
+0000000e r report_gains()::__c
+0000000e r print_log_menu()::__c
+0000000e r setup_batt_monitor(unsigned char, Menu::arg const*)::__c
+0000000e r report_batt_monitor()::__c
+0000000e r report_flight_modes()::__c
+0000000e r test_wp(unsigned char, Menu::arg const*)::__c
+0000000e r test_gyro(unsigned char, Menu::arg const*)::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000f b current_loc
+0000000f b next_command
+0000000f b home
+0000000f b next_WP
+0000000f b prev_WP
+0000000f b guided_WP
+0000000f r report_gains()::__c
+0000000f r print_log_menu()::__c
+0000000f r failsafe_short_on_event()::__c
+0000000f r test_mag(unsigned char, Menu::arg const*)::__c
+0000000f V Parameters::Parameters()::__c
+0000000f V Parameters::Parameters()::__c
+0000000f V Parameters::Parameters()::__c
+0000000f V Parameters::Parameters()::__c
+0000000f V Parameters::Parameters()::__c
+0000000f V AP_IMU_Oilpan::AP_IMU_Oilpan(AP_ADC*, unsigned int)::__c
+00000010 b rc_override
+00000010 r planner_menu_commands
+00000010 W AP_VarT::cast_to_float() const
+00000010 W AP_VarT::cast_to_float() const
+00000010 r setup_radio(unsigned char, Menu::arg const*)::__c
+00000010 r report_gains()::__c
+00000010 r Log_Read_Startup()::__c
+00000010 r test_wp(unsigned char, Menu::arg const*)::__c
+00000010 r dump_log(unsigned char, Menu::arg const*)::__c
+00000010 t mavlink_get_channel_status
+00000011 r erase_logs(unsigned char, Menu::arg const*)::__c
+00000011 r set_next_WP(Location*)::__c
+00000011 r zero_eeprom()::__c
+00000011 r test_airspeed(unsigned char, Menu::arg const*)::__c
+00000011 r startup_ground()::__c
+00000011 r Log_Read_Attitude()::__c
+00000011 r load_next_command_from_EEPROM()::__c
+00000012 B Serial
+00000012 B Serial1
+00000012 B Serial3
+00000012 W AP_Float16::~AP_Float16()
+00000012 W AP_VarA::~AP_VarA()
+00000012 W AP_VarS >::~AP_VarS()
+00000012 W AP_VarS >::~AP_VarS()
+00000012 W AP_VarT::~AP_VarT()
+00000012 W AP_VarT::~AP_VarT()
+00000012 W AP_VarT::~AP_VarT()
+00000012 W AP_VarT::~AP_VarT()
+00000012 W AP_VarT::serialize(void*, unsigned int) const
+00000012 r print_done()::__c
+00000012 r select_logs(unsigned char, Menu::arg const*)::__c
+00000012 r init_barometer()::__c
+00000012 r startup_IMU_ground()::__c
+00000012 r report_batt_monitor()::__c
+00000012 r report_batt_monitor()::__c
+00000012 r GCS_MAVLINK::handleMessage(__mavlink_message*)::__c
+00000013 r report_gains()::__c
+00000013 r setup_compass(unsigned char, Menu::arg const*)::__c
+00000013 r Log_Read_Startup()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r dump_log(unsigned char, Menu::arg const*)::__c
+00000014 W AP_VarT::unserialize(void*, unsigned int)
+00000014 W AP_VarT::cast_to_float() const
+00000014 W AP_VarT::cast_to_float() const
+00000014 r set_guided_WP()::__c
+00000014 r test_wp(unsigned char, Menu::arg const*)::__c
+00000014 r test_imu(unsigned char, Menu::arg const*)::__c
+00000015 r map_baudrate(signed char, unsigned long)::__c
+00000015 r report_gains()::__c
+00000015 r init_ardupilot()::__c
+00000015 r print_hit_enter()::__c
+00000015 r test_gyro(unsigned char, Menu::arg const*)::__c
+00000015 r GCS_MAVLINK::handleMessage(__mavlink_message*)::__c
+00000016 r test_failsafe(unsigned char, Menu::arg const*)::__c
+00000016 r report_batt_monitor()::__c
+00000016 r test_wp(unsigned char, Menu::arg const*)::__c
+00000016 r GCS_MAVLINK::update()::__c
+00000016 B sonar
+00000017 r test_failsafe(unsigned char, Menu::arg const*)::__c
+00000017 r test_pressure(unsigned char, Menu::arg const*)::__c
+00000017 r test_wp(unsigned char, Menu::arg const*)::__c
+00000018 W AP_VarT::serialize(void*, unsigned int) const
+00000018 b mavlink_get_channel_status::m_mavlink_status
+00000018 r process_must()::__c
+00000018 r report_compass()::__c
+00000018 r Log_Read_Startup()::__c
+00000019 r report_batt_monitor()::__c
+00000019 r failsafe_long_on_event()::__c
+00000019 r GCS_MAVLINK::update()::__c
+0000001a r reset_control_switch()::__c
+0000001a r failsafe_short_on_event()::__c
+0000001a r Log_Read(int, int)::__c
+0000001b r failsafe_short_off_event()::__c
+0000001c W AP_VarA::unserialize(void*, unsigned int)
+0000001c W AP_VarS >::unserialize(void*, unsigned int)
+0000001c W AP_VarS >::unserialize(void*, unsigned int)
+0000001c W AP_VarT::unserialize(void*, unsigned int)
+0000001c W AP_VarA::serialize(void*, unsigned int) const
+0000001c W AP_VarS >::serialize(void*, unsigned int) const
+0000001c W AP_VarS >::serialize(void*, unsigned int) const
+0000001c r Log_Read_Current()::__c
+0000001c r Log_Read(int, int)::__c
+0000001c r Log_Read(int, int)::__c
+0000001d r setup_radio(unsigned char, Menu::arg const*)::__c
+0000001d r startup_ground()::__c
+0000001d r report_batt_monitor()::__c
+0000001e r flight_mode_strings
+0000001e t failsafe_short_off_event()
+0000001e r test_failsafe(unsigned char, Menu::arg const*)::__c
+0000001e r startup_ground()::__c
+0000001f r setup_compass(unsigned char, Menu::arg const*)::__c
+0000001f r init_ardupilot()::__c
+0000001f r test_mag(unsigned char, Menu::arg const*)::__c
+00000020 r test_current(unsigned char, Menu::arg const*)::__c
+00000020 r report_xtrack()::__c
+00000020 r init_barometer()::__c
+00000020 r Log_Read(int, int)::__c
+00000020 t byte_swap_4
+00000021 r print_log_menu()::__c
+00000021 r print_log_menu()::__c
+00000022 t print_blanks(int)
+00000022 t reset_I()
+00000022 W AP_Float16::~AP_Float16()
+00000022 W AP_VarA::~AP_VarA()
+00000022 W AP_VarS >::~AP_VarS()
+00000022 W AP_VarS >::~AP_VarS()
+00000022 W AP_VarT::~AP_VarT()
+00000022 W AP_VarT::~AP_VarT()
+00000022 W AP_VarT::~AP_VarT()
+00000022 W AP_VarT::~AP_VarT()
+00000022 r test_failsafe(unsigned char, Menu::arg const*)::__c
+00000022 r report_compass()::__c
+00000022 r increment_WP_index()::__c
+00000022 r verify_loiter_time()::__c
+00000023 r test_pressure(unsigned char, Menu::arg const*)::__c
+00000023 r print_gyro_offsets()::__c
+00000023 r navigate()::__c
+00000024 r test_dipswitches(unsigned char, Menu::arg const*)::__c
+00000024 r print_accel_offsets()::__c
+00000024 r verify_loiter_turns()::__c
+00000026 t print_done()
+00000026 b mavlink_queue
+00000026 t print_hit_enter()
+00000026 r init_ardupilot()::__c
+00000026 r print_PID(PID*)::__c
+00000027 r init_ardupilot()::__c
+00000027 r test_xbee(unsigned char, Menu::arg const*)::__c
+00000028 t main_menu_help(unsigned char, Menu::arg const*)
+00000028 t increment_WP_index()
+00000028 t help_log(unsigned char, Menu::arg const*)
+00000028 W AP_VarT::unserialize(void*, unsigned int)
+00000028 W AP_VarT::unserialize(void*, unsigned int)
+00000028 W AP_VarT::serialize(void*, unsigned int) const
+00000028 W AP_VarT::serialize(void*, unsigned int) const
+00000029 r test_gps(unsigned char, Menu::arg const*)::__c
+0000002a t setup_declination(unsigned char, Menu::arg const*)
+0000002a r init_ardupilot()::__c
+0000002a r startup_ground()::__c
+0000002b r verify_must()::__c
+0000002b r test_battery(unsigned char, Menu::arg const*)::__c
+0000002b r change_command(unsigned char)::__c
+0000002c t freeRAM()
+0000002d r startup_IMU_ground()::__c
+0000002e t reset_control_switch()
+0000002e t send_rate(unsigned int, unsigned int)
+0000002e W AP_Var_group::AP_Var_group(unsigned int, prog_char_t const*, unsigned char)
+0000002e r verify_nav_wp()::__c
+00000030 t setup_mode(unsigned char, Menu::arg const*)
+00000030 t planner_mode(unsigned char, Menu::arg const*)
+00000030 t test_mode(unsigned char, Menu::arg const*)
+00000030 r verify_may()::__c
+00000030 r print_log_menu()::__c
+00000031 r start_new_log(unsigned char)::__c
+00000032 T GCS_MAVLINK::init(FastSerial*)
+00000032 r test_dipswitches(unsigned char, Menu::arg const*)::__c
+00000034 W AP_Float16::serialize(void*, unsigned int) const
+00000034 r test_radio(unsigned char, Menu::arg const*)::__c
+00000034 t _mav_put_int8_t_array
+00000035 r test_radio_pwm(unsigned char, Menu::arg const*)::__c
+00000035 r Log_Read_Nav_Tuning()::__c
+00000036 t report_radio()
+00000036 r test_failsafe(unsigned char, Menu::arg const*)::__c
+00000037 r setup_factory(unsigned char, Menu::arg const*)::__c
+00000038 r test_dipswitches(unsigned char, Menu::arg const*)::__c
+00000038 r dump_log(unsigned char, Menu::arg const*)::__c
+00000039 r setup_radio(unsigned char, Menu::arg const*)::__c
+00000039 r planner_mode(unsigned char, Menu::arg const*)::__c
+00000039 r init_ardupilot()::__c
+0000003a t report_imu()
+0000003a W PID::~PID()
+0000003c t Log_Write_Mode(unsigned char)
+0000003c t verify_loiter_turns()
+0000003c W RC_Channel::~RC_Channel()
+0000003c r test_wp_print(Location*, unsigned char)::__c
+0000003c r test_mag(unsigned char, Menu::arg const*)::__c
+0000003d B g_gps_driver
+0000003e t verify_RTL()
+0000003e T GCS_MAVLINK::send_text(unsigned char, prog_char_t const*)
+0000003e W AP_VarT::AP_VarT(signed char, unsigned int, prog_char_t const*, unsigned char)
+00000040 W AP_Float16::unserialize(void*, unsigned int)
+00000040 t byte_swap_8
+00000040 t crc_accumulate
+00000040 B history
+00000043 r Log_Read_GPS()::__c
+00000044 W AP_VarT::AP_VarT(int, unsigned int, prog_char_t const*, unsigned char)
+00000044 r report_throttle()::__c
+00000045 r erase_logs(unsigned char, Menu::arg const*)::__c
+0000004a W AP_VarT::AP_VarT(AP_Var_group*, unsigned int, int, prog_char_t const*, unsigned char)
+0000004b r setup_factory(unsigned char, Menu::arg const*)::__c
+0000004c t setup_erase(unsigned char, Menu::arg const*)
+0000004c t Log_Read_Mode()
+0000004c B imu
+0000004e T mavlink_send_text(mavlink_channel_t, unsigned char, char const*)
+0000004e t setup_batt_monitor(unsigned char, Menu::arg const*)
+00000050 r log_menu_commands
+00000050 r main_menu_commands
+00000050 t failsafe_long_on_event()
+00000050 T GCS_MAVLINK::_find_parameter(unsigned int)
+00000054 t print_divider()
+00000054 t print_enabled(bool)
+00000054 t report_flight_modes()
+00000055 r setup_flightmodes(unsigned char, Menu::arg const*)::__c
+00000056 t change_command(unsigned char)
+00000058 t radio_input_switch()
+0000005a t update_GPS_light()
+0000005a W AP_VarT::AP_VarT(float, unsigned int, prog_char_t const*, unsigned char)
+0000005b r setup_erase(unsigned char, Menu::arg const*)::__c
+0000005c t readSwitch()
+0000005c t get_num_logs()
+0000005e T GCS_MAVLINK::_count_parameters()
+00000060 b barometer
+00000060 W AP_Float16::AP_Float16(AP_Var_group*, unsigned int, float, prog_char_t const*, unsigned char)
+00000060 t _mavlink_send_uart
+00000062 t print_switch(unsigned char, unsigned char)
+00000064 t Log_Write_Attitude(int, int, unsigned int)
+00000064 t test_xbee(unsigned char, Menu::arg const*)
+00000064 t mavlink_msg_param_value_send
+00000068 t zero_eeprom()
+00000068 t find_last_log_page(int)
+0000006a W GCS_MAVLINK::~GCS_MAVLINK()
+0000006c t setup_show(unsigned char, Menu::arg const*)
+0000006c t demo_servos(unsigned char)
+0000006e t setup_factory(unsigned char, Menu::arg const*)
+00000070 r init_ardupilot()::__c
+00000074 t verify_loiter_time()
+00000076 t startup_IMU_ground()
+00000078 t read_control_switch()
+0000007c t failsafe_short_on_event()
+0000007e t test_rawgps(unsigned char, Menu::arg const*)
+00000080 r setup_menu_commands
+00000080 T __vector_25
+00000080 T __vector_36
+00000080 T __vector_54
+00000086 t Log_Read_Attitude()
+00000088 t Log_Read_Raw()
+0000008a t Log_Write_Cmd(unsigned char, Location*)
+0000008c t print_gyro_offsets()
+0000008c t print_accel_offsets()
+0000008c r main_menu_help(unsigned char, Menu::arg const*)::__c
+00000090 t do_RTL()
+00000096 t map_baudrate(signed char, unsigned long)
+00000096 t test_wp_print(Location*, unsigned char)
+0000009c t update_servo_switches()
+0000009c t print_PID(PID*)
+0000009d B gcs
+0000009d B hil
+000000a0 t report_xtrack()
+000000a4 t Log_Read_Cmd()
+000000a4 T __vector_26
+000000a4 T __vector_37
+000000a4 T __vector_55
+000000ac t Log_Read_Performance()
+000000b2 t Log_Read_Startup()
+000000b4 t test_relay(unsigned char, Menu::arg const*)
+000000b4 t planner_gcs(unsigned char, Menu::arg const*)
+000000b6 t get_log_boundaries(unsigned char, int&, int&)
+000000b7 b compass
+000000bc t Log_Read_Control_Tuning()
+000000c0 t report_throttle()
+000000c0 t calc_bearing_error()
+000000c4 t update_events()
+000000c4 t load_next_command_from_EEPROM()
+000000c6 t test_eedump(unsigned char, Menu::arg const*)
+000000c7 B dcm
+000000ca t test_modeswitch(unsigned char, Menu::arg const*)
+000000ca t control_failsafe(unsigned int)
+000000ce t zero_airspeed()
+000000ce W PID::PID(unsigned int, prog_char_t const*, float const&, float const&, float const&, int const&)
+000000ce r setup_mode(unsigned char, Menu::arg const*)::__c
+000000ce r help_log(unsigned char, Menu::arg const*)::__c
+000000d0 t get_bearing(Location*, Location*)
+000000da t verify_nav_wp()
+000000e0 b mavlink_parse_char::m_mavlink_message
+000000e4 t test_radio_pwm(unsigned char, Menu::arg const*)
+000000e7 r init_ardupilot()::__c
+000000ec t dump_log(unsigned char, Menu::arg const*)
+000000f0 t throttle_slew_limit()
+000000f2 t test_adc(unsigned char, Menu::arg const*)
+000000f4 t _mav_finalize_message_chan_send
+000000fa t Log_Read_Current()
+00000100 t trim_radio()
+00000102 t setup_compass(unsigned char, Menu::arg const*)
+00000106 t test_current(unsigned char, Menu::arg const*)
+00000106 t calc_nav_pitch()
+00000106 t get_wp_with_index(int)
+00000108 t test_battery(unsigned char, Menu::arg const*)
+0000010c W RC_Channel::RC_Channel(unsigned int, prog_char_t const*)
+00000110 t test_radio(unsigned char, Menu::arg const*)
+00000112 t get_distance(Location*, Location*)
+00000112 t startup_ground()
+00000112 t report_batt_monitor()
+00000112 T GCS_MAVLINK::GCS_MAVLINK(unsigned int)
+00000112 T GCS_MAVLINK::GCS_MAVLINK(unsigned int)
+00000114 t read_barometer()
+00000116 t erase_logs(unsigned char, Menu::arg const*)
+00000118 t test_gps(unsigned char, Menu::arg const*)
+00000118 T GCS_MAVLINK::_queued_send()
+00000120 t test_pressure(unsigned char, Menu::arg const*)
+00000130 t test_dipswitches(unsigned char, Menu::arg const*)
+00000130 t set_wp_with_index(Location, int)
+00000130 t setup_flightmodes(unsigned char, Menu::arg const*)
+00000130 r test_menu_commands
+00000134 T GCS_MAVLINK::send_message(unsigned char, unsigned long)
+0000013e t process_may()
+0000013e t calc_nav_roll()
+00000146 t select_logs(unsigned char, Menu::arg const*)
+0000014e t verify_may()
+0000014e T GCS_MAVLINK::update()
+00000152 t report_gains()
+0000015a t test_airspeed(unsigned char, Menu::arg const*)
+0000015e t test_gyro(unsigned char, Menu::arg const*)
+0000016a t process_must()
+0000016a t set_guided_WP()
+00000172 t navigate()
+00000174 t report_compass()
+0000017e t Log_Read_Nav_Tuning()
+000001a2 t test_imu(unsigned char, Menu::arg const*)
+000001ae T init_home()
+000001b2 t update_crosstrack()
+000001be t Log_Read_GPS()
+000001c8 t read_airspeed()
+000001ca t mavlink_delay(unsigned long)
+000001ca t start_new_log(unsigned char)
+000001ea T GCS_MAVLINK::data_stream_send(unsigned int, unsigned int)
+000001ec t init_barometer()
+00000202 t test_failsafe(unsigned char, Menu::arg const*)
+00000206 t set_next_WP(Location*)
+00000208 t calc_throttle()
+00000226 t Log_Read(int, int)
+0000022c t test_wp(unsigned char, Menu::arg const*)
+0000022c t set_mode(unsigned char)
+00000232 t verify_must()
+0000023e t print_radio_values()
+0000024c t update_loiter()
+0000025c t setup_radio(unsigned char, Menu::arg const*)
+000002e4 t read_radio()
+0000031e t read_battery()
+0000032e t test_mag(unsigned char, Menu::arg const*)
+0000033a W Parameters::~Parameters()
+00000404 t process_next_command()
+0000041c t set_servos()
+0000044c t print_log_menu()
+000004b2 t mavlink_parse_char
+0000059c t __static_initialization_and_destruction_0(int, int)
+000006da t init_ardupilot()
+00000831 b g
+0000090a W Parameters::Parameters()
+0000156a T GCS_MAVLINK::handleMessage(__mavlink_message*)
+000018ea t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int)
+00001ae8 T loop
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AP-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AP-2560.build.log
new file mode 100644
index 0000000000..ceb4b3914d
--- /dev/null
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AP-2560.build.log
@@ -0,0 +1,129 @@
+%% ArduPlane.cpp
+%% ArduPlane.o
+In file included from /root/apm/ardupilot-mega/ArduPlane/ArduPlane.pde:32:
+/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
+/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
+autogenerated:63: warning: 'void add_altitude_data(long unsigned int, long int)' declared 'static' but never defined
+autogenerated:64: warning: 'void recalc_climb_rate()' declared 'static' but never defined
+autogenerated:65: warning: 'void print_climb_debug_info()' declared 'static' but never defined
+autogenerated:126: warning: 'void low_battery_event()' declared 'static' but never defined
+%% libraries/APM_BMP085/APM_BMP085.o
+%% libraries/APM_RC/APM_RC.o
+%% libraries/AP_ADC/AP_ADC_ADS7844.o
+%% libraries/AP_ADC/AP_ADC.o
+%% libraries/AP_ADC/AP_ADC_HIL.o
+%% libraries/AP_Common/AP_Common.o
+%% libraries/AP_Common/AP_Loop.o
+%% libraries/AP_Common/AP_MetaClass.o
+%% libraries/AP_Common/AP_Var.o
+%% libraries/AP_Common/AP_Var_menufuncs.o
+%% libraries/AP_Common/c++.o
+%% libraries/AP_Common/menu.o
+%% libraries/AP_Compass/AP_Compass_HIL.o
+%% libraries/AP_Compass/AP_Compass_HMC5843.o
+%% libraries/AP_Compass/Compass.o
+%% libraries/AP_DCM/AP_DCM.o
+%% libraries/AP_DCM/AP_DCM_HIL.o
+%% libraries/AP_GPS/AP_GPS_406.o
+%% libraries/AP_GPS/AP_GPS_Auto.o
+%% libraries/AP_GPS/AP_GPS_HIL.o
+%% libraries/AP_GPS/AP_GPS_IMU.o
+%% libraries/AP_GPS/AP_GPS_MTK16.o
+%% libraries/AP_GPS/AP_GPS_MTK.o
+%% libraries/AP_GPS/AP_GPS_NMEA.o
+%% libraries/AP_GPS/AP_GPS_SIRF.o
+%% libraries/AP_GPS/AP_GPS_UBLOX.o
+%% libraries/AP_GPS/GPS.o
+%% libraries/AP_IMU/AP_IMU_Oilpan.o
+%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
+%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
+%% libraries/AP_RangeFinder/RangeFinder.o
+%% libraries/DataFlash/DataFlash.o
+In file included from /root/apm/ardupilot-mega/libraries/DataFlash/DataFlash.cpp:35:
+/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
+/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
+%% libraries/FastSerial/BetterStream.o
+%% libraries/FastSerial/FastSerial.o
+%% libraries/FastSerial/vprintf.o
+%% libraries/GCS_MAVLink/GCS_MAVLink.o
+%% libraries/ModeFilter/ModeFilter.o
+%% libraries/PID/PID.o
+%% libraries/RC_Channel/RC_Channel.o
+%% libraries/memcheck/memcheck.o
+%% libraries/FastSerial/ftoa_engine.o
+%% libraries/FastSerial/ultoa_invert.o
+%% libraries/SPI/SPI.o
+In file included from /usr/local/share/arduino/libraries/SPI/SPI.cpp:12:
+/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
+/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
+%% libraries/Wire/Wire.o
+%% libraries/Wire/utility/twi.o
+cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C
+%% arduino/HardwareSerial.o
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/HardwareSerial.cpp:28:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+%% arduino/main.o
+%% arduino/Print.o
+%% arduino/Tone.o
+/usr/local/share/arduino/hardware/arduino/cores/arduino/Tone.cpp:93: warning: only initialized variables can be placed into program memory area
+%% arduino/WMath.o
+%% arduino/WString.o
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:26:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:84: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:85: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:86: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:87: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:88: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:89: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:90: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:91: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:93: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:94: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:95: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:100: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:101: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:102: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:103: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:104: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:105: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:106: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:107: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:109: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:110: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:111: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:116: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:117: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:118: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:119: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:120: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:121: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:122: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:123: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:125: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:126: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:127: warning: initialization makes integer from pointer without a cast
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/WInterrupts.c:34:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_analog.c:27:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring.c:25:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_digital.c:27:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_pulse.c:25:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+%% arduino/core.a
+%% ArduPlane.elf
+%% ArduPlane.eep
+%% ArduPlane.hex
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AP-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AP-2560.size.txt
new file mode 100644
index 0000000000..4ab952d0fb
--- /dev/null
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AP-2560.size.txt
@@ -0,0 +1,699 @@
+00000001 b GPS_enabled
+00000001 b crash_timer
+00000001 b home_is_set
+00000001 b ch3_failsafe
+00000001 b land_complete
+00000001 b command_may_ID
+00000001 b command_must_ID
+00000001 b failsafeCounter
+00000001 b counter_one_herz
+00000001 b in_mavlink_delay
+00000001 b slow_loopCounter
+00000001 d takeoff_complete
+00000001 b command_may_index
+00000001 b command_must_index
+00000001 b delta_ms_fast_loop
+00000001 d ground_start_count
+00000001 b medium_loopCounter
+00000001 b rc_override_active
+00000001 b delta_ms_medium_loop
+00000001 b superslow_loopCounter
+00000001 b event_id
+00000001 b GPS_light
+00000001 b radio_input_switch()::bouncer
+00000001 d GCS_MAVLINK::handleMessage(__mavlink_message*)::mav_nav
+00000001 D control_mode
+00000001 B hindex
+00000001 B inverted_flight
+00000001 B mavdelay
+00000001 B n
+00000001 B oldSwitchPosition
+00000002 T ReadSCP1000()
+00000002 T mavlink_acknowledge(mavlink_channel_t, unsigned char, unsigned char, unsigned char)
+00000002 b climb_rate
+00000002 b loiter_sum
+00000002 b event_delay
+00000002 b event_value
+00000002 d elevon1_trim
+00000002 d elevon2_trim
+00000002 b event_repeat
+00000002 b loiter_delta
+00000002 b loiter_total
+00000002 b gps_fix_count
+00000002 b landing_pitch
+00000002 b takeoff_pitch
+00000002 b airspeed_nudge
+00000002 b condition_rate
+00000002 b mainLoop_count
+00000002 b throttle_nudge
+00000002 b loiter_time_max
+00000002 b event_undo_value
+00000002 b ground_start_avg
+00000002 b airspeed_pressure
+00000002 b adc
+00000002 r comma
+00000002 b g_gps
+00000002 b pmTest1
+00000002 b G_Dt_max
+00000002 b airspeed
+00000002 d ch1_temp
+00000002 d ch2_temp
+00000002 b failsafe
+00000002 b sonar_alt
+00000002 T GCS_MAVLINK::acknowledge(unsigned char, unsigned char, unsigned char)
+00000002 r print_divider()::__c
+00000002 d throttle_slew_limit()::last
+00000002 r test_gps(unsigned char, Menu::arg const*)::__c
+00000002 V PID::PID(unsigned int, prog_char_t const*, float const&, float const&, float const&, int const&)::__c
+00000002 V PID::PID(unsigned int, prog_char_t const*, float const&, float const&, float const&, int const&)::__c
+00000002 V PID::PID(unsigned int, prog_char_t const*, float const&, float const&, float const&, int const&)::__c
+00000003 r select_logs(unsigned char, Menu::arg const*)::__c
+00000003 r print_enabled(bool)::__c
+00000003 r setup_compass(unsigned char, Menu::arg const*)::__c
+00000003 r print_log_menu()::__c
+00000003 r report_compass()::__c
+00000004 b event_timer
+00000004 d hold_course
+00000004 b loiter_time
+00000004 b nav_bearing
+00000004 d scaleLongUp
+00000004 b wp_distance
+00000004 b abs_pressure
+00000004 b airspeed_raw
+00000004 b current_amps
+00000004 b energy_error
+00000004 b bearing_error
+00000004 b current_total
+00000004 b nav_loopTimer
+00000004 d scaleLongDown
+00000004 b airspeed_error
+00000004 b altitude_error
+00000004 b fast_loopTimer
+00000004 b perf_mon_timer
+00000004 b target_bearing
+00000004 d battery_voltage
+00000004 b condition_start
+00000004 b condition_value
+00000004 d nav_gain_scaler
+00000004 b offset_altitude
+00000004 b target_altitude
+00000004 d battery_voltage1
+00000004 d battery_voltage2
+00000004 d battery_voltage3
+00000004 d battery_voltage4
+00000004 b crosstrack_error
+00000004 b medium_loopTimer
+00000004 b takeoff_altitude
+00000004 b wp_totalDistance
+00000004 b ch3_failsafe_timer
+00000004 b crosstrack_bearing
+00000004 b fast_loopTimeStamp
+00000004 b old_target_bearing
+00000004 b rc_override_fs_timer
+00000004 r __menu_name__log_menu
+00000004 b airspeed_energy_error
+00000004 d G_Dt
+00000004 b load
+00000004 b dTnav
+00000004 b nav_roll
+00000004 b nav_pitch
+00000004 r select_logs(unsigned char, Menu::arg const*)::__c
+00000004 r select_logs(unsigned char, Menu::arg const*)::__c
+00000004 r select_logs(unsigned char, Menu::arg const*)::__c
+00000004 r select_logs(unsigned char, Menu::arg const*)::__c
+00000004 r select_logs(unsigned char, Menu::arg const*)::__c
+00000004 b mavlink_delay(unsigned long)::last_1hz
+00000004 b mavlink_delay(unsigned long)::last_3hz
+00000004 b mavlink_delay(unsigned long)::last_10hz
+00000004 b mavlink_delay(unsigned long)::last_50hz
+00000004 r print_enabled(bool)::__c
+00000004 r setup_compass(unsigned char, Menu::arg const*)::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r report_compass()::__c
+00000004 r Log_Read_Performance()::__c
+00000004 r test_adc(unsigned char, Menu::arg const*)::__c
+00000004 V RC_Channel::RC_Channel(unsigned int, prog_char_t const*)::__c
+00000004 V RC_Channel::RC_Channel(unsigned int, prog_char_t const*)::__c
+00000004 V RC_Channel::RC_Channel(unsigned int, prog_char_t const*)::__c
+00000004 B xi
+00000004 B xi2
+00000004 B xiyi
+00000004 B xoffset
+00000004 B yi
+00000005 r __menu_name__test_menu
+00000005 r report_imu()::__c
+00000005 r select_logs(unsigned char, Menu::arg const*)::__c
+00000005 r select_logs(unsigned char, Menu::arg const*)::__c
+00000005 r select_logs(unsigned char, Menu::arg const*)::__c
+00000005 r Log_Read_Cmd()::__c
+00000005 r Log_Read_Raw()::__c
+00000005 r Log_Read_Mode()::__c
+00000005 r print_log_menu()::__c
+00000005 r print_log_menu()::__c
+00000005 r print_log_menu()::__c
+00000005 r print_log_menu()::__c
+00000005 r test_adc(unsigned char, Menu::arg const*)::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V RC_Channel::RC_Channel(unsigned int, prog_char_t const*)::__c
+00000005 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000005 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000005 V PID::PID(unsigned int, prog_char_t const*, float const&, float const&, float const&, int const&)::__c
+00000006 r __menu_name__setup_menu
+00000006 r test_eedump(unsigned char, Menu::arg const*)::__c
+00000006 r test_eedump(unsigned char, Menu::arg const*)::__c
+00000006 r zero_eeprom()::__c
+00000006 r init_ardupilot()::__c
+00000006 r Log_Read_Control_Tuning()::__c
+00000007 b setup_menu
+00000007 b planner_menu
+00000007 b log_menu
+00000007 b main_menu
+00000007 b test_menu
+00000007 r select_logs(unsigned char, Menu::arg const*)::__c
+00000007 r report_gains()::__c
+00000007 r report_radio()::__c
+00000007 r print_enabled(bool)::__c
+00000007 r test_airspeed(unsigned char, Menu::arg const*)::__c
+00000007 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000007 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000007 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000008 r __menu_name__planner_menu
+00000008 r report_compass()::__c
+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 report_compass()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000009 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000009 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000009 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+0000000a r __menu_name__main_menu
+0000000a r test_relay(unsigned char, Menu::arg const*)::__c
+0000000a r report_compass()::__c
+0000000a r report_throttle()::__c
+0000000a r test_mag(unsigned char, Menu::arg const*)::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a T setup
+0000000b r test_relay(unsigned char, Menu::arg const*)::__c
+0000000b r report_gains()::__c
+0000000b r test_airspeed(unsigned char, Menu::arg const*)::__c
+0000000b r test_airspeed(unsigned char, Menu::arg const*)::__c
+0000000b r control_failsafe(unsigned int)::__c
+0000000b V Parameters::Parameters()::__c
+0000000b V Parameters::Parameters()::__c
+0000000b V Parameters::Parameters()::__c
+0000000b V Parameters::Parameters()::__c
+0000000c t process_logs(unsigned char, Menu::arg const*)
+0000000c T GCS_MAVLINK::send_text(unsigned char, char const*)
+0000000c V vtable for IMU
+0000000c r setup_show(unsigned char, Menu::arg const*)::__c
+0000000c r report_xtrack()::__c
+0000000c r test_modeswitch(unsigned char, Menu::arg const*)::__c
+0000000c r control_failsafe(unsigned int)::__c
+0000000c r test_mode(unsigned char, Menu::arg const*)::__c
+0000000c V Parameters::Parameters()::__c
+0000000c V Parameters::Parameters()::__c
+0000000c V Parameters::Parameters()::__c
+0000000c V Parameters::Parameters()::__c
+0000000c V Parameters::Parameters()::__c
+0000000d r init_home()::__c
+0000000d r verify_RTL()::__c
+0000000d r demo_servos(unsigned char)::__c
+0000000d r select_logs(unsigned char, Menu::arg const*)::__c
+0000000d r report_gains()::__c
+0000000d r test_battery(unsigned char, Menu::arg const*)::__c
+0000000d r test_current(unsigned char, Menu::arg const*)::__c
+0000000d r print_log_menu()::__c
+0000000d r test_modeswitch(unsigned char, Menu::arg const*)::__c
+0000000d r Log_Read_Startup()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d B sonar_mode_filter
+0000000e t global destructors keyed to Serial
+0000000e t global constructors keyed to Serial
+0000000e V vtable for AP_Float16
+0000000e V vtable for AP_VarA
+0000000e V vtable for AP_VarS >
+0000000e V vtable for AP_VarS >
+0000000e V vtable for AP_VarT
+0000000e V vtable for AP_VarT
+0000000e V vtable for AP_VarT
+0000000e V vtable for AP_VarT
+0000000e r erase_logs(unsigned char, Menu::arg const*)::__c
+0000000e r process_may()::__c
+0000000e r select_logs(unsigned char, Menu::arg const*)::__c
+0000000e r report_gains()::__c
+0000000e r print_log_menu()::__c
+0000000e r setup_batt_monitor(unsigned char, Menu::arg const*)::__c
+0000000e r report_batt_monitor()::__c
+0000000e r report_flight_modes()::__c
+0000000e r test_wp(unsigned char, Menu::arg const*)::__c
+0000000e r test_gyro(unsigned char, Menu::arg const*)::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000f b current_loc
+0000000f b next_command
+0000000f b home
+0000000f b next_WP
+0000000f b prev_WP
+0000000f b guided_WP
+0000000f r report_gains()::__c
+0000000f r print_log_menu()::__c
+0000000f r failsafe_short_on_event()::__c
+0000000f r test_mag(unsigned char, Menu::arg const*)::__c
+0000000f V Parameters::Parameters()::__c
+0000000f V Parameters::Parameters()::__c
+0000000f V Parameters::Parameters()::__c
+0000000f V Parameters::Parameters()::__c
+0000000f V Parameters::Parameters()::__c
+0000000f V AP_IMU_Oilpan::AP_IMU_Oilpan(AP_ADC*, unsigned int)::__c
+00000010 b rc_override
+00000010 r planner_menu_commands
+00000010 W AP_VarT::cast_to_float() const
+00000010 W AP_VarT::cast_to_float() const
+00000010 r setup_radio(unsigned char, Menu::arg const*)::__c
+00000010 r report_gains()::__c
+00000010 r Log_Read_Startup()::__c
+00000010 r test_wp(unsigned char, Menu::arg const*)::__c
+00000010 r dump_log(unsigned char, Menu::arg const*)::__c
+00000010 t mavlink_get_channel_status
+00000011 r erase_logs(unsigned char, Menu::arg const*)::__c
+00000011 r set_next_WP(Location*)::__c
+00000011 r zero_eeprom()::__c
+00000011 r test_airspeed(unsigned char, Menu::arg const*)::__c
+00000011 r startup_ground()::__c
+00000011 r Log_Read_Attitude()::__c
+00000011 r load_next_command_from_EEPROM()::__c
+00000012 B Serial
+00000012 B Serial1
+00000012 B Serial3
+00000012 W AP_Float16::~AP_Float16()
+00000012 W AP_VarA::~AP_VarA()
+00000012 W AP_VarS >::~AP_VarS()
+00000012 W AP_VarS >::~AP_VarS()
+00000012 W AP_VarT::~AP_VarT()
+00000012 W AP_VarT::~AP_VarT()
+00000012 W AP_VarT::~AP_VarT()
+00000012 W AP_VarT::~AP_VarT()
+00000012 W AP_VarT::serialize(void*, unsigned int) const
+00000012 r print_done()::__c
+00000012 r select_logs(unsigned char, Menu::arg const*)::__c
+00000012 r init_barometer()::__c
+00000012 r startup_IMU_ground()::__c
+00000012 r report_batt_monitor()::__c
+00000012 r report_batt_monitor()::__c
+00000012 r GCS_MAVLINK::handleMessage(__mavlink_message*)::__c
+00000013 r report_gains()::__c
+00000013 r setup_compass(unsigned char, Menu::arg const*)::__c
+00000013 r Log_Read_Startup()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r dump_log(unsigned char, Menu::arg const*)::__c
+00000014 W AP_VarT::unserialize(void*, unsigned int)
+00000014 W AP_VarT::cast_to_float() const
+00000014 W AP_VarT::cast_to_float() const
+00000014 r set_guided_WP()::__c
+00000014 r test_wp(unsigned char, Menu::arg const*)::__c
+00000014 r test_imu(unsigned char, Menu::arg const*)::__c
+00000015 r map_baudrate(signed char, unsigned long)::__c
+00000015 r report_gains()::__c
+00000015 r init_ardupilot()::__c
+00000015 r print_hit_enter()::__c
+00000015 r test_gyro(unsigned char, Menu::arg const*)::__c
+00000015 r GCS_MAVLINK::handleMessage(__mavlink_message*)::__c
+00000016 r test_failsafe(unsigned char, Menu::arg const*)::__c
+00000016 r report_batt_monitor()::__c
+00000016 r test_wp(unsigned char, Menu::arg const*)::__c
+00000016 r GCS_MAVLINK::update()::__c
+00000016 B sonar
+00000017 r test_failsafe(unsigned char, Menu::arg const*)::__c
+00000017 r test_pressure(unsigned char, Menu::arg const*)::__c
+00000017 r test_wp(unsigned char, Menu::arg const*)::__c
+00000018 W AP_VarT::serialize(void*, unsigned int) const
+00000018 b mavlink_get_channel_status::m_mavlink_status
+00000018 r process_must()::__c
+00000018 r report_compass()::__c
+00000018 r Log_Read_Startup()::__c
+00000019 r report_batt_monitor()::__c
+00000019 r failsafe_long_on_event()::__c
+00000019 r GCS_MAVLINK::update()::__c
+0000001a r reset_control_switch()::__c
+0000001a r failsafe_short_on_event()::__c
+0000001a r Log_Read(int, int)::__c
+0000001b r failsafe_short_off_event()::__c
+0000001c W AP_VarA::unserialize(void*, unsigned int)
+0000001c W AP_VarS >::unserialize(void*, unsigned int)
+0000001c W AP_VarS >::unserialize(void*, unsigned int)
+0000001c W AP_VarT::unserialize(void*, unsigned int)
+0000001c W AP_VarA::serialize(void*, unsigned int) const
+0000001c W AP_VarS >::serialize(void*, unsigned int) const
+0000001c W AP_VarS >::serialize(void*, unsigned int) const
+0000001c r Log_Read_Current()::__c
+0000001c r Log_Read(int, int)::__c
+0000001c r Log_Read(int, int)::__c
+0000001d r setup_radio(unsigned char, Menu::arg const*)::__c
+0000001d r startup_ground()::__c
+0000001d r report_batt_monitor()::__c
+0000001e r flight_mode_strings
+0000001e t failsafe_short_off_event()
+0000001e r test_failsafe(unsigned char, Menu::arg const*)::__c
+0000001e r startup_ground()::__c
+0000001f r setup_compass(unsigned char, Menu::arg const*)::__c
+0000001f r init_ardupilot()::__c
+0000001f r test_mag(unsigned char, Menu::arg const*)::__c
+00000020 r test_current(unsigned char, Menu::arg const*)::__c
+00000020 r report_xtrack()::__c
+00000020 r init_barometer()::__c
+00000020 r Log_Read(int, int)::__c
+00000020 t byte_swap_4
+00000021 r print_log_menu()::__c
+00000021 r print_log_menu()::__c
+00000022 t print_blanks(int)
+00000022 t reset_I()
+00000022 W AP_Float16::~AP_Float16()
+00000022 W AP_VarA::~AP_VarA()
+00000022 W AP_VarS >::~AP_VarS()
+00000022 W AP_VarS >::~AP_VarS()
+00000022 W AP_VarT::~AP_VarT()
+00000022 W AP_VarT::~AP_VarT()
+00000022 W AP_VarT::~AP_VarT()
+00000022 W AP_VarT::~AP_VarT()
+00000022 r test_failsafe(unsigned char, Menu::arg const*)::__c
+00000022 r report_compass()::__c
+00000022 r increment_WP_index()::__c
+00000022 r verify_loiter_time()::__c
+00000023 r test_pressure(unsigned char, Menu::arg const*)::__c
+00000023 r print_gyro_offsets()::__c
+00000023 r navigate()::__c
+00000024 r test_dipswitches(unsigned char, Menu::arg const*)::__c
+00000024 r print_accel_offsets()::__c
+00000024 r verify_loiter_turns()::__c
+00000026 t print_done()
+00000026 b mavlink_queue
+00000026 t print_hit_enter()
+00000026 r init_ardupilot()::__c
+00000026 r print_PID(PID*)::__c
+00000027 r init_ardupilot()::__c
+00000027 r test_xbee(unsigned char, Menu::arg const*)::__c
+00000028 t main_menu_help(unsigned char, Menu::arg const*)
+00000028 t increment_WP_index()
+00000028 t help_log(unsigned char, Menu::arg const*)
+00000028 W AP_VarT::unserialize(void*, unsigned int)
+00000028 W AP_VarT::unserialize(void*, unsigned int)
+00000028 W AP_VarT::serialize(void*, unsigned int) const
+00000028 W AP_VarT::serialize(void*, unsigned int) const
+00000029 r test_gps(unsigned char, Menu::arg const*)::__c
+0000002a t setup_declination(unsigned char, Menu::arg const*)
+0000002a r init_ardupilot()::__c
+0000002a r startup_ground()::__c
+0000002b r verify_must()::__c
+0000002b r test_battery(unsigned char, Menu::arg const*)::__c
+0000002b r change_command(unsigned char)::__c
+0000002c t freeRAM()
+0000002d r startup_IMU_ground()::__c
+0000002e t reset_control_switch()
+0000002e t send_rate(unsigned int, unsigned int)
+0000002e W AP_Var_group::AP_Var_group(unsigned int, prog_char_t const*, unsigned char)
+0000002e r verify_nav_wp()::__c
+00000030 t setup_mode(unsigned char, Menu::arg const*)
+00000030 t planner_mode(unsigned char, Menu::arg const*)
+00000030 t test_mode(unsigned char, Menu::arg const*)
+00000030 r verify_may()::__c
+00000030 r print_log_menu()::__c
+00000031 r start_new_log(unsigned char)::__c
+00000032 T GCS_MAVLINK::init(FastSerial*)
+00000032 r test_dipswitches(unsigned char, Menu::arg const*)::__c
+00000034 W AP_Float16::serialize(void*, unsigned int) const
+00000034 r test_radio(unsigned char, Menu::arg const*)::__c
+00000034 t _mav_put_int8_t_array
+00000035 r test_radio_pwm(unsigned char, Menu::arg const*)::__c
+00000035 r Log_Read_Nav_Tuning()::__c
+00000036 t report_radio()
+00000036 r test_failsafe(unsigned char, Menu::arg const*)::__c
+00000037 r setup_factory(unsigned char, Menu::arg const*)::__c
+00000038 r test_dipswitches(unsigned char, Menu::arg const*)::__c
+00000038 r dump_log(unsigned char, Menu::arg const*)::__c
+00000039 r setup_radio(unsigned char, Menu::arg const*)::__c
+00000039 r planner_mode(unsigned char, Menu::arg const*)::__c
+00000039 r init_ardupilot()::__c
+0000003a t report_imu()
+0000003a W PID::~PID()
+0000003c t Log_Write_Mode(unsigned char)
+0000003c t verify_loiter_turns()
+0000003c W RC_Channel::~RC_Channel()
+0000003c r test_wp_print(Location*, unsigned char)::__c
+0000003c r test_mag(unsigned char, Menu::arg const*)::__c
+0000003d B g_gps_driver
+0000003e t verify_RTL()
+0000003e T GCS_MAVLINK::send_text(unsigned char, prog_char_t const*)
+0000003e W AP_VarT::AP_VarT(signed char, unsigned int, prog_char_t const*, unsigned char)
+00000040 W AP_Float16::unserialize(void*, unsigned int)
+00000040 t byte_swap_8
+00000040 t crc_accumulate
+00000040 B history
+00000043 r Log_Read_GPS()::__c
+00000044 W AP_VarT::AP_VarT(int, unsigned int, prog_char_t const*, unsigned char)
+00000044 r report_throttle()::__c
+00000045 r erase_logs(unsigned char, Menu::arg const*)::__c
+0000004a W AP_VarT::AP_VarT(AP_Var_group*, unsigned int, int, prog_char_t const*, unsigned char)
+0000004b r setup_factory(unsigned char, Menu::arg const*)::__c
+0000004c t setup_erase(unsigned char, Menu::arg const*)
+0000004c t Log_Read_Mode()
+0000004c B imu
+0000004e T mavlink_send_text(mavlink_channel_t, unsigned char, char const*)
+0000004e t setup_batt_monitor(unsigned char, Menu::arg const*)
+00000050 r log_menu_commands
+00000050 r main_menu_commands
+00000050 t failsafe_long_on_event()
+00000050 T GCS_MAVLINK::_find_parameter(unsigned int)
+00000054 t print_divider()
+00000054 t print_enabled(bool)
+00000054 t report_flight_modes()
+00000055 r setup_flightmodes(unsigned char, Menu::arg const*)::__c
+00000056 t change_command(unsigned char)
+00000058 t radio_input_switch()
+0000005a t update_GPS_light()
+0000005a W AP_VarT::AP_VarT(float, unsigned int, prog_char_t const*, unsigned char)
+0000005b r setup_erase(unsigned char, Menu::arg const*)::__c
+0000005c t readSwitch()
+0000005c t get_num_logs()
+0000005e T GCS_MAVLINK::_count_parameters()
+00000060 t print_switch(unsigned char, unsigned char)
+00000060 b barometer
+00000060 W AP_Float16::AP_Float16(AP_Var_group*, unsigned int, float, prog_char_t const*, unsigned char)
+00000060 t _mavlink_send_uart
+00000064 t Log_Write_Attitude(int, int, unsigned int)
+00000064 t test_xbee(unsigned char, Menu::arg const*)
+00000064 t mavlink_msg_param_value_send
+00000068 t zero_eeprom()
+00000068 t find_last_log_page(int)
+0000006a W GCS_MAVLINK::~GCS_MAVLINK()
+0000006c t setup_show(unsigned char, Menu::arg const*)
+0000006c t demo_servos(unsigned char)
+0000006e t setup_factory(unsigned char, Menu::arg const*)
+00000070 r init_ardupilot()::__c
+00000074 t verify_loiter_time()
+00000076 t startup_IMU_ground()
+00000078 t read_control_switch()
+0000007c t failsafe_short_on_event()
+0000007e t test_rawgps(unsigned char, Menu::arg const*)
+00000080 r setup_menu_commands
+00000080 T __vector_25
+00000080 T __vector_36
+00000080 T __vector_54
+00000086 t Log_Read_Attitude()
+00000088 t Log_Read_Raw()
+0000008a t Log_Write_Cmd(unsigned char, Location*)
+0000008c t print_gyro_offsets()
+0000008c t print_accel_offsets()
+0000008c r main_menu_help(unsigned char, Menu::arg const*)::__c
+00000090 t do_RTL()
+00000096 t map_baudrate(signed char, unsigned long)
+00000096 t test_wp_print(Location*, unsigned char)
+0000009c t update_servo_switches()
+0000009c t print_PID(PID*)
+0000009d B gcs
+0000009d B hil
+000000a0 t report_xtrack()
+000000a4 t Log_Read_Cmd()
+000000a4 T __vector_26
+000000a4 T __vector_37
+000000a4 T __vector_55
+000000ac t Log_Read_Performance()
+000000b0 t Log_Read_Startup()
+000000b4 t test_relay(unsigned char, Menu::arg const*)
+000000b4 t planner_gcs(unsigned char, Menu::arg const*)
+000000b6 t get_log_boundaries(unsigned char, int&, int&)
+000000b7 b compass
+000000bc t Log_Read_Control_Tuning()
+000000c0 t report_throttle()
+000000c0 t calc_bearing_error()
+000000c2 t test_eedump(unsigned char, Menu::arg const*)
+000000c4 t update_events()
+000000c4 t load_next_command_from_EEPROM()
+000000c7 B dcm
+000000c8 t test_modeswitch(unsigned char, Menu::arg const*)
+000000ca t control_failsafe(unsigned int)
+000000ce t zero_airspeed()
+000000ce W PID::PID(unsigned int, prog_char_t const*, float const&, float const&, float const&, int const&)
+000000ce r setup_mode(unsigned char, Menu::arg const*)::__c
+000000ce r help_log(unsigned char, Menu::arg const*)::__c
+000000d0 t get_bearing(Location*, Location*)
+000000d8 t verify_nav_wp()
+000000e0 b mavlink_parse_char::m_mavlink_message
+000000e4 t test_radio_pwm(unsigned char, Menu::arg const*)
+000000e7 r init_ardupilot()::__c
+000000ec t dump_log(unsigned char, Menu::arg const*)
+000000f0 t throttle_slew_limit()
+000000f0 t test_adc(unsigned char, Menu::arg const*)
+000000f4 t _mav_finalize_message_chan_send
+000000fa t Log_Read_Current()
+00000100 t trim_radio()
+00000102 t setup_compass(unsigned char, Menu::arg const*)
+00000106 t test_current(unsigned char, Menu::arg const*)
+00000106 t calc_nav_pitch()
+00000106 t get_wp_with_index(int)
+00000108 t test_battery(unsigned char, Menu::arg const*)
+0000010c W RC_Channel::RC_Channel(unsigned int, prog_char_t const*)
+00000110 t test_radio(unsigned char, Menu::arg const*)
+00000112 t get_distance(Location*, Location*)
+00000112 t startup_ground()
+00000112 t report_batt_monitor()
+00000112 T GCS_MAVLINK::GCS_MAVLINK(unsigned int)
+00000112 T GCS_MAVLINK::GCS_MAVLINK(unsigned int)
+00000114 t erase_logs(unsigned char, Menu::arg const*)
+00000114 t read_barometer()
+00000118 t test_gps(unsigned char, Menu::arg const*)
+00000118 T GCS_MAVLINK::_queued_send()
+00000120 t test_pressure(unsigned char, Menu::arg const*)
+00000130 t test_dipswitches(unsigned char, Menu::arg const*)
+00000130 t set_wp_with_index(Location, int)
+00000130 t setup_flightmodes(unsigned char, Menu::arg const*)
+00000130 r test_menu_commands
+00000134 T GCS_MAVLINK::send_message(unsigned char, unsigned long)
+0000013e t process_may()
+0000013e t calc_nav_roll()
+00000146 t select_logs(unsigned char, Menu::arg const*)
+0000014e t verify_may()
+0000014e T GCS_MAVLINK::update()
+00000152 t report_gains()
+00000158 t test_airspeed(unsigned char, Menu::arg const*)
+0000015e t test_gyro(unsigned char, Menu::arg const*)
+0000016a t process_must()
+0000016a t set_guided_WP()
+00000172 t navigate()
+00000174 t report_compass()
+0000017e t Log_Read_Nav_Tuning()
+000001a2 t test_imu(unsigned char, Menu::arg const*)
+000001ae T init_home()
+000001b2 t update_crosstrack()
+000001be t Log_Read_GPS()
+000001c8 t read_airspeed()
+000001ca t mavlink_delay(unsigned long)
+000001ca t start_new_log(unsigned char)
+000001ea T GCS_MAVLINK::data_stream_send(unsigned int, unsigned int)
+000001ec t init_barometer()
+000001fe t test_failsafe(unsigned char, Menu::arg const*)
+00000206 t set_next_WP(Location*)
+00000208 t calc_throttle()
+00000222 t Log_Read(int, int)
+00000228 t test_wp(unsigned char, Menu::arg const*)
+0000022c t set_mode(unsigned char)
+00000232 t verify_must()
+0000023e t print_radio_values()
+0000024c t update_loiter()
+0000025c t setup_radio(unsigned char, Menu::arg const*)
+000002e4 t read_radio()
+0000031e t read_battery()
+0000032e t test_mag(unsigned char, Menu::arg const*)
+0000033a W Parameters::~Parameters()
+00000404 t process_next_command()
+0000041c t set_servos()
+00000436 t print_log_menu()
+000004b2 t mavlink_parse_char
+0000059c t __static_initialization_and_destruction_0(int, int)
+000006da t init_ardupilot()
+00000831 b g
+0000090a W Parameters::Parameters()
+0000156a T GCS_MAVLINK::handleMessage(__mavlink_message*)
+000018ea t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int)
+00001ae8 T loop
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-1280.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-1280.build.log
new file mode 100644
index 0000000000..ceb4b3914d
--- /dev/null
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-1280.build.log
@@ -0,0 +1,129 @@
+%% ArduPlane.cpp
+%% ArduPlane.o
+In file included from /root/apm/ardupilot-mega/ArduPlane/ArduPlane.pde:32:
+/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
+/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
+autogenerated:63: warning: 'void add_altitude_data(long unsigned int, long int)' declared 'static' but never defined
+autogenerated:64: warning: 'void recalc_climb_rate()' declared 'static' but never defined
+autogenerated:65: warning: 'void print_climb_debug_info()' declared 'static' but never defined
+autogenerated:126: warning: 'void low_battery_event()' declared 'static' but never defined
+%% libraries/APM_BMP085/APM_BMP085.o
+%% libraries/APM_RC/APM_RC.o
+%% libraries/AP_ADC/AP_ADC_ADS7844.o
+%% libraries/AP_ADC/AP_ADC.o
+%% libraries/AP_ADC/AP_ADC_HIL.o
+%% libraries/AP_Common/AP_Common.o
+%% libraries/AP_Common/AP_Loop.o
+%% libraries/AP_Common/AP_MetaClass.o
+%% libraries/AP_Common/AP_Var.o
+%% libraries/AP_Common/AP_Var_menufuncs.o
+%% libraries/AP_Common/c++.o
+%% libraries/AP_Common/menu.o
+%% libraries/AP_Compass/AP_Compass_HIL.o
+%% libraries/AP_Compass/AP_Compass_HMC5843.o
+%% libraries/AP_Compass/Compass.o
+%% libraries/AP_DCM/AP_DCM.o
+%% libraries/AP_DCM/AP_DCM_HIL.o
+%% libraries/AP_GPS/AP_GPS_406.o
+%% libraries/AP_GPS/AP_GPS_Auto.o
+%% libraries/AP_GPS/AP_GPS_HIL.o
+%% libraries/AP_GPS/AP_GPS_IMU.o
+%% libraries/AP_GPS/AP_GPS_MTK16.o
+%% libraries/AP_GPS/AP_GPS_MTK.o
+%% libraries/AP_GPS/AP_GPS_NMEA.o
+%% libraries/AP_GPS/AP_GPS_SIRF.o
+%% libraries/AP_GPS/AP_GPS_UBLOX.o
+%% libraries/AP_GPS/GPS.o
+%% libraries/AP_IMU/AP_IMU_Oilpan.o
+%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
+%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
+%% libraries/AP_RangeFinder/RangeFinder.o
+%% libraries/DataFlash/DataFlash.o
+In file included from /root/apm/ardupilot-mega/libraries/DataFlash/DataFlash.cpp:35:
+/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
+/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
+%% libraries/FastSerial/BetterStream.o
+%% libraries/FastSerial/FastSerial.o
+%% libraries/FastSerial/vprintf.o
+%% libraries/GCS_MAVLink/GCS_MAVLink.o
+%% libraries/ModeFilter/ModeFilter.o
+%% libraries/PID/PID.o
+%% libraries/RC_Channel/RC_Channel.o
+%% libraries/memcheck/memcheck.o
+%% libraries/FastSerial/ftoa_engine.o
+%% libraries/FastSerial/ultoa_invert.o
+%% libraries/SPI/SPI.o
+In file included from /usr/local/share/arduino/libraries/SPI/SPI.cpp:12:
+/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
+/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
+%% libraries/Wire/Wire.o
+%% libraries/Wire/utility/twi.o
+cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C
+%% arduino/HardwareSerial.o
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/HardwareSerial.cpp:28:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+%% arduino/main.o
+%% arduino/Print.o
+%% arduino/Tone.o
+/usr/local/share/arduino/hardware/arduino/cores/arduino/Tone.cpp:93: warning: only initialized variables can be placed into program memory area
+%% arduino/WMath.o
+%% arduino/WString.o
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:26:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:84: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:85: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:86: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:87: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:88: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:89: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:90: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:91: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:93: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:94: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:95: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:100: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:101: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:102: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:103: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:104: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:105: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:106: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:107: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:109: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:110: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:111: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:116: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:117: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:118: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:119: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:120: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:121: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:122: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:123: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:125: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:126: warning: initialization makes integer from pointer without a cast
+/usr/local/share/arduino/hardware/arduino/cores/arduino/pins_arduino.c:127: warning: initialization makes integer from pointer without a cast
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/WInterrupts.c:34:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_analog.c:27:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring.c:25:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_digital.c:27:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_pulse.c:25:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_shift.c:25:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to ."
+%% arduino/core.a
+%% ArduPlane.elf
+%% ArduPlane.eep
+%% ArduPlane.hex
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-1280.size.txt
new file mode 100644
index 0000000000..eb429c3672
--- /dev/null
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-1280.size.txt
@@ -0,0 +1,699 @@
+00000001 b GPS_enabled
+00000001 b crash_timer
+00000001 b home_is_set
+00000001 b ch3_failsafe
+00000001 b land_complete
+00000001 b command_may_ID
+00000001 b command_must_ID
+00000001 b failsafeCounter
+00000001 b counter_one_herz
+00000001 b in_mavlink_delay
+00000001 b slow_loopCounter
+00000001 d takeoff_complete
+00000001 b command_may_index
+00000001 b command_must_index
+00000001 b delta_ms_fast_loop
+00000001 d ground_start_count
+00000001 b medium_loopCounter
+00000001 b rc_override_active
+00000001 b delta_ms_medium_loop
+00000001 b superslow_loopCounter
+00000001 b event_id
+00000001 b GPS_light
+00000001 b radio_input_switch()::bouncer
+00000001 d GCS_MAVLINK::handleMessage(__mavlink_message*)::mav_nav
+00000001 D control_mode
+00000001 B hindex
+00000001 B inverted_flight
+00000001 B mavdelay
+00000001 B n
+00000001 B oldSwitchPosition
+00000002 T ReadSCP1000()
+00000002 T mavlink_acknowledge(mavlink_channel_t, unsigned char, unsigned char, unsigned char)
+00000002 b climb_rate
+00000002 b loiter_sum
+00000002 b event_delay
+00000002 b event_value
+00000002 d elevon1_trim
+00000002 d elevon2_trim
+00000002 b event_repeat
+00000002 b loiter_delta
+00000002 b loiter_total
+00000002 b gps_fix_count
+00000002 b landing_pitch
+00000002 b takeoff_pitch
+00000002 b airspeed_nudge
+00000002 b condition_rate
+00000002 b mainLoop_count
+00000002 b throttle_nudge
+00000002 b loiter_time_max
+00000002 b event_undo_value
+00000002 b ground_start_avg
+00000002 b airspeed_pressure
+00000002 b adc
+00000002 r comma
+00000002 b g_gps
+00000002 b pmTest1
+00000002 b G_Dt_max
+00000002 b airspeed
+00000002 d ch1_temp
+00000002 d ch2_temp
+00000002 b failsafe
+00000002 b sonar_alt
+00000002 T GCS_MAVLINK::acknowledge(unsigned char, unsigned char, unsigned char)
+00000002 r print_divider()::__c
+00000002 d throttle_slew_limit()::last
+00000002 r test_gps(unsigned char, Menu::arg const*)::__c
+00000002 V PID::PID(unsigned int, prog_char_t const*, float const&, float const&, float const&, int const&)::__c
+00000002 V PID::PID(unsigned int, prog_char_t const*, float const&, float const&, float const&, int const&)::__c
+00000002 V PID::PID(unsigned int, prog_char_t const*, float const&, float const&, float const&, int const&)::__c
+00000003 r select_logs(unsigned char, Menu::arg const*)::__c
+00000003 r print_enabled(bool)::__c
+00000003 r setup_compass(unsigned char, Menu::arg const*)::__c
+00000003 r print_log_menu()::__c
+00000003 r report_compass()::__c
+00000004 b event_timer
+00000004 d hold_course
+00000004 b loiter_time
+00000004 b nav_bearing
+00000004 d scaleLongUp
+00000004 b wp_distance
+00000004 b abs_pressure
+00000004 b airspeed_raw
+00000004 b current_amps
+00000004 b energy_error
+00000004 b bearing_error
+00000004 b current_total
+00000004 b nav_loopTimer
+00000004 d scaleLongDown
+00000004 b airspeed_error
+00000004 b altitude_error
+00000004 b fast_loopTimer
+00000004 b perf_mon_timer
+00000004 b target_bearing
+00000004 d battery_voltage
+00000004 b condition_start
+00000004 b condition_value
+00000004 d nav_gain_scaler
+00000004 b offset_altitude
+00000004 b target_altitude
+00000004 d battery_voltage1
+00000004 d battery_voltage2
+00000004 d battery_voltage3
+00000004 d battery_voltage4
+00000004 b crosstrack_error
+00000004 b medium_loopTimer
+00000004 b takeoff_altitude
+00000004 b wp_totalDistance
+00000004 b ch3_failsafe_timer
+00000004 b crosstrack_bearing
+00000004 b fast_loopTimeStamp
+00000004 b old_target_bearing
+00000004 b rc_override_fs_timer
+00000004 r __menu_name__log_menu
+00000004 b airspeed_energy_error
+00000004 d G_Dt
+00000004 b load
+00000004 b dTnav
+00000004 b nav_roll
+00000004 b nav_pitch
+00000004 r select_logs(unsigned char, Menu::arg const*)::__c
+00000004 r select_logs(unsigned char, Menu::arg const*)::__c
+00000004 r select_logs(unsigned char, Menu::arg const*)::__c
+00000004 r select_logs(unsigned char, Menu::arg const*)::__c
+00000004 r select_logs(unsigned char, Menu::arg const*)::__c
+00000004 b mavlink_delay(unsigned long)::last_1hz
+00000004 b mavlink_delay(unsigned long)::last_3hz
+00000004 b mavlink_delay(unsigned long)::last_10hz
+00000004 b mavlink_delay(unsigned long)::last_50hz
+00000004 r print_enabled(bool)::__c
+00000004 r setup_compass(unsigned char, Menu::arg const*)::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r print_log_menu()::__c
+00000004 r report_compass()::__c
+00000004 r Log_Read_Performance()::__c
+00000004 r test_adc(unsigned char, Menu::arg const*)::__c
+00000004 V RC_Channel::RC_Channel(unsigned int, prog_char_t const*)::__c
+00000004 V RC_Channel::RC_Channel(unsigned int, prog_char_t const*)::__c
+00000004 V RC_Channel::RC_Channel(unsigned int, prog_char_t const*)::__c
+00000004 B xi
+00000004 B xi2
+00000004 B xiyi
+00000004 B xoffset
+00000004 B yi
+00000005 r __menu_name__test_menu
+00000005 r report_imu()::__c
+00000005 r select_logs(unsigned char, Menu::arg const*)::__c
+00000005 r select_logs(unsigned char, Menu::arg const*)::__c
+00000005 r select_logs(unsigned char, Menu::arg const*)::__c
+00000005 r Log_Read_Cmd()::__c
+00000005 r Log_Read_Raw()::__c
+00000005 r Log_Read_Mode()::__c
+00000005 r print_log_menu()::__c
+00000005 r print_log_menu()::__c
+00000005 r print_log_menu()::__c
+00000005 r print_log_menu()::__c
+00000005 r test_adc(unsigned char, Menu::arg const*)::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V Parameters::Parameters()::__c
+00000005 V RC_Channel::RC_Channel(unsigned int, prog_char_t const*)::__c
+00000005 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000005 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000005 V PID::PID(unsigned int, prog_char_t const*, float const&, float const&, float const&, int const&)::__c
+00000006 r __menu_name__setup_menu
+00000006 r test_eedump(unsigned char, Menu::arg const*)::__c
+00000006 r test_eedump(unsigned char, Menu::arg const*)::__c
+00000006 r zero_eeprom()::__c
+00000006 r init_ardupilot()::__c
+00000006 r Log_Read_Control_Tuning()::__c
+00000007 b setup_menu
+00000007 b planner_menu
+00000007 b log_menu
+00000007 b main_menu
+00000007 b test_menu
+00000007 r select_logs(unsigned char, Menu::arg const*)::__c
+00000007 r report_gains()::__c
+00000007 r report_radio()::__c
+00000007 r print_enabled(bool)::__c
+00000007 r test_airspeed(unsigned char, Menu::arg const*)::__c
+00000007 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000007 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000007 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000008 r __menu_name__planner_menu
+00000008 r report_compass()::__c
+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 report_compass()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 V Parameters::Parameters()::__c
+00000009 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000009 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000009 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+00000009 r GCS_MAVLINK::GCS_MAVLINK(unsigned int)::__c
+0000000a r __menu_name__main_menu
+0000000a r test_relay(unsigned char, Menu::arg const*)::__c
+0000000a r report_compass()::__c
+0000000a r report_throttle()::__c
+0000000a r test_mag(unsigned char, Menu::arg const*)::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a V Parameters::Parameters()::__c
+0000000a T setup
+0000000b r test_relay(unsigned char, Menu::arg const*)::__c
+0000000b r report_gains()::__c
+0000000b r test_airspeed(unsigned char, Menu::arg const*)::__c
+0000000b r test_airspeed(unsigned char, Menu::arg const*)::__c
+0000000b r control_failsafe(unsigned int)::__c
+0000000b V Parameters::Parameters()::__c
+0000000b V Parameters::Parameters()::__c
+0000000b V Parameters::Parameters()::__c
+0000000b V Parameters::Parameters()::__c
+0000000c t process_logs(unsigned char, Menu::arg const*)
+0000000c T GCS_MAVLINK::send_text(unsigned char, char const*)
+0000000c V vtable for IMU
+0000000c r setup_show(unsigned char, Menu::arg const*)::__c
+0000000c r report_xtrack()::__c
+0000000c r test_modeswitch(unsigned char, Menu::arg const*)::__c
+0000000c r control_failsafe(unsigned int)::__c
+0000000c r test_mode(unsigned char, Menu::arg const*)::__c
+0000000c V Parameters::Parameters()::__c
+0000000c V Parameters::Parameters()::__c
+0000000c V Parameters::Parameters()::__c
+0000000c V Parameters::Parameters()::__c
+0000000c V Parameters::Parameters()::__c
+0000000d r init_home()::__c
+0000000d r verify_RTL()::__c
+0000000d r demo_servos(unsigned char)::__c
+0000000d r select_logs(unsigned char, Menu::arg const*)::__c
+0000000d r report_gains()::__c
+0000000d r test_battery(unsigned char, Menu::arg const*)::__c
+0000000d r test_current(unsigned char, Menu::arg const*)::__c
+0000000d r print_log_menu()::__c
+0000000d r test_modeswitch(unsigned char, Menu::arg const*)::__c
+0000000d r Log_Read_Startup()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d V Parameters::Parameters()::__c
+0000000d B sonar_mode_filter
+0000000e t global destructors keyed to Serial
+0000000e t global constructors keyed to Serial
+0000000e V vtable for AP_Float16
+0000000e V vtable for AP_VarA
+0000000e V vtable for AP_VarS >
+0000000e V vtable for AP_VarS >
+0000000e V vtable for AP_VarT
+0000000e V vtable for AP_VarT
+0000000e V vtable for AP_VarT
+0000000e V vtable for AP_VarT
+0000000e r erase_logs(unsigned char, Menu::arg const*)::__c
+0000000e r process_may()::__c
+0000000e r select_logs(unsigned char, Menu::arg const*)::__c
+0000000e r report_gains()::__c
+0000000e r print_log_menu()::__c
+0000000e r setup_batt_monitor(unsigned char, Menu::arg const*)::__c
+0000000e r report_batt_monitor()::__c
+0000000e r report_flight_modes()::__c
+0000000e r test_wp(unsigned char, Menu::arg const*)::__c
+0000000e r test_gyro(unsigned char, Menu::arg const*)::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000e V Parameters::Parameters()::__c
+0000000f b current_loc
+0000000f b next_command
+0000000f b home
+0000000f b next_WP
+0000000f b prev_WP
+0000000f b guided_WP
+0000000f r report_gains()::__c
+0000000f r print_log_menu()::__c
+0000000f r failsafe_short_on_event()::__c
+0000000f r test_mag(unsigned char, Menu::arg const*)::__c
+0000000f V Parameters::Parameters()::__c
+0000000f V Parameters::Parameters()::__c
+0000000f V Parameters::Parameters()::__c
+0000000f V Parameters::Parameters()::__c
+0000000f V Parameters::Parameters()::__c
+0000000f V AP_IMU_Oilpan::AP_IMU_Oilpan(AP_ADC*, unsigned int)::__c
+00000010 b rc_override
+00000010 r planner_menu_commands
+00000010 W AP_VarT::cast_to_float() const
+00000010 W AP_VarT::cast_to_float() const
+00000010 r setup_radio(unsigned char, Menu::arg const*)::__c
+00000010 r report_gains()::__c
+00000010 r Log_Read_Startup()::__c
+00000010 r test_wp(unsigned char, Menu::arg const*)::__c
+00000010 r dump_log(unsigned char, Menu::arg const*)::__c
+00000010 t mavlink_get_channel_status
+00000011 r erase_logs(unsigned char, Menu::arg const*)::__c
+00000011 r set_next_WP(Location*)::__c
+00000011 r zero_eeprom()::__c
+00000011 r test_airspeed(unsigned char, Menu::arg const*)::__c
+00000011 r startup_ground()::__c
+00000011 r Log_Read_Attitude()::__c
+00000011 r load_next_command_from_EEPROM()::__c
+00000012 B Serial
+00000012 B Serial1
+00000012 B Serial3
+00000012 W AP_Float16::~AP_Float16()
+00000012 W AP_VarA::~AP_VarA()
+00000012 W AP_VarS >::~AP_VarS()
+00000012 W AP_VarS >::~AP_VarS()
+00000012 W AP_VarT::~AP_VarT()
+00000012 W AP_VarT::~AP_VarT()
+00000012 W AP_VarT::~AP_VarT()
+00000012 W AP_VarT::~AP_VarT()
+00000012 W AP_VarT::serialize(void*, unsigned int) const
+00000012 r print_done()::__c
+00000012 r select_logs(unsigned char, Menu::arg const*)::__c
+00000012 r init_barometer()::__c
+00000012 r startup_IMU_ground()::__c
+00000012 r report_batt_monitor()::__c
+00000012 r report_batt_monitor()::__c
+00000012 r GCS_MAVLINK::handleMessage(__mavlink_message*)::__c
+00000013 r report_gains()::__c
+00000013 r setup_compass(unsigned char, Menu::arg const*)::__c
+00000013 r Log_Read_Startup()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r print_radio_values()::__c
+00000013 r dump_log(unsigned char, Menu::arg const*)::__c
+00000014 W AP_VarT::unserialize(void*, unsigned int)
+00000014 W AP_VarT::cast_to_float() const
+00000014 W AP_VarT::cast_to_float() const
+00000014 r set_guided_WP()::__c
+00000014 r test_wp(unsigned char, Menu::arg const*)::__c
+00000014 r test_imu(unsigned char, Menu::arg const*)::__c
+00000015 r map_baudrate(signed char, unsigned long)::__c
+00000015 r report_gains()::__c
+00000015 r init_ardupilot()::__c
+00000015 r print_hit_enter()::__c
+00000015 r test_gyro(unsigned char, Menu::arg const*)::__c
+00000015 r GCS_MAVLINK::handleMessage(__mavlink_message*)::__c
+00000016 r test_failsafe(unsigned char, Menu::arg const*)::__c
+00000016 r report_batt_monitor()::__c
+00000016 r test_wp(unsigned char, Menu::arg const*)::__c
+00000016 r GCS_MAVLINK::update()::__c
+00000016 B sonar
+00000017 r test_failsafe(unsigned char, Menu::arg const*)::__c
+00000017 r test_pressure(unsigned char, Menu::arg const*)::__c
+00000017 r test_wp(unsigned char, Menu::arg const*)::__c
+00000018 W AP_VarT::serialize(void*, unsigned int) const
+00000018 b mavlink_get_channel_status::m_mavlink_status
+00000018 r process_must()::__c
+00000018 r report_compass()::__c
+00000018 r Log_Read_Startup()::__c
+00000019 r report_batt_monitor()::__c
+00000019 r failsafe_long_on_event()::__c
+00000019 r GCS_MAVLINK::update()::__c
+0000001a r reset_control_switch()::__c
+0000001a r failsafe_short_on_event()::__c
+0000001a r Log_Read(int, int)::__c
+0000001b r failsafe_short_off_event()::__c
+0000001c W AP_VarA::unserialize(void*, unsigned int)
+0000001c W AP_VarS >::unserialize(void*, unsigned int)
+0000001c W AP_VarS >::unserialize(void*, unsigned int)
+0000001c W AP_VarT::unserialize(void*, unsigned int)
+0000001c W AP_VarA::serialize(void*, unsigned int) const
+0000001c W AP_VarS >::serialize(void*, unsigned int) const
+0000001c W AP_VarS >::serialize(void*, unsigned int) const
+0000001c r Log_Read_Current()::__c
+0000001c r Log_Read(int, int)::__c
+0000001c r Log_Read(int, int)::__c
+0000001d r setup_radio(unsigned char, Menu::arg const*)::__c
+0000001d r startup_ground()::__c
+0000001d r report_batt_monitor()::__c
+0000001e r flight_mode_strings
+0000001e t failsafe_short_off_event()
+0000001e r test_failsafe(unsigned char, Menu::arg const*)::__c
+0000001e r startup_ground()::__c
+0000001f r setup_compass(unsigned char, Menu::arg const*)::__c
+0000001f r init_ardupilot()::__c
+0000001f r test_mag(unsigned char, Menu::arg const*)::__c
+00000020 r test_current(unsigned char, Menu::arg const*)::__c
+00000020 r report_xtrack()::__c
+00000020 r init_barometer()::__c
+00000020 r Log_Read(int, int)::__c
+00000020 t byte_swap_4
+00000021 r print_log_menu()::__c
+00000021 r print_log_menu()::__c
+00000022 t print_blanks(int)
+00000022 t reset_I()
+00000022 W AP_Float16::~AP_Float16()
+00000022 W AP_VarA::~AP_VarA()
+00000022 W AP_VarS >::~AP_VarS()
+00000022 W AP_VarS >::~AP_VarS()
+00000022 W AP_VarT::~AP_VarT()
+00000022 W AP_VarT::~AP_VarT()
+00000022 W AP_VarT::~AP_VarT()
+00000022 W AP_VarT::~AP_VarT()
+00000022 r test_failsafe(unsigned char, Menu::arg const*)::__c
+00000022 r report_compass()::__c
+00000022 r increment_WP_index()::__c
+00000022 r verify_loiter_time()::__c
+00000023 r test_pressure(unsigned char, Menu::arg const*)::__c
+00000023 r print_gyro_offsets()::__c
+00000023 r navigate()::__c
+00000024 r test_dipswitches(unsigned char, Menu::arg const*)::__c
+00000024 r print_accel_offsets()::__c
+00000024 r verify_loiter_turns()::__c
+00000026 t print_done()
+00000026 b mavlink_queue
+00000026 t print_hit_enter()
+00000026 r init_ardupilot()::__c
+00000026 r print_PID(PID*)::__c
+00000027 r init_ardupilot()::__c
+00000027 r test_xbee(unsigned char, Menu::arg const*)::__c
+00000028 t main_menu_help(unsigned char, Menu::arg const*)
+00000028 t increment_WP_index()
+00000028 t help_log(unsigned char, Menu::arg const*)
+00000028 W AP_VarT::unserialize(void*, unsigned int)
+00000028 W AP_VarT::unserialize(void*, unsigned int)
+00000028 W AP_VarT::serialize(void*, unsigned int) const
+00000028 W AP_VarT::serialize(void*, unsigned int) const
+00000029 r test_gps(unsigned char, Menu::arg const*)::__c
+0000002a t setup_declination(unsigned char, Menu::arg const*)
+0000002a r init_ardupilot()::__c
+0000002a r startup_ground()::__c
+0000002b r verify_must()::__c
+0000002b r test_battery(unsigned char, Menu::arg const*)::__c
+0000002b r change_command(unsigned char)::__c
+0000002c t freeRAM()
+0000002d r startup_IMU_ground()::__c
+0000002e t reset_control_switch()
+0000002e t send_rate(unsigned int, unsigned int)
+0000002e W AP_Var_group::AP_Var_group(unsigned int, prog_char_t const*, unsigned char)
+0000002e r verify_nav_wp()::__c
+00000030 t setup_mode(unsigned char, Menu::arg const*)
+00000030 t planner_mode(unsigned char, Menu::arg const*)
+00000030 t test_mode(unsigned char, Menu::arg const*)
+00000030 r verify_may()::__c
+00000030 r print_log_menu()::__c
+00000031 r start_new_log(unsigned char)::__c
+00000032 T GCS_MAVLINK::init(FastSerial*)
+00000032 r test_dipswitches(unsigned char, Menu::arg const*)::__c
+00000034 W AP_Float16::serialize(void*, unsigned int) const
+00000034 r test_radio(unsigned char, Menu::arg const*)::__c
+00000034 t _mav_put_int8_t_array
+00000035 r test_radio_pwm(unsigned char, Menu::arg const*)::__c
+00000035 r Log_Read_Nav_Tuning()::__c
+00000036 t report_radio()
+00000036 r test_failsafe(unsigned char, Menu::arg const*)::__c
+00000037 r setup_factory(unsigned char, Menu::arg const*)::__c
+00000038 r test_dipswitches(unsigned char, Menu::arg const*)::__c
+00000038 r dump_log(unsigned char, Menu::arg const*)::__c
+00000039 r setup_radio(unsigned char, Menu::arg const*)::__c
+00000039 r planner_mode(unsigned char, Menu::arg const*)::__c
+00000039 r init_ardupilot()::__c
+0000003a t report_imu()
+0000003a W PID::~PID()
+0000003c t Log_Write_Mode(unsigned char)
+0000003c t verify_loiter_turns()
+0000003c W RC_Channel::~RC_Channel()
+0000003c r test_wp_print(Location*, unsigned char)::__c
+0000003c r test_mag(unsigned char, Menu::arg const*)::__c
+0000003d B g_gps_driver
+0000003e t verify_RTL()
+0000003e T GCS_MAVLINK::send_text(unsigned char, prog_char_t const*)
+0000003e W AP_VarT::AP_VarT(signed char, unsigned int, prog_char_t const*, unsigned char)
+00000040 W AP_Float16::unserialize(void*, unsigned int)
+00000040 t byte_swap_8
+00000040 t crc_accumulate
+00000040 B history
+00000043 r Log_Read_GPS()::__c
+00000044 W AP_VarT::AP_VarT(int, unsigned int, prog_char_t const*, unsigned char)
+00000044 r report_throttle()::__c
+00000045 r erase_logs(unsigned char, Menu::arg const*)::__c
+0000004a W AP_VarT::AP_VarT(AP_Var_group*, unsigned int, int, prog_char_t const*, unsigned char)
+0000004b r setup_factory(unsigned char, Menu::arg const*)::__c
+0000004c t setup_erase(unsigned char, Menu::arg const*)
+0000004c t Log_Read_Mode()
+0000004c B imu
+0000004e T mavlink_send_text(mavlink_channel_t, unsigned char, char const*)
+0000004e t setup_batt_monitor(unsigned char, Menu::arg const*)
+00000050 r log_menu_commands
+00000050 r main_menu_commands
+00000050 t failsafe_long_on_event()
+00000050 T GCS_MAVLINK::_find_parameter(unsigned int)
+00000054 t print_divider()
+00000054 t print_enabled(bool)
+00000054 t report_flight_modes()
+00000055 r setup_flightmodes(unsigned char, Menu::arg const*)::__c
+00000056 t change_command(unsigned char)
+00000058 t radio_input_switch()
+0000005a t update_GPS_light()
+0000005a W AP_VarT::AP_VarT(float, unsigned int, prog_char_t const*, unsigned char)
+0000005b r setup_erase(unsigned char, Menu::arg const*)::__c
+0000005c t readSwitch()
+0000005c t get_num_logs()
+0000005e T GCS_MAVLINK::_count_parameters()
+00000060 b barometer
+00000060 W AP_Float16::AP_Float16(AP_Var_group*, unsigned int, float, prog_char_t const*, unsigned char)
+00000060 t _mavlink_send_uart
+00000062 t print_switch(unsigned char, unsigned char)
+00000064 t Log_Write_Attitude(int, int, unsigned int)
+00000064 t test_xbee(unsigned char, Menu::arg const*)
+00000064 t mavlink_msg_param_value_send
+00000068 t zero_eeprom()
+00000068 t find_last_log_page(int)
+0000006a W GCS_MAVLINK::~GCS_MAVLINK()
+0000006c t setup_show(unsigned char, Menu::arg const*)
+0000006c t demo_servos(unsigned char)
+0000006e t setup_factory(unsigned char, Menu::arg const*)
+00000070 r init_ardupilot()::__c
+00000074 t verify_loiter_time()
+00000076 t startup_IMU_ground()
+00000078 t read_control_switch()
+0000007c t failsafe_short_on_event()
+0000007e t test_rawgps(unsigned char, Menu::arg const*)
+00000080 r setup_menu_commands
+00000080 T __vector_25
+00000080 T __vector_36
+00000080 T __vector_54
+00000086 t Log_Read_Attitude()
+00000088 t Log_Read_Raw()
+0000008a t Log_Write_Cmd(unsigned char, Location*)
+0000008c t print_gyro_offsets()
+0000008c t print_accel_offsets()
+0000008c r main_menu_help(unsigned char, Menu::arg const*)::__c
+00000090 t do_RTL()
+00000096 t map_baudrate(signed char, unsigned long)
+00000096 t test_wp_print(Location*, unsigned char)
+0000009c t update_servo_switches()
+0000009c t print_PID(PID*)
+0000009d B gcs
+0000009d B hil
+000000a0 t report_xtrack()
+000000a4 t Log_Read_Cmd()
+000000a4 T __vector_26
+000000a4 T __vector_37
+000000a4 T __vector_55
+000000ac t Log_Read_Performance()
+000000b2 t Log_Read_Startup()
+000000b4 t test_relay(unsigned char, Menu::arg const*)
+000000b4 t planner_gcs(unsigned char, Menu::arg const*)
+000000b6 t get_log_boundaries(unsigned char, int&, int&)
+000000b7 b compass
+000000bc t Log_Read_Control_Tuning()
+000000c0 t report_throttle()
+000000c0 t calc_bearing_error()
+000000c4 t update_events()
+000000c4 t load_next_command_from_EEPROM()
+000000c6 t test_eedump(unsigned char, Menu::arg const*)
+000000c7 B dcm
+000000ca t test_modeswitch(unsigned char, Menu::arg const*)
+000000ca t control_failsafe(unsigned int)
+000000ce t zero_airspeed()
+000000ce W PID::PID(unsigned int, prog_char_t const*, float const&, float const&, float const&, int const&)
+000000ce r setup_mode(unsigned char, Menu::arg const*)::__c
+000000ce r help_log(unsigned char, Menu::arg const*)::__c
+000000d0 t get_bearing(Location*, Location*)
+000000da t verify_nav_wp()
+000000e0 b mavlink_parse_char::m_mavlink_message
+000000e4 t test_radio_pwm(unsigned char, Menu::arg const*)
+000000e7 r init_ardupilot()::__c
+000000ec t dump_log(unsigned char, Menu::arg const*)
+000000f0 t throttle_slew_limit()
+000000f2 t test_adc(unsigned char, Menu::arg const*)
+000000f4 t _mav_finalize_message_chan_send
+000000fa t Log_Read_Current()
+00000100 t trim_radio()
+00000102 t setup_compass(unsigned char, Menu::arg const*)
+00000106 t test_current(unsigned char, Menu::arg const*)
+00000106 t calc_nav_pitch()
+00000106 t get_wp_with_index(int)
+00000108 t test_battery(unsigned char, Menu::arg const*)
+0000010c W RC_Channel::RC_Channel(unsigned int, prog_char_t const*)
+00000110 t test_radio(unsigned char, Menu::arg const*)
+00000112 t get_distance(Location*, Location*)
+00000112 t startup_ground()
+00000112 t report_batt_monitor()
+00000112 T GCS_MAVLINK::GCS_MAVLINK(unsigned int)
+00000112 T GCS_MAVLINK::GCS_MAVLINK(unsigned int)
+00000114 t read_barometer()
+00000116 t erase_logs(unsigned char, Menu::arg const*)
+00000118 t test_gps(unsigned char, Menu::arg const*)
+00000118 T GCS_MAVLINK::_queued_send()
+00000120 t test_pressure(unsigned char, Menu::arg const*)
+00000130 t test_dipswitches(unsigned char, Menu::arg const*)
+00000130 t set_wp_with_index(Location, int)
+00000130 t setup_flightmodes(unsigned char, Menu::arg const*)
+00000130 r test_menu_commands
+00000134 T GCS_MAVLINK::send_message(unsigned char, unsigned long)
+0000013e t process_may()
+0000013e t calc_nav_roll()
+00000146 t select_logs(unsigned char, Menu::arg const*)
+0000014e t verify_may()
+0000014e T GCS_MAVLINK::update()
+00000152 t report_gains()
+0000015a t test_airspeed(unsigned char, Menu::arg const*)
+0000015e t test_gyro(unsigned char, Menu::arg const*)
+0000016a t process_must()
+0000016a t set_guided_WP()
+00000172 t navigate()
+00000174 t report_compass()
+0000017e t Log_Read_Nav_Tuning()
+000001a2 t test_imu(unsigned char, Menu::arg const*)
+000001ae T init_home()
+000001b2 t update_crosstrack()
+000001be t Log_Read_GPS()
+000001c8 t read_airspeed()
+000001ca t mavlink_delay(unsigned long)
+000001ca t start_new_log(unsigned char)
+000001ea T GCS_MAVLINK::data_stream_send(unsigned int, unsigned int)
+000001ec t init_barometer()
+00000202 t test_failsafe(unsigned char, Menu::arg const*)
+00000206 t set_next_WP(Location*)
+00000208 t calc_throttle()
+00000226 t Log_Read(int, int)
+0000022c t test_wp(unsigned char, Menu::arg const*)
+0000022c t set_mode(unsigned char)
+00000232 t verify_must()
+0000023e t print_radio_values()
+0000024c t update_loiter()
+0000025c t setup_radio(unsigned char, Menu::arg const*)
+000002e4 t read_radio()
+0000031e t read_battery()
+0000032e t test_mag(unsigned char, Menu::arg const*)
+0000033a W Parameters::~Parameters()
+00000404 t process_next_command()
+0000041c t set_servos()
+0000044c t print_log_menu()
+000004b2 t mavlink_parse_char
+0000059c t __static_initialization_and_destruction_0(int, int)
+000006da t init_ardupilot()
+00000831 b g
+0000090a W Parameters::Parameters()
+0000156a T GCS_MAVLINK::handleMessage(__mavlink_message*)
+000018ea t mavlink_try_send_message(mavlink_channel_t, unsigned char, unsigned int)
+00001ae8 T loop
diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-2560.build.log b/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-2560.build.log
new file mode 100644
index 0000000000..ceb4b3914d
--- /dev/null
+++ b/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-2560.build.log
@@ -0,0 +1,129 @@
+%% ArduPlane.cpp
+%% ArduPlane.o
+In file included from /root/apm/ardupilot-mega/ArduPlane/ArduPlane.pde:32:
+/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
+/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
+autogenerated:63: warning: 'void add_altitude_data(long unsigned int, long int)' declared 'static' but never defined
+autogenerated:64: warning: 'void recalc_climb_rate()' declared 'static' but never defined
+autogenerated:65: warning: 'void print_climb_debug_info()' declared 'static' but never defined
+autogenerated:126: warning: 'void low_battery_event()' declared 'static' but never defined
+%% libraries/APM_BMP085/APM_BMP085.o
+%% libraries/APM_RC/APM_RC.o
+%% libraries/AP_ADC/AP_ADC_ADS7844.o
+%% libraries/AP_ADC/AP_ADC.o
+%% libraries/AP_ADC/AP_ADC_HIL.o
+%% libraries/AP_Common/AP_Common.o
+%% libraries/AP_Common/AP_Loop.o
+%% libraries/AP_Common/AP_MetaClass.o
+%% libraries/AP_Common/AP_Var.o
+%% libraries/AP_Common/AP_Var_menufuncs.o
+%% libraries/AP_Common/c++.o
+%% libraries/AP_Common/menu.o
+%% libraries/AP_Compass/AP_Compass_HIL.o
+%% libraries/AP_Compass/AP_Compass_HMC5843.o
+%% libraries/AP_Compass/Compass.o
+%% libraries/AP_DCM/AP_DCM.o
+%% libraries/AP_DCM/AP_DCM_HIL.o
+%% libraries/AP_GPS/AP_GPS_406.o
+%% libraries/AP_GPS/AP_GPS_Auto.o
+%% libraries/AP_GPS/AP_GPS_HIL.o
+%% libraries/AP_GPS/AP_GPS_IMU.o
+%% libraries/AP_GPS/AP_GPS_MTK16.o
+%% libraries/AP_GPS/AP_GPS_MTK.o
+%% libraries/AP_GPS/AP_GPS_NMEA.o
+%% libraries/AP_GPS/AP_GPS_SIRF.o
+%% libraries/AP_GPS/AP_GPS_UBLOX.o
+%% libraries/AP_GPS/GPS.o
+%% libraries/AP_IMU/AP_IMU_Oilpan.o
+%% libraries/AP_RangeFinder/AP_RangeFinder_MaxsonarXL.o
+%% libraries/AP_RangeFinder/AP_RangeFinder_SharpGP2Y.o
+%% libraries/AP_RangeFinder/RangeFinder.o
+%% libraries/DataFlash/DataFlash.o
+In file included from /root/apm/ardupilot-mega/libraries/DataFlash/DataFlash.cpp:35:
+/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
+/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
+%% libraries/FastSerial/BetterStream.o
+%% libraries/FastSerial/FastSerial.o
+%% libraries/FastSerial/vprintf.o
+%% libraries/GCS_MAVLink/GCS_MAVLink.o
+%% libraries/ModeFilter/ModeFilter.o
+%% libraries/PID/PID.o
+%% libraries/RC_Channel/RC_Channel.o
+%% libraries/memcheck/memcheck.o
+%% libraries/FastSerial/ftoa_engine.o
+%% libraries/FastSerial/ultoa_invert.o
+%% libraries/SPI/SPI.o
+In file included from /usr/local/share/arduino/libraries/SPI/SPI.cpp:12:
+/usr/local/share/arduino/libraries/SPI/SPI.h:25:1: warning: "SPI_CLOCK_DIV64" redefined
+/usr/local/share/arduino/libraries/SPI/SPI.h:20:1: warning: this is the location of the previous definition
+%% libraries/Wire/Wire.o
+%% libraries/Wire/utility/twi.o
+cc1: warning: command line option "-Wno-reorder" is valid for C++/ObjC++ but not for C
+%% arduino/HardwareSerial.o
+In file included from /usr/local/share/arduino/hardware/arduino/cores/arduino/wiring_private.h:30,
+ from /usr/local/share/arduino/hardware/arduino/cores/arduino/HardwareSerial.cpp:28:
+/usr/lib/gcc/avr/4.3.5/../../../avr/include/avr/delay.h:36:2: warning: #warning "This file has been moved to