Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-03 06:28:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

uncrustify ArduPlane/radio.pde

Browse Source
This commit is contained in:
uncrustify 2012-08-21 19:19:50 -07:00 committed by Pat Hickey
parent d5767ef817
commit 43991712be
1 changed files with 162 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ArduPlane/radio.pde
View File

@ -75,7 +75,7 @@ static void read_radio()
ch1_temp = APM_RC.InputCh(CH_ROLL); ch1_temp = APM_RC.InputCh(CH_ROLL);
ch2_temp = APM_RC.InputCh(CH_PITCH); ch2_temp = APM_RC.InputCh(CH_PITCH);
if(g.mix_mode == 0){ if(g.mix_mode == 0) {
g.channel_roll.set_pwm(ch1_temp); g.channel_roll.set_pwm(ch1_temp);
g.channel_pitch.set_pwm(ch2_temp); g.channel_pitch.set_pwm(ch2_temp);
}else{ }else{
@ -106,11 +106,11 @@ static void read_radio()
} }
/* /*
Serial.printf_P(PSTR("OUT 1: %d\t2: %d\t3: %d\t4: %d \n"), * Serial.printf_P(PSTR("OUT 1: %d\t2: %d\t3: %d\t4: %d \n"),
(int)g.rc_1.control_in, * (int)g.rc_1.control_in,
(int)g.rc_2.control_in, * (int)g.rc_2.control_in,
(int)g.rc_3.control_in, * (int)g.rc_3.control_in,
(int)g.rc_4.control_in); * (int)g.rc_4.control_in);
*/ */
} }
@ -129,30 +129,30 @@ static void control_failsafe(uint16_t pwm)
//Check for failsafe and debounce funky reads //Check for failsafe and debounce funky reads
} else if (g.throttle_fs_enabled) { } else if (g.throttle_fs_enabled) {
if (pwm < (unsigned)g.throttle_fs_value){ if (pwm < (unsigned)g.throttle_fs_value) {
// we detect a failsafe from radio // we detect a failsafe from radio
// throttle has dropped below the mark // throttle has dropped below the mark
failsafeCounter++; failsafeCounter++;
if (failsafeCounter == 9){ if (failsafeCounter == 9) {
gcs_send_text_fmt(PSTR("MSG FS ON %u"), (unsigned)pwm); gcs_send_text_fmt(PSTR("MSG FS ON %u"), (unsigned)pwm);
}else if(failsafeCounter == 10) { }else if(failsafeCounter == 10) {
ch3_failsafe = true; ch3_failsafe = true;
}else if (failsafeCounter > 10){ }else if (failsafeCounter > 10) {
failsafeCounter = 11; failsafeCounter = 11;
} }
}else if(failsafeCounter > 0){ }else if(failsafeCounter > 0) {
// we are no longer in failsafe condition // we are no longer in failsafe condition
// but we need to recover quickly // but we need to recover quickly
failsafeCounter--; failsafeCounter--;
if (failsafeCounter > 3){ if (failsafeCounter > 3) {
failsafeCounter = 3; failsafeCounter = 3;
} }
if (failsafeCounter == 1){ if (failsafeCounter == 1) {
gcs_send_text_fmt(PSTR("MSG FS OFF %u"), (unsigned)pwm); gcs_send_text_fmt(PSTR("MSG FS OFF %u"), (unsigned)pwm);
}else if(failsafeCounter == 0) { }else if(failsafeCounter == 0) {
ch3_failsafe = false; ch3_failsafe = false;
}else if (failsafeCounter <0){ }else if (failsafeCounter <0) {
failsafeCounter = -1; failsafeCounter = -1;
} }
} }
@ -164,7 +164,7 @@ static void trim_control_surfaces()
read_radio(); read_radio();
// Store control surface trim values // Store control surface trim values
// --------------------------------- // ---------------------------------
if(g.mix_mode == 0){ if(g.mix_mode == 0) {
g.channel_roll.radio_trim = g.channel_roll.radio_in; g.channel_roll.radio_trim = g.channel_roll.radio_in;
g.channel_pitch.radio_trim = g.channel_pitch.radio_in; g.channel_pitch.radio_trim = g.channel_pitch.radio_in;
G_RC_AUX(k_aileron)->radio_trim = g_rc_function[RC_Channel_aux::k_aileron]->radio_in; // Second aileron channel G_RC_AUX(k_aileron)->radio_trim = g_rc_function[RC_Channel_aux::k_aileron]->radio_in; // Second aileron channel
@ -196,7 +196,7 @@ static void trim_radio()
// Store the trim values // Store the trim values
// --------------------- // ---------------------
if(g.mix_mode == 0){ if(g.mix_mode == 0) {
g.channel_roll.radio_trim = g.channel_roll.radio_in; g.channel_roll.radio_trim = g.channel_roll.radio_in;
g.channel_pitch.radio_trim = g.channel_pitch.radio_in; g.channel_pitch.radio_trim = g.channel_pitch.radio_in;
//g.channel_throttle.radio_trim = g.channel_throttle.radio_in; //g.channel_throttle.radio_trim = g.channel_throttle.radio_in;