Commit Graph

137 Commits

Author SHA1 Message Date
Janne M 326f913e64 Merge branch 'divider' 2011-09-17 23:56:41 +03:00
Janne M 95dd8cc35b Added voltage divider, input voltage and amps per volt to parameters. 2011-09-17 22:32:19 +03:00
Amilcar Lucas c9d9ee0d3b Merge some small misc improvements from APM_Camera branch 2011-09-17 20:25:31 +02:00
Andrew Tridgell 4fed88ffbf ArduPilot updates for new DCM code
G_Dt is no longer needed, and scale ADC values by 8 to match old
constants
2011-09-17 14:58:02 +10:00
Andrew Tridgell d34f8ceca6 MAVLink: only send HEARTBEAT and SYS_STATUS during initialisation
I am concerned that some of the mavlink send routines may impact on
sensor calibration, so its safer to just send the minimum information
to keep the GCS happy
2011-09-17 14:58:02 +10:00
Michael Oborne c6eae87f8a fix remote error value 2011-09-15 18:26:59 +08: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
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 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
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 2a0912b867 Change default setting for auto_trim to disabled per user (JB) request. 2011-09-12 07:24:52 -06: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
Amilcar Lucas b8832fe9ab Use G_RC_AUX macro to simplify accessing the auxiliary servos 2011-09-12 00:02:47 +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
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
Amilcar Lucas ed112b2243 Only run camera code if camera support is enabled 2011-09-11 17:41:18 +02:00
Amilcar Lucas 55e6ac5fe6 Fix RC range reversal 2011-09-11 04:12:04 +02:00
Amilcar Lucas 42de4efc40 Revert "Fix RC range reversal"
This reverts commit d5046b1097b0b5455aa1a59e9dd80533e589432e.
2011-09-11 04:07:36 +02:00
Amilcar Lucas f53364bf41 Fix RC range reversal 2011-09-11 04:04:02 +02:00
Amilcar Lucas 5454cd503b For now point the camera manually via the RC inputs 2011-09-11 02:40:13 +02:00
Amilcar Lucas 5fc771f9d8 Added a comment about lower half of the array 2011-09-10 23:58:25 +02:00
Amilcar Lucas f60969a5d5 Added comments explaining when should the function be used 2011-09-10 23:36:47 +02:00
Amilcar Lucas 329df04157 Egg_drop has a 0..100 range 2011-09-10 23:35:23 +02:00
Andrew Tridgell 6d059b8eba Revert "added support for AP_ADC MAVLink packet"
This reverts commit a65a2dda2c1bfa95437880227a3abddc95b329f5.

I am reverting this not for any sane reason, but because my 3 APM
boards now lock up on any I2C operation, and I don't know why. I can't
see how this change could have caused it, but I don't want to take the
chance.
2011-09-10 22:00:29 +02:00
Andrew Tridgell a2d602b090 added support for AP_ADC MAVLink packet
this adds AP_ADC, which sends raw ADC 16 bit values for all 6 ADC
channels at the Extra3 MAVLink stream rate. Extra3 was previously
unused
2011-09-10 14:18:15 +02:00
Amilcar Lucas ada409855a Moved a camera mount function call, out of the servos update function 2011-09-10 13:47:09 +02:00
Amilcar Lucas b977007bdf Moved a function from radio.pde to the RC_Channel_aux library. Now its more readable and reusable 2011-09-10 13:26:29 +02:00
Amilcar Lucas 9e80f2e920 This is the real HEAD of the APM_Camera branch. Seams that lots of changes got lost in the SVN to GIT port 2011-09-09 16:18:38 +02:00
Amilcar Lucas 581603c3b7 This is the real HEAD of the APM_Camera branch. Seams that lots of changes got lost in the SVN to GIT port 2011-09-09 16:02:22 +02:00
Andrew Tridgell 6e2f231688 rename main pde file for arduino requirements 2011-09-09 11:52:25 +10:00
Andrew Tridgell a1b2cc7229 import APM_Camera branch from SVN 2011-09-09 11:45:13 +10:00
Andrew Tridgell 89fa70520f imported ArduPlane from ArduPilotMega svn 2011-09-09 11:29:39 +10:00