diff options
| author | Lorenz Meier <lm@qgroundcontrol.org> | 2014-10-22 16:25:56 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@qgroundcontrol.org> | 2014-10-22 16:25:56 +0200 |
| commit | 95789742c94ae2ca79fcadca245684cadadbe8f1 (patch) | |
| tree | dc2ea7588d4eb015c91e3e816c38dff00ab2df52 /src/modules/px4iofirmware/mixer.cpp | |
| parent | 74b401c8283a16393bbfd96361496f191f2075c0 (diff) | |
| parent | f4903316329ca91b9e872327f701de5b6a2cc13c (diff) | |
| download | px4-firmware-95789742c94ae2ca79fcadca245684cadadbe8f1.tar.gz px4-firmware-95789742c94ae2ca79fcadca245684cadadbe8f1.tar.bz2 px4-firmware-95789742c94ae2ca79fcadca245684cadadbe8f1.zip | |
Merge pull request #1390 from PX4/flaps
Enable flaps in manual override
Diffstat (limited to 'src/modules/px4iofirmware/mixer.cpp')
| -rw-r--r-- | src/modules/px4iofirmware/mixer.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/modules/px4iofirmware/mixer.cpp b/src/modules/px4iofirmware/mixer.cpp index 3e19333d8..c0b8ac358 100644 --- a/src/modules/px4iofirmware/mixer.cpp +++ b/src/modules/px4iofirmware/mixer.cpp @@ -60,13 +60,6 @@ extern "C" { */ #define FMU_INPUT_DROP_LIMIT_US 500000 -/* XXX need to move the RC_CHANNEL_FUNCTION out of rc_channels.h and into systemlib */ -#define ROLL 0 -#define PITCH 1 -#define YAW 2 -#define THROTTLE 3 -#define OVERRIDE 4 - /* current servo arm/disarm state */ static bool mixer_servos_armed = false; static bool should_arm = false; |