diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-12 09:24:49 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-12 09:24:49 +0200 |
| commit | 8cbd38061ccccf2173b16ea4b5db69bb1fbd2fd4 (patch) | |
| tree | b1bde0324dec8ebe4144c3340a853cd7d5ccb4f6 /src/modules/sensors/sensors.cpp | |
| parent | 299918295201c235dd7b6c96f3a5e3241f3e2813 (diff) | |
| download | px4-firmware-8cbd38061ccccf2173b16ea4b5db69bb1fbd2fd4.tar.gz px4-firmware-8cbd38061ccccf2173b16ea4b5db69bb1fbd2fd4.tar.bz2 px4-firmware-8cbd38061ccccf2173b16ea4b5db69bb1fbd2fd4.zip | |
sensors: use new manual control setpoint variable names
Diffstat (limited to 'src/modules/sensors/sensors.cpp')
| -rw-r--r-- | src/modules/sensors/sensors.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp index e260aae45..22204ae5f 100644 --- a/src/modules/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp @@ -1402,10 +1402,10 @@ Sensors::rc_poll() manual.timestamp = rc_input.timestamp_last_signal; /* limit controls */ - manual.roll = get_rc_value(ROLL, -1.0, 1.0); - manual.pitch = get_rc_value(PITCH, -1.0, 1.0); - manual.yaw = get_rc_value(YAW, -1.0, 1.0); - manual.throttle = get_rc_value(THROTTLE, 0.0, 1.0); + manual.y = get_rc_value(ROLL, -1.0, 1.0); + manual.x = get_rc_value(PITCH, -1.0, 1.0); + manual.r = get_rc_value(YAW, -1.0, 1.0); + manual.z = get_rc_value(THROTTLE, 0.0, 1.0); manual.flaps = get_rc_value(FLAPS, -1.0, 1.0); manual.aux1 = get_rc_value(AUX_1, -1.0, 1.0); manual.aux2 = get_rc_value(AUX_2, -1.0, 1.0); @@ -1433,10 +1433,10 @@ Sensors::rc_poll() actuator_group_3.timestamp = rc_input.timestamp_last_signal; - actuator_group_3.control[0] = manual.roll; - actuator_group_3.control[1] = manual.pitch; - actuator_group_3.control[2] = manual.yaw; - actuator_group_3.control[3] = manual.throttle; + actuator_group_3.control[0] = manual.y; + actuator_group_3.control[1] = manual.x; + actuator_group_3.control[2] = manual.r; + actuator_group_3.control[3] = manual.z; actuator_group_3.control[4] = manual.flaps; actuator_group_3.control[5] = manual.aux1; actuator_group_3.control[6] = manual.aux2; |