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/drivers | |
| 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/drivers')
| -rw-r--r-- | src/drivers/px4io/px4io.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index d212be766..3871b4a2c 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -1265,11 +1265,18 @@ PX4IO::io_set_rc_config() if ((ichan >= 0) && (ichan < (int)_max_rc_input)) input_map[ichan - 1] = 3; - param_get(param_find("RC_MAP_MODE_SW"), &ichan); + param_get(param_find("RC_MAP_FLAPS"), &ichan); if ((ichan >= 0) && (ichan < (int)_max_rc_input)) input_map[ichan - 1] = 4; + param_get(param_find("RC_MAP_MODE_SW"), &ichan); + + if ((ichan >= 0) && (ichan < (int)_max_rc_input)) { + /* use out of normal bounds index to indicate special channel */ + input_map[ichan - 1] = PX4IO_P_RC_CONFIG_ASSIGNMENT_MODESWITCH; + } + /* * Iterate all possible RC inputs. */ |