mirror of https://github.com/ArduPilot/ardupilot
2.0.39
Made the Yaw on RTL always on for Helis git-svn-id: https://arducopter.googlecode.com/svn/trunk@2999 f9c3cf11-9bcb-44bc-f272-b75c42450872
This commit is contained in:
parent
10d769a1d2
commit
6c75a03230
|
@ -280,9 +280,11 @@ static int motor_out[8];
|
||||||
|
|
||||||
// Heli
|
// Heli
|
||||||
// ----
|
// ----
|
||||||
|
#if FRAME_CONFIG == HELI_FRAME
|
||||||
static float heli_rollFactor[3], heli_pitchFactor[3]; // only required for 3 swashplate servos
|
static float heli_rollFactor[3], heli_pitchFactor[3]; // only required for 3 swashplate servos
|
||||||
static int heli_servo_min[3], heli_servo_max[3]; // same here. for yaw servo we use heli_servo4_min/max parameter directly
|
static int heli_servo_min[3], heli_servo_max[3]; // same here. for yaw servo we use heli_servo4_min/max parameter directly
|
||||||
static int heli_servo_out[4];
|
static int heli_servo_out[4];
|
||||||
|
#endif
|
||||||
|
|
||||||
// Failsafe
|
// Failsafe
|
||||||
// --------
|
// --------
|
||||||
|
@ -1321,16 +1323,20 @@ static void update_navigation()
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GUIDED:
|
case GUIDED:
|
||||||
|
case RTL:
|
||||||
if(wp_distance > 20){
|
if(wp_distance > 20){
|
||||||
// calculates desired Yaw
|
// calculates desired Yaw
|
||||||
|
// XXX this is an experiment
|
||||||
|
#if FRAME_CONFIG == HELI_FRAME
|
||||||
update_nav_yaw();
|
update_nav_yaw();
|
||||||
|
#endif
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
// Don't Yaw anymore
|
// Don't Yaw anymore
|
||||||
// hack to elmininate crosstrack effect
|
// hack to elmininate crosstrack effect
|
||||||
crosstrack_bearing = target_bearing;
|
crosstrack_bearing = target_bearing;
|
||||||
}
|
}
|
||||||
case RTL:
|
|
||||||
// are we Traversing or Loitering?
|
// are we Traversing or Loitering?
|
||||||
wp_control = (wp_distance < 4 ) ? LOITER_MODE : WP_MODE;
|
wp_control = (wp_distance < 4 ) ? LOITER_MODE : WP_MODE;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue