diff options
| author | Julian Oes <joes@student.ethz.ch> | 2013-02-17 15:04:01 -0800 |
|---|---|---|
| committer | Julian Oes <joes@student.ethz.ch> | 2013-02-17 15:04:01 -0800 |
| commit | 3bc385c789f2b39cda066551ff1d5b767ab26aec (patch) | |
| tree | f6912e76eb408546cb8b808f08d7f9051e8b8da9 /apps/sensors | |
| parent | 0e2db0beb9228720a40bd19a7bd8891e5a8fdaba (diff) | |
| download | px4-firmware-3bc385c789f2b39cda066551ff1d5b767ab26aec.tar.gz px4-firmware-3bc385c789f2b39cda066551ff1d5b767ab26aec.tar.bz2 px4-firmware-3bc385c789f2b39cda066551ff1d5b767ab26aec.zip | |
Checkpoint: Added arming state check
Diffstat (limited to 'apps/sensors')
| -rw-r--r-- | apps/sensors/sensor_params.c | 10 | ||||
| -rw-r--r-- | apps/sensors/sensors.cpp | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/apps/sensors/sensor_params.c b/apps/sensors/sensor_params.c index 9f23ebbba..df7f66116 100644 --- a/apps/sensors/sensor_params.c +++ b/apps/sensors/sensor_params.c @@ -158,13 +158,11 @@ PARAM_DEFINE_INT32(RC_MAP_PITCH, 2); PARAM_DEFINE_INT32(RC_MAP_THROTTLE, 3); PARAM_DEFINE_INT32(RC_MAP_YAW, 4); -PARAM_DEFINE_INT32(RC_MAP_OVER_SW, 5); -PARAM_DEFINE_INT32(RC_MAP_MODE_SW, 6); +PARAM_DEFINE_INT32(RC_MAP_MODE_SW, 5); +PARAM_DEFINE_INT32(RC_MAP_RETURN_SW, 6); +PARAM_DEFINE_INT32(RC_MAP_MISSIO_SW, 0); -PARAM_DEFINE_INT32(RC_MAP_MAN_SW, 0); -PARAM_DEFINE_INT32(RC_MAP_SAS_SW, 0); -PARAM_DEFINE_INT32(RC_MAP_RTL_SW, 0); -PARAM_DEFINE_INT32(RC_MAP_OFFB_SW, 0); +//PARAM_DEFINE_INT32(RC_MAP_OFFB_SW, 0); PARAM_DEFINE_INT32(RC_MAP_FLAPS, 0); diff --git a/apps/sensors/sensors.cpp b/apps/sensors/sensors.cpp index 28579bc70..ce404ee7e 100644 --- a/apps/sensors/sensors.cpp +++ b/apps/sensors/sensors.cpp @@ -438,7 +438,7 @@ Sensors::Sensors() : _parameter_handles.rc_map_flaps = param_find("RC_MAP_FLAPS"); /* optional mode switches, not mapped per default */ - _parameter_handles.rc_map_mission_sw = param_find("RC_MAP_MISSION_SW"); + _parameter_handles.rc_map_mission_sw = param_find("RC_MAP_MISSIO_SW"); // _parameter_handles.rc_map_offboard_ctrl_mode_sw = param_find("RC_MAP_OFFB_SW"); |