diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-11 07:35:40 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-11 07:35:40 +0100 |
| commit | 65c802862979041efc6014f8c6fac240d49a806b (patch) | |
| tree | 0c7c51baf52c1e74fef15d574fe70c0524fa041d /apps/px4io | |
| parent | 1d4feb690512fbb5e0ae3399c1b1595ca8ddb79a (diff) | |
| download | px4-firmware-65c802862979041efc6014f8c6fac240d49a806b.tar.gz px4-firmware-65c802862979041efc6014f8c6fac240d49a806b.tar.bz2 px4-firmware-65c802862979041efc6014f8c6fac240d49a806b.zip | |
Working on override channel mapping, allowed trim cal only with RC on
Diffstat (limited to 'apps/px4io')
| -rw-r--r-- | apps/px4io/mixer.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/px4io/mixer.cpp b/apps/px4io/mixer.cpp index 93fe93b39..ed7d684b6 100644 --- a/apps/px4io/mixer.cpp +++ b/apps/px4io/mixer.cpp @@ -72,6 +72,7 @@ extern "C" { #define PITCH 1 #define YAW 2 #define THROTTLE 3 +#define OVERRIDE 4 /* current servo arm/disarm state */ bool mixer_servos_armed = false; @@ -125,6 +126,7 @@ mixer_tick(void) rc_channel_data[PITCH] = system_state.rc_channel_data[system_state.rc_map[PITCH] - 1]; rc_channel_data[YAW] = system_state.rc_channel_data[system_state.rc_map[YAW] - 1]; rc_channel_data[THROTTLE] = system_state.rc_channel_data[system_state.rc_map[THROTTLE] - 1]; + //rc_channel_data[OVERRIDE] = system_state.rc_channel_data[system_state.rc_map[OVERRIDE] - 1]; /* get the remaining channels, no remapping needed */ for (unsigned i = 4; i < system_state.rc_channels; i++) { |