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

Copter: Add Loiter horizontal maximum speed to CH6 tunable param

Browse Source
This commit is contained in:
Rishabh 2020-04-24 23:55:49 +05:30 committed by Randy Mackay
parent 5b3fe19916
commit ef3bf1c9f8
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduCopter/Parameters.cpp
View File

@ -323,7 +323,7 @@ const AP_Param::Info Copter::var_info[] = {
// @DisplayName: Channel 6 Tuning
// @Description: Controls which parameters (normally PID gains) are being tuned with transmitter's channel 6 knob
// @User: Standard
// @Values: 0:None,1:Stab Roll/Pitch kP,4:Rate Roll/Pitch kP,5:Rate Roll/Pitch kI,21:Rate Roll/Pitch kD,3:Stab Yaw kP,6:Rate Yaw kP,26:Rate Yaw kD,56:Rate Yaw Filter,55:Motor Yaw Headroom,14:AltHold kP,7:Throttle Rate kP,34:Throttle Accel kP,35:Throttle Accel kI,36:Throttle Accel kD,12:Loiter Pos kP,22:Velocity XY kP,28:Velocity XY kI,10:WP Speed,25:Acro Roll/Pitch deg/s,40:Acro Yaw deg/s,45:RC Feel,13:Heli Ext Gyro,38:Declination,39:Circle Rate,46:Rate Pitch kP,47:Rate Pitch kI,48:Rate Pitch kD,49:Rate Roll kP,50:Rate Roll kI,51:Rate Roll kD,52:Rate Pitch FF,53:Rate Roll FF,54:Rate Yaw FF,58:SysID Magnitude,59:PSC Angle Max
// @Values: 0:None,1:Stab Roll/Pitch kP,4:Rate Roll/Pitch kP,5:Rate Roll/Pitch kI,21:Rate Roll/Pitch kD,3:Stab Yaw kP,6:Rate Yaw kP,26:Rate Yaw kD,56:Rate Yaw Filter,55:Motor Yaw Headroom,14:AltHold kP,7:Throttle Rate kP,34:Throttle Accel kP,35:Throttle Accel kI,36:Throttle Accel kD,12:Loiter Pos kP,22:Velocity XY kP,28:Velocity XY kI,10:WP Speed,25:Acro Roll/Pitch deg/s,40:Acro Yaw deg/s,45:RC Feel,13:Heli Ext Gyro,38:Declination,39:Circle Rate,46:Rate Pitch kP,47:Rate Pitch kI,48:Rate Pitch kD,49:Rate Roll kP,50:Rate Roll kI,51:Rate Roll kD,52:Rate Pitch FF,53:Rate Roll FF,54:Rate Yaw FF,58:SysID Magnitude,59:PSC Angle Max,60:Loiter Speed
GSCALAR(radio_tuning, "TUNE", 0),
// @Param: FRAME_TYPE

3
ArduCopter/defines.h
View File

@ -51,7 +51,8 @@ enum tuning_func {
TUNING_RATE_YAW_FILT = 56, // yaw rate input filter
UNUSED = 57, // was winch control
TUNING_SYSTEM_ID_MAGNITUDE = 58, // magnitude of the system ID signal
TUNING_POS_CONTROL_ANGLE_MAX = 59 // position controller maximum angle
TUNING_POS_CONTROL_ANGLE_MAX = 59, // position controller maximum angle
TUNING_LOITER_MAX_XY_SPEED = 60, // maximum loiter horizontal speed
};
// Yaw behaviours during missions - possible values for WP_YAW_BEHAVIOR parameter

4
ArduCopter/tuning.cpp
View File

@ -196,5 +196,9 @@ void Copter::tuning()
case TUNING_POS_CONTROL_ANGLE_MAX:
pos_control->set_lean_angle_max_cd(tuning_value * 100.0);
break;
case TUNING_LOITER_MAX_XY_SPEED:
loiter_nav->set_max_xy_speed(tuning_value);
break;
}
}