fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 06:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

msg: re-use manual_control_input in setpoint

Browse Source 
This way we avoid duplication between manual_control_input and
manual_control_setpoint.
This commit is contained in:
Julian Oes
2021-11-09 16:05:25 +01:00
committed by Matthias Grob
parent baf81abbab
commit 6a6b8d49fc
21 changed files with 125 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/vmount/input_rc.cpp
+6 -6
View File
@@ -155,22 +155,22 @@ float InputRC::_get_aux_value(const manual_control_setpoint_s &manual_control_se
switch (_aux_channels[channel_idx]) {
case 1:
return manual_control_setpoint.aux1;
return manual_control_setpoint.chosen_input.aux1;
case 2:
return manual_control_setpoint.aux2;
return manual_control_setpoint.chosen_input.aux2;
case 3:
return manual_control_setpoint.aux3;
return manual_control_setpoint.chosen_input.aux3;
case 4:
return manual_control_setpoint.aux4;
return manual_control_setpoint.chosen_input.aux4;
case 5:
return manual_control_setpoint.aux5;
return manual_control_setpoint.chosen_input.aux5;
case 6:
return manual_control_setpoint.aux6;
return manual_control_setpoint.chosen_input.aux6;
default:
return 0.0f;