Commit Graph

3371 Commits

Author SHA1 Message Date
James Goppert
fcb4d9cb15 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-11-27 23:56:17 -05:00
James Goppert
999a5892f0 Fixed mode switching. 2011-11-27 23:55:28 -05:00
Andrew Tridgell
f30bca01c9 autotest: use idle_hooks to prevent lockup 2011-11-28 13:53:57 +11:00
Andrew Tridgell
df957db8d9 desktop: setup TCP sockets as non-blocking
the sendto() blocks unexpectedly on MacOS
2011-11-28 13:53:57 +11:00
Andrew Tridgell
4036604fb7 mavlink: move Mavlink_compat.h to common code
this will allow it to be used by ArduCopter
2011-11-28 13:53:57 +11:00
Andrew Tridgell
5ae929ace9 build: CLI_SLIDER_ENABLED doesn't need to be forced off in apm2 build
this is handled by config.h now
2011-11-28 13:53:57 +11:00
Doug Weibel
7960e7963c Add Guided mode to failsafe handling 2011-11-26 21:10:53 -07:00
Doug Weibel
997ddde7f5 Added back the feature to prompt users when an invalid CLI command is entered.
Thanks to Yury Smirnov for this patch!
2011-11-26 21:10:53 -07:00
Jason Short
940fa9621c Added minimum Altitude for RTL failsafe 2011-11-26 16:39:29 -08:00
Jason Short
44cb73c9fa added safety checks for RTL 2011-11-26 16:39:29 -08:00
Jason Short
d0af4e7200 CH7 with params 2011-11-26 16:39:29 -08:00
Jason Short
ec5b080167 Enable RTL 2011-11-26 16:39:29 -08:00
Jason Short
ca5e4bb802 Allow output of system type 2011-11-26 16:39:28 -08:00
Jason Short
1621f3a638 allow CH7 to be set via params 2011-11-26 16:39:28 -08:00
Jason Short
ea911e0bcb updated failsafe code 2011-11-26 16:39:28 -08:00
Jason Short
19c3c27ed0 Erasing Logs at new FW version detection 2011-11-26 16:39:28 -08:00
Jason Short
52297679c4 sending Mavlink system type 2011-11-26 16:39:28 -08:00
Andrew Tridgell
0da5125b7f upload: force hex file format for upload
this should fix a problem with hex file format detection on MacOS
2011-11-27 09:36:10 +11:00
Michael Oborne
44f62c7776 APM Planner 1.0.98
fix wp rearange
fix right click jump/loiter option
fix problem when speech enabled on connect
2011-11-26 20:49:13 +08:00
Michael Oborne
639746649a firmware build 2011-11-26 20:32:15 +08:00
Andrew Tridgell
5784acd55f autotest: fixed log dump
log numbers are no longer sequential
2011-11-26 19:16:56 +11:00
Andrew Tridgell
8ab0dbdba7 autotest: fixed remote viewing of ArduCopter autotest 2011-11-26 18:35:25 +11:00
Andrew Tridgell
0720bf7bf1 desktop: build fix for fjall 2011-11-26 18:24:29 +11:00
Andrew Tridgell
ee04c0ef50 autotest: cope with exceptions in tests leaving child processes 2011-11-26 18:12:42 +11:00
Andrew Tridgell
f2a0a49d55 desktop: fixed desktop build for strlcat_P() changes 2011-11-26 17:18:09 +11:00
Andrew Tridgell
7fa59a6849 AP_Common: added typesafe wrapper for memcpy_P() 2011-11-26 17:17:50 +11:00
Andrew Tridgell
92e0e929a4 AP_Common: replace strlcat_P() with a C implementation
the one in the Arduino libc was giving us bogus results on one
machine, and is suspect. We couldn't spot what is wrong in the
assembler, but replacing the implementation with a C one fixes the
bug, so we replaced it
2011-11-26 17:02:56 +11:00
Andrew Tridgell
a048709828 Logs: don't print hundreds of bogus log boundaries
this can take quite a long time
2011-11-26 17:02:55 +11:00
Andrew Tridgell
c9b0b384f7 desktop: added framerate and initial height code
this allows the sensors to initialise before the simulator has
connected. The GPS will give a value indicating no GPS lock
2011-11-25 20:00:19 -08:00
Andrew Tridgell
24a7a18481 desktop: fixed swap_float()
get indexes right
2011-11-25 20:00:19 -08:00
Andrew Tridgell
62f98b091f desktop: import updated DataFlash code
this fixes a logging bug
2011-11-25 20:00:19 -08:00
Andrew Tridgell
c64a5f354e autotest: enable new SITL emulation code
this enables the register level SITL code
2011-11-25 20:00:19 -08:00
Andrew Tridgell
5fd04e0c23 autotest: mark stdout unbuffered
this makes the logs easier to read
2011-11-25 20:00:19 -08:00
Andrew Tridgell
4877892d6e autotest: enable the compass for ArduCopter
needed for new SITL code
2011-11-25 20:00:19 -08:00
Andrew Tridgell
a99bcec762 desktop: report motors armed in desktop build too
this helps in autotest
2011-11-25 20:00:19 -08:00
Andrew Tridgell
de0c38339d desktop: fixed ADC value for airspeed 2011-11-25 20:00:19 -08:00
Pat Hickey
6ee477bd8d ArduCopter: rev version number from 2.0.51 to 2.1.0 Alpha 2011-11-25 20:00:19 -08:00
Pat Hickey
ab56a764d3 ArduPlane: rev version number from 2.26 to 2.27 Alpha 2011-11-25 20:00:19 -08:00
Pat Hickey
f7a9b8a563 ArduPlane: LED digital writes use LED_OFF and LED_ON 2011-11-25 20:00:19 -08:00
Andrew Tridgell
f66a98b969 scripts: added build_all.sh
this is useful when testing merge work
2011-11-25 20:00:19 -08:00
Andrew Tridgell
86927ac0a5 ArduPlane: rename purple to APM2 2011-11-25 20:00:19 -08:00
Andrew Tridgell
38c85c44ae ArduCopter: rename purple to APM2 2011-11-25 20:00:19 -08:00
Andrew Tridgell
02f25ac36d libraries: rename purple to APM2 2011-11-25 20:00:19 -08:00
Andrew Tridgell
3a542b3ef3 USB-MUX: enable USB MUX switching for ArduCopter 2011-11-25 20:00:19 -08:00
Andrew Tridgell
7def0e98e8 USB-MUX: auto-switch telemetry port based on UXB mux for ArduPlane
when USB is unplugged, switch baud rate to the SERIAL3_BAUD rate from
EEPROM
2011-11-25 20:00:19 -08:00
Andrew Tridgell
2b7e0c8494 DataFlash_Purple: added new logging methods needed for ArduPlane
builds, but not tested yet
2011-11-25 20:00:18 -08:00
Andrew Tridgell
cba93dbd43 DataFlash_APM1: re-add defines lost from merge 2011-11-25 20:00:18 -08:00
Andrew Tridgell
0ee654d6bf desktop: fixed desktop build
vtable error
2011-11-25 20:00:18 -08:00
Andrew Tridgell
338445e60c ArduCopter-HIL: fixed HIL build
Logging isn't always enabled
2011-11-25 20:00:18 -08:00
Andrew Tridgell
de2898e5db desktop: normalise roll and pitch rates 2011-11-25 20:00:18 -08:00