From https://code.google.com/p/ardupilot-mega 8a21477..b0bfa54 APM_Camera -> origin/APM_Camera 6f44fff..076459c master -> origin/master Updating 6f44fff..076459c Fast-forward ArduCopter/control_modes.pde | 16 + ArduCopter/defines.h | 1 + ArduCopter/system.pde | 4 + ArduPlane/ArduPlane.pde | 10 +- ArduPlane/Parameters.h | 3 + ArduPlane/config.h | 8 + Tools/ArduTracker/tags |148411 -------------------- Tools/ArdupilotMegaPlanner/GCSViews/Terminal.cs | 2 + Tools/ArdupilotMegaPlanner/Log.cs | 174 +- Tools/ArdupilotMegaPlanner/MainV2.cs | 9 +- .../Properties/AssemblyInfo.cs | 2 +- .../bin/Release/ArdupilotMegaPlanner.application | 2 +- .../bin/Release/ArdupilotMegaPlanner.exe | Bin 2194432 -> 2194944 bytes Tools/ArdupilotMegaPlanner/bin/Release/Updater.exe | Bin 8192 -> 8192 bytes Tools/ArdupilotMegaPlanner/bin/Release/resedit.exe | Bin 20480 -> 20480 bytes .../ru-RU/ArdupilotMegaPlanner.resources.dll | Bin 53248 -> 53248 bytes .../zh-Hans/ArdupilotMegaPlanner.resources.dll | Bin 380928 -> 380928 bytes apo/ControllerQuad.h | 51 +- apo/QuadArducopter.h | 10 +- libraries/APO/AP_ArmingMechanism.cpp | 57 + libraries/APO/AP_ArmingMechanism.h | 67 + libraries/APO/AP_BatteryMonitor.cpp | 2 + libraries/APO/AP_BatteryMonitor.h | 58 +- libraries/APO/AP_Guide.h | 1 + libraries/APO/AP_HardwareAbstractionLayer.h | 13 + libraries/APO/AP_Navigator.cpp | 20 +- libraries/Desktop/support/FastSerial.cpp | 283 +- 27 files changed, 517 insertions(+), 148687 deletions(-) delete mode 100644 Tools/ArduTracker/tags create mode 100644 libraries/APO/AP_ArmingMechanism.cpp create mode 100644 libraries/APO/AP_ArmingMechanism.h