firmware build

This commit is contained in:
Michael Oborne 2011-11-14 13:33:45 +08:00
parent 2e354b43c2
commit 2c41ccdd03
2 changed files with 7 additions and 185 deletions

View File

@ -3,14 +3,14 @@
<Firmware>
<url>http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AP-1280.hex</url>
<url2560>http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AP-2560.hex</url2560>
<name>ArduPlane V2.24 </name>
<name>ArduPlane V2.25 </name>
<desc></desc>
<format_version>12</format_version>
</Firmware>
<Firmware>
<url>http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/APHIL-1280.hex</url>
<url2560>http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/APHIL-2560.hex</url2560>
<name>ArduPlane V2.24 HIL</name>
<name>ArduPlane V2.25 HIL</name>
<desc>
#define FLIGHT_MODE_CHANNEL 8
#define FLIGHT_MODE_1 AUTO
@ -44,7 +44,7 @@
<Firmware>
<url>http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-1280.hex</url>
<url2560>http://ardupilot-mega.googlecode.com/git/Tools/ArdupilotMegaPlanner/Firmware/AP-trunk-2560.hex</url2560>
<name>ArduPlane V2.24 APM trunk</name>
<name>ArduPlane V2.25 APM trunk</name>
<desc></desc>
<format_version>12</format_version>
</Firmware>

View File

