Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RC_Channel_aux: fixed a uninitialied variable error, and save a bit of stack space

This commit is contained in:
Andrew Tridgell 2012-02-14 17:46:59 +11:00
parent 4b9c08d075
commit 085cc00c33
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libraries/RC_Channel/RC_Channel_aux.cpp
View File

@ -74,13 +74,13 @@ RC_Channel_aux::output_ch(unsigned char ch_nr)
void update_aux_servo_function(RC_Channel_aux* rc_5, RC_Channel_aux* rc_6, RC_Channel_aux* rc_7, RC_Channel_aux* rc_8)
{
// positions 0..3 of this array never get used, but this is a stack array, so the entire array gets freed at the end of the function
RC_Channel_aux::Aux_servo_function_t aux_servo_function[NUM_CHANNELS]; // the function of the aux. servos
aux_servo_function[CH_5] = (RC_Channel_aux::Aux_servo_function_t)rc_5->function.get();
aux_servo_function[CH_6] = (RC_Channel_aux::Aux_servo_function_t)rc_6->function.get();
aux_servo_function[CH_7] = (RC_Channel_aux::Aux_servo_function_t)rc_7->function.get();
aux_servo_function[CH_8] = (RC_Channel_aux::Aux_servo_function_t)rc_8->function.get();
RC_Channel_aux::Aux_servo_function_t aux_servo_function[4];
aux_servo_function[0] = (RC_Channel_aux::Aux_servo_function_t)rc_5->function.get();
aux_servo_function[1] = (RC_Channel_aux::Aux_servo_function_t)rc_6->function.get();
aux_servo_function[2] = (RC_Channel_aux::Aux_servo_function_t)rc_7->function.get();
aux_servo_function[3] = (RC_Channel_aux::Aux_servo_function_t)rc_8->function.get();
for (uint8_t i = 0; i < NUM_CHANNELS; i++) {
for (uint8_t i = 0; i < 4; i++) {
if (aux_servo_function[i] >= RC_Channel_aux::k_nr_aux_servo_functions) {
// invalid setting
aux_servo_function[i] = RC_Channel_aux::k_none;
@ -94,10 +94,10 @@ void update_aux_servo_function(RC_Channel_aux* rc_5, RC_Channel_aux* rc_6, RC_Ch
}
// assign the RC channel to each function
g_rc_function[aux_servo_function[CH_5]] = rc_5;
g_rc_function[aux_servo_function[CH_6]] = rc_6;
g_rc_function[aux_servo_function[CH_7]] = rc_7;
g_rc_function[aux_servo_function[CH_8]] = rc_8;
g_rc_function[aux_servo_function[0]] = rc_5;
g_rc_function[aux_servo_function[1]] = rc_6;
g_rc_function[aux_servo_function[2]] = rc_7;
g_rc_function[aux_servo_function[3]] = rc_8;
//set auxiliary ranges
G_RC_AUX(k_flap)->set_range(0,100);