Michael Oborne
13 years ago
10 changed files with 88 additions and 36 deletions
@ -1 +1,29 @@
@@ -1 +1,29 @@
|
||||
Already up-to-date. |
||||
From https://code.google.com/p/ardupilot-mega |
||||
66cc8dd..6f4e7ec master -> origin/master |
||||
Updating 66cc8dd..6f4e7ec |
||||
Fast-forward |
||||
ArduCopter/APM_Config.h | 2 +- |
||||
ArduCopter/ArduCopter.pde | 18 ++- |
||||
ArduCopter/commands.pde | 8 +- |
||||
ArduCopter/commands_process.pde | 3 +- |
||||
ArduCopter/motors_hexa.pde | 2 +- |
||||
ArduCopter/motors_octa.pde | 2 +- |
||||
ArduCopter/motors_octa_quad.pde | 2 +- |
||||
ArduCopter/motors_y6.pde | 3 +- |
||||
ArduPlane/ArduPlane.pde | 2 +- |
||||
ArduPlane/Log.pde | 5 +- |
||||
ArduPlane/commands_logic.pde | 13 ++- |
||||
Tools/ArdupilotMegaPlanner/CurrentState.cs | 1 - |
||||
Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs | 27 +++- |
||||
.../ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs | 149 +++++++++++++++++--- |
||||
Tools/ArdupilotMegaPlanner/HIL/QuadCopter.cs | 14 ++- |
||||
.../Properties/AssemblyInfo.cs | 2 +- |
||||
.../bin/Release/ArdupilotMegaPlanner.application | 2 +- |
||||
.../bin/Release/ArdupilotMegaPlanner.exe | Bin 2194432 -> 2195456 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 |
||||
Tools/autotest/arducopter.py | 58 ++++++--- |
||||
Tools/autotest/common.py | 16 ++- |
||||
24 files changed, 251 insertions(+), 78 deletions(-) |
||||
|
Loading…
Reference in new issue