Amilcar Lucas
f08cea8044
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
2357d3d41e
Ignore some files that should never be commited
2011-09-13 01:51:35 +02:00
Amilcar Lucas
5406991831
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
fdc56c9ad5
Merge branch 'master' of https://code.google.com/p/ardupilot-mega
2011-09-12 12:57:56 -07:00
Jason Short
ecd14f4425
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
d1a63db767
These defines got moved to the library
2011-09-12 21:32:05 +02:00
Amilcar Lucas
f40051a0ce
Remove file added by accident
2011-09-12 21:24:54 +02:00
Michael Oborne
8129c8e5c5
firmware build
2011-09-13 02:47:04 +08:00
DrZiplok
c0b4cb661f
GNU sed wants -r, Darwin/BSD sed wants -E.
2011-09-12 18:43:31 +00:00
Amilcar Lucas
c7b3bfd295
Use the G_RC_AUX macro when possible. Added more comments. Remove unused code
2011-09-12 20:21:12 +02:00
Doug Weibel
f05f56f83f
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
8e85c56246
Merge branch 'master' of https://code.google.com/p/ardupilot-mega
2011-09-12 07:25:05 -06:00
Doug Weibel
119d006e03
Change default setting for auto_trim to disabled per user (JB) request.
2011-09-12 07:24:52 -06:00
Mike Smith
c1460add3b
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
a6182965c1
Merge branch 'master' of https://code.google.com/p/ardupilot-mega
2011-09-11 21:46:53 -07:00
Doug Weibel
8c9757a8d1
Correct state machine processing for long failsafe event following short failsafe from lower modes
2011-09-11 21:59:46 -06:00
Doug Weibel
251c5875fb
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
885ec18182
Removed last of Xtrack
2011-09-11 20:40:05 -07:00
Jason Short
bae05178f0
removed Xtrack and increased rate error limit
2011-09-11 20:36:20 -07:00
Jason Short
285029856b
removed nav_bearing
2011-09-11 20:33:29 -07:00
Jason Short
5f94aa1d40
removed Nav_bearing
2011-09-11 20:32:58 -07:00
Jason Short
c15b6be83f
increased imax
2011-09-11 20:28:43 -07:00
Jason Short
466488e78d
removed nav_bearing - not used
2011-09-11 20:27:56 -07:00
Olivier ADLER
b9383537e2
Added missing motor tests for octa quad and octa V
2011-09-12 00:43:54 +02:00
Olivier ADLER
1ee65e3ef2
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
77c798abd5
Use G_RC_AUX macro to simplify accessing the auxiliary servos
2011-09-12 00:02:47 +02:00
Olivier ADLER
8b3e9d2df6
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
46f9d4cec8
This is ugly, but it fixes compilation on arduino
2011-09-11 23:25:06 +02:00
Amilcar Lucas
ce010b4e38
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
01559f4c22
firmware build
2011-09-12 02:50:53 +08:00
Jason Short
a822b3bf4b
Merge branch 'master' of https://code.google.com/p/ardupilot-mega
2011-09-11 11:48:38 -07:00
Jason Short
d733868fea
Fixed Yaw mode for CIRCLE
2011-09-11 11:48:11 -07:00
Michael Oborne
ad4fc23eea
firmware build
2011-09-12 02:24:00 +08:00
Jason Short
e6b7c57d26
Circle Mode now working
...
250Hz loop implemented
2011-09-11 11:22:01 -07:00
Jason Short
5a3a123b11
Merge branch 'master' of https://code.google.com/p/ardupilot-mega
2011-09-11 11:04:07 -07:00
Jason Short
d50ed35077
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
213969202a
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
d88b3644de
Signed-off-by: Olivier ADLER <contact2@nerim.net>
...
removing test file
2011-09-11 18:42:13 +02:00
Olivier ADLER
226adc7cf1
Merge branch 'master' of https://code.google.com/p/ardupilot-mega/
2011-09-11 18:36:54 +02:00
Olivier ADLER
53b8cfcf47
Signed-off-by: Olivier ADLER <contact2@nerim.net>
2011-09-11 18:36:09 +02:00
Amilcar Lucas
c5fd792024
Make the switch case complete
2011-09-11 18:32:24 +02:00
Olivier ADLER
cfb575b557
Signed-off-by: Olivier ADLER <contact2@nerim.net>
2011-09-11 18:32:00 +02:00
Amilcar Lucas
93cbe664d6
Only run camera code if camera support is enabled
2011-09-11 17:41:18 +02:00
Amilcar Lucas
9f14c5f578
Fix RC range reversal
2011-09-11 04:12:46 +02:00
Amilcar Lucas
2fa92aea4c
Fix RC range reversal
2011-09-11 04:12:04 +02:00
Amilcar Lucas
46185ee5d8
Revert "Fix RC range reversal"
...
This reverts commit d5046b1097b0b5455aa1a59e9dd80533e589432e.
2011-09-11 04:07:36 +02:00
Amilcar Lucas
51a8ec0ba8
Fix RC range reversal
2011-09-11 04:04:02 +02:00
Michael Oborne
8259672161
firmware build
2011-09-11 09:47:03 +08:00
Jason Short
482844b87a
Added Input Voltage value to params
2011-09-10 18:44:56 -07:00
Jason Short
6df9302a2d
Merge branch 'master' of https://code.google.com/p/ardupilot-mega
2011-09-10 18:37:51 -07:00