firmware build

This commit is contained in:
Michael Oborne 2011-11-21 04:53:20 +08:00
parent 2600f19172
commit 076b93967d
11 changed files with 15 additions and 57 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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(-)