diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt index 6c2208496d934efe79b1a6f5814e0e86a8a8ff06..658cbea72a5f9972e7b0bade9495feac6ef5c9af 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-1280.size.txt @@ -623,4 +623,4 @@ 000008fa b g 000009be t update_commands(bool) 000014f0 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001bc0 T loop +00001c1e T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt index ac07817565351c6fd0c04f1a25192b4567cffdf2..5050b23006fa217c7d2646ab14d5426048c512a7 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Hexa-2560.size.txt @@ -623,4 +623,4 @@ 000008fa b g 000009be t update_commands(bool) 000014f0 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001bc0 T loop +00001c1e T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt index ce952b7fa02121f4a19b00dd09ea4bc86a164d35..be02c8694c09887fc0fd83c1f65ac474f4b179a5 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-1280.size.txt @@ -615,4 +615,4 @@ 000008fa b g 000009be t update_commands(bool) 000017b8 T GCS_MAVLINK::handleMessage(__mavlink_message*) -000017d4 T loop +00001832 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt index b61e4b36b8d0df81c2e434bcc9dc4ad1ebf9af8b..09a098adddf398c55e017d8bb0501be51af5a742 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-QUADHIL-2560.size.txt @@ -615,4 +615,4 @@ 000008fa b g 000009be t update_commands(bool) 000017b8 T GCS_MAVLINK::handleMessage(__mavlink_message*) -000017d4 T loop +00001832 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt index ac89d2a8a30f1fd94b98d6d50969adb0d02308d0..56f2cab357f796b8508543f8ed3fc223f1eea7ec 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-1280.size.txt @@ -623,4 +623,4 @@ 000008fa b g 000009be t update_commands(bool) 000014f0 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001a9a T loop +00001af8 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt index 2d636affaafcf75c16934c398b00aabd49264247..7eac03fa061c03cca111902a8589b6c2054329c0 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Quad-2560.size.txt @@ -623,4 +623,4 @@ 000008fa b g 000009be t update_commands(bool) 000014f0 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001a9a T loop +00001af8 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt index 803ae4acd8a101098b01e845bc2e0d6fb1e98d0e..26f8427173e20d267bfd870f1033e91aef2e4072 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-1280.size.txt @@ -623,4 +623,4 @@ 000008fa b g 000009be t update_commands(bool) 000014f0 T GCS_MAVLINK::handleMessage(__mavlink_message*) -000019d6 T loop +00001a34 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt index 6ff9d78809b448196a5efd5fb2093c16810d6d00..fa5668bde0afbdcfbca11a53dbab3c6a053bec3c 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Tri-2560.size.txt @@ -623,4 +623,4 @@ 000008fa b g 000009be t update_commands(bool) 000014f0 T GCS_MAVLINK::handleMessage(__mavlink_message*) -000019d6 T loop +00001a34 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt index f9580e0e2cc669861c3e97cb8b096394fcf9d54a..665c862ca082d2dadaa7db6ee5540605496f35c9 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-1280.size.txt @@ -623,4 +623,4 @@ 000008fa b g 000009be t update_commands(bool) 000014f0 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001ce4 T loop +00001d42 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt index 553b7223a92c0cb090e45f87ca2a2a1754e39234..c353f44ecb0fd6874b2d6ee45b6f87ecb805f639 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt +++ b/Tools/ArdupilotMegaPlanner/Firmware/AC2-Y6-2560.size.txt @@ -623,4 +623,4 @@ 000008fa b g 000009be t update_commands(bool) 000014f0 T GCS_MAVLINK::handleMessage(__mavlink_message*) -00001ce4 T loop +00001d42 T loop diff --git a/Tools/ArdupilotMegaPlanner/Firmware/git.log b/Tools/ArdupilotMegaPlanner/Firmware/git.log index bba134ae9c719935a379635f6d0e5bcbe4cdc22b..7fc7238cc71c52d05de423dd00cda25d5de7aad4 100644 --- a/Tools/ArdupilotMegaPlanner/Firmware/git.log +++ b/Tools/ArdupilotMegaPlanner/Firmware/git.log @@ -1,49 +1,7 @@ From https://code.google.com/p/ardupilot-mega - 6d78bad..6d8e6a8 master -> origin/master -Updating 6d78bad..6d8e6a8 + 5602ec3..413fb29 master -> origin/master +Updating 5602ec3..413fb29 Fast-forward - ArduCopter/ArduCopter.pde | 59 +- - ArduCopter/GCS_Mavlink copy.txt | 2091 ++++++++++++++++++++ - ArduCopter/GCS_Mavlink.pde | 16 +- - ArduCopter/Log.pde | 27 + - ArduCopter/Parameters.h | 2 +- - ArduCopter/commands.pde | 7 +- - ArduCopter/commands_logic.pde | 8 +- - ArduCopter/control_modes.pde | 2 +- - ArduCopter/defines.h | 20 +- - ArduCopter/heli.pde | 115 +- - ArduCopter/system.pde | 4 + - ArduCopter/test.pde | 16 +- - ArduPlane/Log.pde | 7 + - .../Projects/arduino-usbserial/Arduino-usbserial.c | 2 +- - Tools/ArduPPM/Libraries/PPM_Encoder.h | 28 +- - Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj | 2 +- - Tools/ArdupilotMegaPlanner/CommsTCPSerial.cs | 21 +- - Tools/ArdupilotMegaPlanner/GCSViews/Firmware.cs | 7 +- - Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs | 9 +- - .../GCSViews/FlightPlanner.Designer.cs | 1 + - .../ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs | 64 +- - .../GCSViews/FlightPlanner.resx | 4 +- - Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs | 2 +- - Tools/ArdupilotMegaPlanner/MAVLink.cs | 15 +- - Tools/ArdupilotMegaPlanner/MainV2.Designer.cs | 10 +- - Tools/ArdupilotMegaPlanner/MainV2.cs | 8 + - Tools/ArdupilotMegaPlanner/Program.cs | 2 +- - .../Properties/AssemblyInfo.cs | 2 +- - Tools/ArdupilotMegaPlanner/Setup/Setup.Designer.cs | 1 + - Tools/ArdupilotMegaPlanner/Setup/Setup.cs | 8 +- - .../bin/Release/ArdupilotMegaPlanner.application | 2 +- - .../bin/Release/ArdupilotMegaPlanner.exe | Bin 2212864 -> 2214400 bytes - .../bin/Release/BSE.Windows.Forms.dll | Bin 141824 -> 141824 bytes - .../bin/Release/GCSViews/FlightPlanner.resx | 4 +- - .../bin/Release/GMap.NET.Core.dll | Bin 189952 -> 183808 bytes - .../bin/Release/GMap.NET.WindowsForms.dll | Bin 77824 -> 77824 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/autotest.py | 3 +- - Tools/autotest/mission2.txt | 2 +- - libraries/Desktop/support/DataFlash.cpp | 20 +- - 43 files changed, 2445 insertions(+), 146 deletions(-) - create mode 100644 ArduCopter/GCS_Mavlink copy.txt + ArduCopter/ArduCopter.pde | 15 +++++++-------- + ArduCopter/config.h | 4 ++-- + 2 files changed, 9 insertions(+), 10 deletions(-)