Commit Graph

1465 Commits

Author SHA1 Message Date
Jason Short 0d31d775b8 cleanup
added more ifdef for optflow
2011-09-15 23:41:15 -07:00
Jason Short 9a508a20f4 Integration of optical flow
bug fixes for new Simple mode
increased Baro filter by 2 fields
2011-09-15 23:33:00 -07:00
Jason Short 3daabf3c8b Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-09-14 14:45:13 -07:00
Jason Short ae81a758de Removed Simple Mode
Added Simple option to mode switch positions
removed unused OptFlow code
added reset lat and lon error
removed unused init_auto
Fixed log formatting
Added simple mode bitmask
removed pitchmax
added CLI setup for enabling Simple mode to any switch position
2011-09-14 13:58:18 -07:00
unknown 7bb800aafc Merge branch 'master' of https://code.google.com/p/ardupilot-mega/ 2011-09-14 16:02:21 +02:00
unknown 9f028bb5a0 Adding CMake support 2011-09-14 15:44:55 +02:00
Michael Oborne 5b0560b92d Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-09-14 21:32:24 +08:00
Michael Oborne a6ca3d23b5 APM Planner 1.0.68
bug fix
test srtm
2011-09-14 21:31:00 +08:00
Amilcar Lucas c58b563584 Revert more of 6dcbc7f44bc0.
Fix an issue with initialization of channels that on-line changed their function.
For the curious people that the code size overhead of having any aux channel do any function (with this code) is 44 bytes.
 To see wich code I'm talking about, do a git diff 05057ac2d455..this_commit (replace this commit with the commit hash of this commit)
2011-09-13 14:01:35 +02:00
Amilcar Lucas ef955eace4 These changes were meant to be inside commit a14c06adc06b. I'm sorry but reverting stuff is not that easy 2011-09-13 01:54:47 +02:00
Amilcar Lucas 5a040784e4 Ignore some files that should never be commited 2011-09-13 01:51:35 +02:00
Amilcar Lucas dd843d18ec Added support for routing any function to any of the aux. servos.
This is a manual merge from the APM_Camera branch.
It reverts the stuff that Oliver did not menat to do with his commit 6dcbc7f44bc0
2011-09-13 01:24:06 +02:00
Jason Short bca934b538 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-09-12 12:57:56 -07:00
Jason Short 4a2f58b013 Cleaned up guided mode
Reduced ADC filter to 3 from 6 to increase speed of filter.
2011-09-12 12:57:36 -07:00
Amilcar Lucas 49b31299ef These defines got moved to the library 2011-09-12 21:32:05 +02:00
Amilcar Lucas e78d6dc046 Remove file added by accident 2011-09-12 21:24:54 +02:00
DrZiplok e84a422bd4 GNU sed wants -r, Darwin/BSD sed wants -E. 2011-09-12 18:43:31 +00:00
Amilcar Lucas f7f745055d Use the G_RC_AUX macro when possible. Added more comments. Remove unused code 2011-09-12 20:21:12 +02:00
Doug Weibel 5a14d546bb Correct bug in initialization of auxiliary channels
The value of aux_servo_function[CH_x] was not being set before the radio init_rc_in() function was setting channel angle/range.
2011-09-12 20:21:12 +02:00
Doug Weibel 816bd59af6 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-09-12 07:25:05 -06:00
Doug Weibel 2a0912b867 Change default setting for auto_trim to disabled per user (JB) request. 2011-09-12 07:24:52 -06:00
Mike Smith ae77029c98 Reinstate a Cygwin workround that was backed out by the previous changes.
Not all platforms support (or require) the -r argument to sed.
2011-09-11 22:20:54 -07:00
Jason Short 2c27be980d Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-09-11 21:46:53 -07:00
Doug Weibel d6370fd389 Correct state machine processing for long failsafe event following short failsafe from lower modes 2011-09-11 21:59:46 -06:00
Doug Weibel 1a8b74063a Disable stick mixing if in failsafe
If trim values differ from failsafe channel values then stick mixing will adversely affect performance while in failsafe
2011-09-11 21:50:32 -06:00
Jason Short 7e79612125 Removed last of Xtrack 2011-09-11 20:40:05 -07:00
Jason Short 7d57dfa3ec removed Xtrack and increased rate error limit 2011-09-11 20:36:20 -07:00
Jason Short efeb1555ba removed nav_bearing 2011-09-11 20:33:29 -07:00
Jason Short 1ae63e2a4c removed Nav_bearing 2011-09-11 20:32:58 -07:00
Jason Short 689bfb803c increased imax 2011-09-11 20:28:43 -07:00
Jason Short f2e33f8303 removed nav_bearing - not used 2011-09-11 20:27:56 -07:00
Olivier ADLER 36c982d84c Added missing motor tests for octa quad and octa V 2011-09-12 00:43:54 +02:00
Olivier ADLER 7e3983210c Merge branch 'APM_Camera' of https://code.google.com/p/ardupilot-mega/
Conflicts:
	ArduPlane/ArduPlane.pde
	libraries/AP_Camera/AP_Camera.h
	libraries/AP_Mount/AP_Mount.cpp
	libraries/AP_Mount/AP_Mount.h
