Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-13 18:14:19 -03:00
Code Issues Packages Projects Releases Wiki Activity

SRV_Channel: ensure channel_mask is setup

Browse Source
This commit is contained in:
Andrew Tridgell 2017-04-17 18:59:51 +10:00
parent 1e62b5d5c7
commit 0682d30ebd
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/SRV_Channel/SRV_Channel_aux.cpp
View File

@ -408,6 +408,7 @@ bool SRV_Channels::set_aux_channel_default(SRV_Channel::Aux_servo_function_t fun
channels[channel].function.set(function); channels[channel].function.set(function);
channels[channel].aux_servo_function_setup(); channels[channel].aux_servo_function_setup();
function_mask.set((uint8_t)function); function_mask.set((uint8_t)function);
functions[function].channel_mask |= 1U<<channel;
return true; return true;
} }
@ -465,6 +466,9 @@ int16_t SRV_Channels::get_output_scaled(SRV_Channel::Aux_servo_function_t functi
*/ */
uint16_t SRV_Channels::get_output_channel_mask(SRV_Channel::Aux_servo_function_t function) uint16_t SRV_Channels::get_output_channel_mask(SRV_Channel::Aux_servo_function_t function)
{ {
if (!initialised) {
update_aux_servo_function();
}
if (function < SRV_Channel::k_nr_aux_servo_functions) { if (function < SRV_Channel::k_nr_aux_servo_functions) {
return functions[function].channel_mask; return functions[function].channel_mask;
} }