Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 02:55:07 +08:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Fixed input indexing, stupid 1-based indices on the GCS side (MP/QGC) caused confusion

Browse Source
This commit is contained in:
Lorenz Meier
2013-02-25 09:07:13 +01:00
parent 2284e668eb
commit ca794265c6
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/drivers/px4io/px4io.cpp
+9 -4
View File
@@ -694,21 +694,26 @@ PX4IO::io_set_rc_config()
for (unsigned i = 0; i < _max_rc_input; i++) for (unsigned i = 0; i < _max_rc_input; i++)
input_map[i] = -1; input_map[i] = -1;
/*
* NOTE: The indices for mapped channels are 1-based
* for compatibility reasons with existing
* autopilots / GCS'.
*/
param_get(param_find("RC_MAP_ROLL"), &ichan); param_get(param_find("RC_MAP_ROLL"), &ichan);
if ((ichan >= 0) && (ichan < (int)_max_rc_input)) if ((ichan >= 0) && (ichan < (int)_max_rc_input))
input_map[ichan] = 0; input_map[ichan - 1] = 0;
param_get(param_find("RC_MAP_PITCH"), &ichan); param_get(param_find("RC_MAP_PITCH"), &ichan);
if ((ichan >= 0) && (ichan < (int)_max_rc_input)) if ((ichan >= 0) && (ichan < (int)_max_rc_input))
input_map[ichan] = 1; input_map[ichan - 1] = 1;
param_get(param_find("RC_MAP_YAW"), &ichan); param_get(param_find("RC_MAP_YAW"), &ichan);
if ((ichan >= 0) && (ichan < (int)_max_rc_input)) if ((ichan >= 0) && (ichan < (int)_max_rc_input))
input_map[ichan] = 2; input_map[ichan - 1] = 2;
param_get(param_find("RC_MAP_THROTTLE"), &ichan); param_get(param_find("RC_MAP_THROTTLE"), &ichan);
if ((ichan >= 0) && (ichan < (int)_max_rc_input)) if ((ichan >= 0) && (ichan < (int)_max_rc_input))
input_map[ichan] = 3; input_map[ichan - 1] = 3;
ichan = 4; ichan = 4;
for (unsigned i = 0; i < _max_rc_input; i++) for (unsigned i = 0; i < _max_rc_input; i++)