2011-09-12 00:31:18 +02:00
Amilcar Lucas b8832fe9ab Use G_RC_AUX macro to simplify accessing the auxiliary servos 2011-09-12 00:02:47 +02:00
Olivier ADLER 6dfa53bcb1 Signed-off-by: Olivier ADLER <contact2@nerim.net>
slightly upped motor out values for motor test. Was too low for some ESCs.
2011-09-11 23:32:04 +02:00
Amilcar Lucas 69a9f44fee This is ugly, but it fixes compilation on arduino 2011-09-11 23:25:06 +02:00
Amilcar Lucas 5a27954e26 Moved update_aux_servo_function() to the RC_Channel_aux.* files.
This simplifies code sharing between ArduCopter and Arduplane at the expense of 48bytes.
Moved CH_x defines out of the defines.h file and into the library where they belong
2011-09-11 23:07:30 +02:00
Michael Oborne d96c39e99d firmware build 2011-09-12 02:50:53 +08:00
Jason Short cf91758305 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-09-11 11:48:38 -07:00
Jason Short 810d8e5cde Fixed Yaw mode for CIRCLE 2011-09-11 11:48:11 -07:00
Michael Oborne e3e46322dd firmware build 2011-09-12 02:24:00 +08:00
Jason Short db331efbae Circle Mode now working
250Hz loop implemented
2011-09-11 11:22:01 -07:00
Jason Short de04b8c260 Merge branch 'master' of https://code.google.com/p/ardupilot-mega 2011-09-11 11:04:07 -07:00
Jason Short e8fcf72966 Added a state machine intended to run at 250hz to the DCM. Spread load of DCM out to lower CPU. 2011-09-11 11:03:55 -07:00
Amilcar Lucas 966f9f962a Moved the RC_Channel_aux class to its own file. The includes could be improved, has anyone got any ideas how ? 2011-09-11 19:13:01 +02:00
Olivier ADLER 25867a7402 Signed-off-by: Olivier ADLER <contact2@nerim.net>
removing test file
2011-09-11 18:42:13 +02:00
Olivier ADLER a67527b92b Merge branch 'master' of https://code.google.com/p/ardupilot-mega/ 2011-09-11 18:36:54 +02:00
Olivier ADLER 63f17f246c Signed-off-by: Olivier ADLER <contact2@nerim.net> 2011-09-11 18:36:09 +02:00
Amilcar Lucas 7544b9abd3 Make the switch case complete 2011-09-11 18:32:24 +02:00
Olivier ADLER a76bdc72ae Signed-off-by: Olivier ADLER <contact2@nerim.net> 2011-09-11 18:32:00 +02:00