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

altered the interactive throttle to be more aggressive and proportional. 

reworked baro reading strategy.
This commit is contained in:
Jason Short 2011-11-01 09:24:51 -07:00
parent c3d8775797
commit 946db43cc1
1 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ArduCopter/ArduCopter.pde
View File

@ -664,6 +664,7 @@ static void medium_loop()
}else{ }else{
g_gps->new_data = false; g_gps->new_data = false;
} }
break; break;
// command processing // command processing
@ -729,6 +730,9 @@ static void medium_loop()
// ----------------------- // -----------------------
arm_motors(); arm_motors();
// Do an extra baro read
// ---------------------
barometer.Read();
slow_loop(); slow_loop();
break; break;
@ -1066,7 +1070,15 @@ void update_throttle_mode(void)
g.rc_3.servo_out = heli_get_angle_boost(g.throttle_cruise + nav_throttle); g.rc_3.servo_out = heli_get_angle_boost(g.throttle_cruise + nav_throttle);
#else #else
angle_boost = get_angle_boost(g.throttle_cruise); angle_boost = get_angle_boost(g.throttle_cruise);
g.rc_3.servo_out = g.throttle_cruise + nav_throttle + angle_boost + manual_boost; if(manual_boost != 0){
//remove alt_hold_velocity when implemented
g.rc_3.servo_out = g.throttle_cruise + angle_boost + manual_boost + alt_hold_velocity();
// reset next_WP.alt
next_WP.alt = max(current_loc.alt, 100);
}else{
g.rc_3.servo_out = g.throttle_cruise + nav_throttle + angle_boost + alt_hold_velocity();
}
#endif #endif
break; break;
} }
@ -1204,7 +1216,7 @@ static void update_altitude()
float scale; float scale;
// read barometer // read barometer
baro_alt = read_barometer(); baro_alt = (baro_alt + read_barometer()) >> 1;
if(baro_alt < 1000){ if(baro_alt < 1000){
@ -1229,25 +1241,16 @@ static void update_altitude()
} }
// calc the accel rate limit to 2m/s // calc the accel rate limit to 2m/s
altitude_rate = (current_loc.alt - old_altitude) * 10; // 10 hz timer int temp_rate = (barometer._offset_press - barometer.RawPress) << 1; // invert and scale
altitude_rate = (temp_rate - old_rate) * 10;
// rate limiter to reduce some of the motor pulsing old_rate = temp_rate;
if (altitude_rate > 0){
// going up
altitude_rate = min(altitude_rate, old_rate + 20);
}else{
// going down
altitude_rate = max(altitude_rate, old_rate - 20);
}
old_rate = altitude_rate;
old_altitude = current_loc.alt;
#endif #endif
} }
static void static void
adjust_altitude() adjust_altitude()
{ {
/*
if(g.rc_3.control_in <= 200){ if(g.rc_3.control_in <= 200){
next_WP.alt -= 1; // 1 meter per second next_WP.alt -= 1; // 1 meter per second
next_WP.alt = max(next_WP.alt, (current_loc.alt - 500)); // don't go less than 4 meters below current location next_WP.alt = max(next_WP.alt, (current_loc.alt - 500)); // don't go less than 4 meters below current location
@ -1258,6 +1261,25 @@ adjust_altitude()
next_WP.alt += 1; // 1 meter per second next_WP.alt += 1; // 1 meter per second
next_WP.alt = min(next_WP.alt, (current_loc.alt + 500)); // don't go more than 4 meters below current location next_WP.alt = min(next_WP.alt, (current_loc.alt + 500)); // don't go more than 4 meters below current location
//manual_boost = (g.rc_3.control_in == 800) ? 20 : 0; //manual_boost = (g.rc_3.control_in == 800) ? 20 : 0;
}*/
if(g.rc_3.control_in <= 180){
// we remove 0 to 100 PWM from hover
manual_boost = g.rc_3.control_in - 180;
manual_boost = max(-120, manual_boost);
g.throttle_cruise += g.pi_alt_hold.get_integrator();
g.pi_alt_hold.reset_I();
g.pi_throttle.reset_I();
}else if (g.rc_3.control_in >= 650){
// we add 0 to 100 PWM to hover
manual_boost = g.rc_3.control_in - 650;
g.throttle_cruise += g.pi_alt_hold.get_integrator();
g.pi_alt_hold.reset_I();
g.pi_throttle.reset_I();
}else {
manual_boost = 0;
} }
} }