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

AP_Landing: convert LAND_PITCH_CD to LAND_PITCH_DEG

This commit is contained in:
Andrew Tridgell 2024-01-19 13:07:53 +11:00
parent 7a57ac640f
commit 3fddc487df
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/AP_Landing/AP_Landing.cpp
View File

@ -43,18 +43,18 @@ const AP_Param::GroupInfo AP_Landing::var_info[] = {
// @User: Advanced // @User: Advanced
AP_GROUPINFO("ABORT_DEG", 2, AP_Landing, slope_recalc_steep_threshold_to_abort, 0), AP_GROUPINFO("ABORT_DEG", 2, AP_Landing, slope_recalc_steep_threshold_to_abort, 0),
// @Param: PITCH_CD // @Param: PITCH_DEG
// @DisplayName: Landing Pitch // @DisplayName: Landing Pitch
// @Description: Used in autoland to give the minimum pitch in the final stage of landing (after the flare). This parameter can be used to ensure that the final landing attitude is appropriate for the type of undercarriage on the aircraft. Note that it is a minimum pitch only - the landing code will control pitch above this value to try to achieve the configured landing sink rate. // @Description: Used in autoland to give the minimum pitch in the final stage of landing (after the flare). This parameter can be used to ensure that the final landing attitude is appropriate for the type of undercarriage on the aircraft. Note that it is a minimum pitch only - the landing code will control pitch above this value to try to achieve the configured landing sink rate.
// @Units: cdeg // @Units: deg
// @Range: -2000 2000 // @Range: -20 20
// @Increment: 10 // @Increment: 10
// @User: Advanced // @User: Advanced
AP_GROUPINFO("PITCH_CD", 3, AP_Landing, pitch_cd, 0), AP_GROUPINFO("PITCH_DEG", 3, AP_Landing, pitch_deg, 0),
// @Param: FLARE_ALT // @Param: FLARE_ALT
// @DisplayName: Landing flare altitude // @DisplayName: Landing flare altitude
// @Description: Altitude in autoland at which to lock heading and flare to the LAND_PITCH_CD pitch. Note that this option is secondary to LAND_FLARE_SEC. For a good landing it preferable that the flare is triggered by LAND_FLARE_SEC. // @Description: Altitude in autoland at which to lock heading and flare to the LAND_PITCH_DEG pitch. Note that this option is secondary to LAND_FLARE_SEC. For a good landing it preferable that the flare is triggered by LAND_FLARE_SEC.
// @Units: m // @Units: m
// @Range: 0 30 // @Range: 0 30
// @Increment: 0.1 // @Increment: 0.1
@ -709,3 +709,12 @@ bool AP_Landing::terminate(void) {
return false; return false;
} }
} }
/*
run parameter conversions
*/
void AP_Landing::convert_parameters(void)
{
// added January 2024
pitch_deg.convert_centi_parameter(AP_PARAM_INT16);
}

6
libraries/AP_Landing/AP_Landing.h
View File

@ -64,6 +64,8 @@ public:
ON_LANDING_USE_ARSPD_MAX = (1<<1), // If set then allow landing throttle constraint to be increased from trim airspeed to max airspeed (AIRSPEED_MAX) ON_LANDING_USE_ARSPD_MAX = (1<<1), // If set then allow landing throttle constraint to be increased from trim airspeed to max airspeed (AIRSPEED_MAX)
}; };
void convert_parameters(void);
void do_land(const AP_Mission::Mission_Command& cmd, const float relative_altitude); void do_land(const AP_Mission::Mission_Command& cmd, const float relative_altitude);
bool verify_abort_landing(const Location &prev_WP_loc, Location &next_WP_loc, const Location &current_loc, bool verify_abort_landing(const Location &prev_WP_loc, Location &next_WP_loc, const Location &current_loc,
const int32_t auto_state_takeoff_altitude_rel_cm, bool &throttle_suppressed); const int32_t auto_state_takeoff_altitude_rel_cm, bool &throttle_suppressed);
@ -96,7 +98,7 @@ public:
// accessor functions for the params and states // accessor functions for the params and states
static const struct AP_Param::GroupInfo var_info[]; static const struct AP_Param::GroupInfo var_info[];
int16_t get_pitch_cd(void) const { return pitch_cd; } int16_t get_pitch_cd(void) const { return pitch_deg*100; }
float get_flare_sec(void) const { return flare_sec; } float get_flare_sec(void) const { return flare_sec; }
int8_t get_disarm_delay(void) const { return disarm_delay; } int8_t get_disarm_delay(void) const { return disarm_delay; }
int8_t get_then_servos_neutral(void) const { return then_servos_neutral; } int8_t get_then_servos_neutral(void) const { return then_servos_neutral; }
@ -151,7 +153,7 @@ private:
AP_Landing_Deepstall deepstall; AP_Landing_Deepstall deepstall;
#endif #endif
AP_Int16 pitch_cd; AP_Float pitch_deg;
AP_Float flare_alt; AP_Float flare_alt;
AP_Float flare_sec; AP_Float flare_sec;
AP_Float pre_flare_airspeed; AP_Float pre_flare_airspeed;