@ -1,183 +1,5 @@
From https://code.google.com/p/ardupilot-mega
46f9a14..d69430d master -> origin/master
Updating 46f9a14..d69430d
Fast-forward
.project | 11 +
ArduBoat/.cproject | 46 -
ArduBoat/.project | 79 -
ArduBoat/ArduBoat.cpp | 25 -
ArduBoat/ControllerBoat.h | 2 +-
ArduCopter/.cproject | 970 -------
ArduCopter/.project | 84 -
ArduCopter/APM_Config.h | 2 -
ArduCopter/ArduCopter.pde | 336 ++-
ArduCopter/Attitude.pde | 201 +-
ArduCopter/GCS.h | 1 +
ArduCopter/GCS_Mavlink.pde | 122 +-
ArduCopter/Log.pde | 437 ++--
ArduCopter/Parameters.h | 31 +-
ArduCopter/commands.pde | 61 +-
ArduCopter/commands_logic.pde | 48 +-
ArduCopter/commands_process.pde | 51 +-
ArduCopter/config.h | 19 +-
ArduCopter/control_modes.pde | 100 +-
ArduCopter/heli.pde | 81 +-
ArduCopter/motors.pde | 215 +-
ArduCopter/motors_y6.pde | 6 +-
ArduCopter/navigation.pde | 92 +-
ArduCopter/radio.pde | 9 +-
ArduCopter/sensors.pde | 6 +-
ArduCopter/setup.pde | 48 +-
ArduCopter/system.pde | 63 +-
ArduCopter/test.pde | 37 +-
ArduPlane/.cproject | 468 ----
ArduPlane/.project | 80 -
ArduPlane/ArduPlane.pde | 15 +
ArduPlane/GCS.h | 1 +
ArduPlane/GCS_Mavlink.pde | 102 +-
ArduPlane/Log.pde | 7 +-
ArduPlane/commands.pde | 1 +
ArduPlane/commands_logic.pde | 19 +
ArduPlane/commands_process.pde | 26 +-
ArduPlane/config.h | 14 +
ArduPlane/navigation.pde | 2 +-
ArduRover/.cproject | 46 -
ArduRover/.project | 79 -
ArduRover/ArduRover.cpp | 27 -
ArduRover/CarStampede.h | 2 +
ArduRover/ControllerCar.h | 57 +-
CMakeLists.txt | 102 +-
README.txt | 52 +
Tools/ArdupilotMegaPlanner/ArduinoDetect.cs | 23 +-
Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj | 8 +-
Tools/ArdupilotMegaPlanner/ArdupilotMega.sln | 3 -
Tools/ArdupilotMegaPlanner/AviWriter.cs | 37 +-
Tools/ArdupilotMegaPlanner/Camera.Designer.cs | 407 ++--
Tools/ArdupilotMegaPlanner/Camera.cs | 308 ++-
Tools/ArdupilotMegaPlanner/Common.cs | 111 +-
Tools/ArdupilotMegaPlanner/CurrentState.cs | 180 ++-
.../GCSViews/Configuration.Designer.cs | 340 ++--
.../ArdupilotMegaPlanner/GCSViews/Configuration.cs | 82 +-
Tools/ArdupilotMegaPlanner/GCSViews/Firmware.cs | 7 +-
Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs | 64 +-
.../GCSViews/FlightPlanner.Designer.cs | 85 +-
.../ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs | 32 +-
.../GCSViews/FlightPlanner.resx | 2733 ++++++++++----------
Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs | 158 +-
Tools/ArdupilotMegaPlanner/HIL/QuadCopter.cs | 70 +-
Tools/ArdupilotMegaPlanner/Joystick.cs | 16 +-
Tools/ArdupilotMegaPlanner/JoystickSetup.cs | 6 +-
Tools/ArdupilotMegaPlanner/MAVLink.cs | 511 ++++-
Tools/ArdupilotMegaPlanner/MAVLinkTypes.cs | 1374 +++++-----
Tools/ArdupilotMegaPlanner/MAVLinkTypes0.9.cs | 1480 +++++++++++
Tools/ArdupilotMegaPlanner/MainV2.cs | 97 +-
Tools/ArdupilotMegaPlanner/Program.cs | 7 +
.../Properties/AssemblyInfo.cs | 2 +-
Tools/ArdupilotMegaPlanner/Setup/Setup.cs | 59 +-
Tools/ArdupilotMegaPlanner/Setup/Setup.resx | 4 +-
Tools/ArdupilotMegaPlanner/app.config | 6 -
.../bin/Release/ArdupilotMegaPlanner.application | 2 +-
.../bin/Release/ArdupilotMegaPlanner.exe | Bin 2188288 -> 2194432 bytes
.../bin/Release/ArdupilotMegaPlanner.exe.config | 6 -
.../bin/Release/GCSViews/FlightPlanner.resx | 2733 ++++++++++----------
.../bin/Release/Setup/Setup.resx | 4 +-
Tools/ArdupilotMegaPlanner/bin/Release/Updater.exe | Bin 8192 -> 8192 bytes
.../bin/Release/dataflashlog.xml | 43 +-
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/ArdupilotMegaPlanner/dataflashlog.xml | 43 +-
Tools/ArdupilotMegaPlanner/mavlinklist.pl | 13 +-
Tools/autotest/ArduCopter.parm | 32 +
Tools/autotest/ArduPlane.parm | 38 +
Tools/autotest/README | 1 +
Tools/autotest/ap1.txt | 7 +
Tools/autotest/arducopter.py | 340 +++
Tools/autotest/arduplane.py | 269 ++
Tools/autotest/autotest.py | 283 ++
Tools/autotest/common.py | 181 ++
Tools/autotest/mission1.txt | 11 +
Tools/autotest/mission_ttt.txt | 28 +
Tools/autotest/util.py | 179 ++
Tools/autotest/web/css/images/bg.png | Bin 0 -> 161 bytes
Tools/autotest/web/css/images/logo.png | Bin 0 -> 8440 bytes
Tools/autotest/web/css/main.css | 132 +
Tools/autotest/web/index.html | 42 +
apo/.cproject | 46 -
apo/.project | 79 -
libraries/.cproject | 270 --
libraries/.project | 79 -
libraries/APM_BMP085/APM_BMP085.cpp | 26 +-
libraries/APM_BMP085/APM_BMP085.h | 6 +-
libraries/APM_BMP085/APM_BMP085_hil.h | 3 -
libraries/APM_PI/APM_PI.cpp | 17 +-
libraries/APM_PI/APM_PI.h | 3 +-
libraries/APO/APO_DefaultSetup.h | 2 +-
libraries/APO/AP_Guide.cpp | 57 +-
libraries/APO/AP_Guide.h | 4 -
libraries/AP_Common/AP_Common.h | 20 +
libraries/AP_Common/Arduino.mk | 3 +
libraries/AP_Common/menu.cpp | 6 +-
libraries/AP_DCM/AP_DCM.cpp | 25 +-
libraries/AP_DCM/AP_DCM.h | 6 +-
libraries/AP_GPS/AP_GPS_IMU.cpp | 2 +-
libraries/AP_Mount/AP_Mount.cpp | 296 +++
libraries/AP_Mount/AP_Mount.h | 96 +
libraries/DataFlash/DataFlash.cpp | 1 +
libraries/DataFlash/DataFlash.h | 40 +-
libraries/Desktop/Desktop.mk | 32 +-
libraries/Desktop/Makefile.desktop | 17 +-
libraries/Desktop/README | 33 +-
libraries/Desktop/support/Arduino.cpp | 9 +-
libraries/Desktop/support/DataFlash.cpp | 259 ++
libraries/Desktop/support/FastSerial.cpp | 32 +-
libraries/Desktop/support/desktop.h | 10 +
libraries/Desktop/support/digital.c | 22 +
libraries/Desktop/support/ftoa_engine.c | 7 -
libraries/Desktop/support/main.cpp | 75 +-
libraries/Desktop/support/ultoa_invert.c | 12 -
libraries/FastSerial/vprintf.cpp | 32 +-
.../GCS_MAVLink/message_definitions/common.xml | 6 +-
.../message_definitions_v1.0/common.xml | 22 +-
libraries/RC_Channel/RC_Channel.cpp | 4 +
libraries/RC_Channel/RC_Channel_aux.cpp | 46 +
libraries/RC_Channel/RC_Channel_aux.h | 13 +-
140 files changed, 10797 insertions(+), 7801 deletions(-)
create mode 100644 .project
delete mode 100644 ArduBoat/.cproject
delete mode 100644 ArduBoat/.project
delete mode 100644 ArduBoat/ArduBoat.cpp
delete mode 100644 ArduCopter/.cproject
delete mode 100644 ArduCopter/.project
delete mode 100644 ArduPlane/.cproject
delete mode 100644 ArduPlane/.project
delete mode 100644 ArduRover/.cproject
delete mode 100644 ArduRover/.project
delete mode 100644 ArduRover/ArduRover.cpp
create mode 100644 Tools/ArdupilotMegaPlanner/MAVLinkTypes0.9.cs
create mode 100644 Tools/autotest/ArduCopter.parm
create mode 100644 Tools/autotest/ArduPlane.parm
create mode 100644 Tools/autotest/README
create mode 100644 Tools/autotest/ap1.txt
create mode 100644 Tools/autotest/arducopter.py
create mode 100644 Tools/autotest/arduplane.py
create mode 100755 Tools/autotest/autotest.py
create mode 100644 Tools/autotest/common.py
create mode 100644 Tools/autotest/mission1.txt
create mode 100644 Tools/autotest/mission_ttt.txt
create mode 100644 Tools/autotest/util.py
create mode 100644 Tools/autotest/web/css/images/bg.png
create mode 100644 Tools/autotest/web/css/images/logo.png
create mode 100644 Tools/autotest/web/css/main.css
create mode 100644 Tools/autotest/web/index.html
delete mode 100644 apo/.cproject
delete mode 100644 apo/.project
delete mode 100644 libraries/.cproject
delete mode 100644 libraries/.project
create mode 100644 libraries/AP_Mount/AP_Mount.cpp
create mode 100644 libraries/AP_Mount/AP_Mount.h
create mode 100644 libraries/Desktop/support/DataFlash.cpp
create mode 100644 libraries/Desktop/support/desktop.h
create mode 100644 libraries/Desktop/support/digital.c
delete mode 100644 libraries/Desktop/support/ftoa_engine.c
delete mode 100644 libraries/Desktop/support/ultoa_invert.c
d69430d..765bef0 master -> origin/master
Merge made by recursive.
ArduPlane/ArduPlane.pde | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)