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

Code formatting

This commit is contained in:
Jason Short 2011-11-09 12:06:55 -08:00
parent 4d27b725db
commit c3c08d7915
1 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
ArduCopter/control_modes.pde
View File

@ -47,74 +47,73 @@ static void reset_control_switch()
static void read_trim_switch() static void read_trim_switch()
{ {
#if CH7_OPTION == CH7_FLIP #if CH7_OPTION == CH7_FLIP
if (g.rc_7.control_in > 800 && g.rc_3.control_in != 0){ if (g.rc_7.control_in > 800 && g.rc_3.control_in != 0){
do_flip = true; do_flip = true;
} }
#elif CH7_OPTION == CH7_SIMPLE_MODE #elif CH7_OPTION == CH7_SIMPLE_MODE
do_simple = (g.rc_7.control_in > 800); do_simple = (g.rc_7.control_in > 800);
//Serial.println(g.rc_7.control_in, DEC); //Serial.println(g.rc_7.control_in, DEC);
#elif CH7_OPTION == CH7_RTL #elif CH7_OPTION == CH7_RTL
static bool ch7_rtl_flag = false; static bool ch7_rtl_flag = false;
if (ch7_rtl_flag == false && g.rc_7.control_in > 800){ if (ch7_rtl_flag == false && g.rc_7.control_in > 800){
ch7_rtl_flag = true; ch7_rtl_flag = true;
set_mode(RTL); set_mode(RTL);
} }
if (ch7_rtl_flag == true && g.rc_7.control_in < 800){ if (ch7_rtl_flag == true && g.rc_7.control_in < 800){
ch7_rtl_flag = false; ch7_rtl_flag = false;
if (control_mode == RTL || control_mode == LOITER){ if (control_mode == RTL || control_mode == LOITER){
reset_control_switch(); reset_control_switch();
}
} }
}
#elif CH7_OPTION == CH7_SET_HOVER #elif CH7_OPTION == CH7_SET_HOVER
// switch is engaged // switch is engaged
if (g.rc_7.control_in > 800){ if (g.rc_7.control_in > 800){
trim_flag = true; trim_flag = true;
}else{ // switch is disengaged }else{ // switch is disengaged
if(trim_flag){ if(trim_flag){
// set the throttle nominal // set the throttle nominal
if(g.rc_3.control_in > 150){ if(g.rc_3.control_in > 150){
g.throttle_cruise.set_and_save(g.rc_3.control_in); g.throttle_cruise.set_and_save(g.rc_3.control_in);
//Serial.printf("tnom %d\n", g.throttle_cruise.get()); //Serial.printf("tnom %d\n", g.throttle_cruise.get());
}
trim_flag = false;
} }
trim_flag = false;
} }
}
#elif CH7_OPTION == CH7_SAVE_WP #elif CH7_OPTION == CH7_SAVE_WP
if (g.rc_7.control_in > 800){
trim_flag = true;
if (g.rc_7.control_in > 800){ }else{ // switch is disengaged
trim_flag = true;
}else{ // switch is disengaged if(trim_flag){
// set the next_WP
if(trim_flag){ CH7_wp_index++;
// set the next_WP current_loc.id = MAV_CMD_NAV_WAYPOINT;
CH7_wp_index++; g.command_total.set_and_save(CH7_wp_index);
current_loc.id = MAV_CMD_NAV_WAYPOINT; set_command_with_index(current_loc, CH7_wp_index);
g.command_total.set_and_save(CH7_wp_index); }
set_command_with_index(current_loc, CH7_wp_index);
} }
}
#elif CH7_OPTION == CH7_ADC_FILTER #elif CH7_OPTION == CH7_ADC_FILTER
if (g.rc_7.control_in > 800){ if (g.rc_7.control_in > 800){
adc.filter_result = true; adc.filter_result = true;
}else{ }else{
adc.filter_result = false; adc.filter_result = false;
} }
#elif CH7_OPTION == CH7_AUTO_TRIM #elif CH7_OPTION == CH7_AUTO_TRIM
if (g.rc_7.control_in > 800){ if (g.rc_7.control_in > 800){
auto_level_counter = 10; auto_level_counter = 10;
} }
#endif #endif
} }