Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-22 16:48:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "AP_Landing: abstract out init_start_nav_cnd work to landing lib"

Browse Source 
This reverts commit 8d8775125a.

doesn't build
This commit is contained in:
Andrew Tridgell 2016-12-06 17:30:33 +11:00
parent 1380a35f70
commit 3e89580383
3 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/AP_Landing/AP_Landing.cpp
View File

@ -183,17 +183,6 @@ void AP_Landing::setup_landing_glide_slope(const Location &prev_WP_loc, const Lo
case TYPE_STANDARD_GLIDE_SLOPE:
type_slope_setup_landing_glide_slope(prev_WP_loc, next_WP_loc, current_loc, target_altitude_offset_cm);
break;
/*
* initialize state for new nav command
*/
void AP_Landing::init_start_nav_cmd(void)
{
switch (type) {
default:
case TYPE_STANDARD_GLIDE_SLOPE:
type_slope_init_start_nav_cmd();
break;
}
}

8
libraries/AP_Landing/AP_Landing.h
View File

@ -89,7 +89,6 @@ public:
int8_t get_abort_throttle_enable(void) const { return abort_throttle_enable; }
int8_t get_flap_percent(void) const { return flap_percent; }
int8_t get_throttle_slewrate(void) const { return throttle_slewrate; }
void init_start_nav_cmd(void);
// Flag to indicate if we have landed.
@ -111,14 +110,14 @@ public:
// landing altitude offset (meters)
float alt_offset;
// once landed, post some landing statistics to the GCS
bool post_stats;
// denotes if a go-around has been commanded for landing
bool commanded_go_around;
private:
// once landed, post some landing statistics to the GCS
bool post_stats;
bool has_aborted_due_to_slope_recalc;
AP_Mission &mission;
@ -158,6 +157,5 @@ private:
void type_slope_setup_landing_glide_slope(const Location &prev_WP_loc, const Location &next_WP_loc, const Location &current_loc, int32_t &target_altitude_offset_cm);
void type_slope_check_if_need_to_abort(const AP_Vehicle::FixedWing::Rangefinder_State &rangefinder_state);
void type_slope_init_start_nav_cmd(void);
};

12
libraries/AP_Landing/AP_Landing_Slope.cpp
View File

@ -292,15 +292,3 @@ void AP_Landing::type_slope_setup_landing_glide_slope(const Location &prev_WP_lo
// stay within the range of the start and end locations in altitude
constrain_target_altitude_location_fn(loc, prev_WP_loc);
}
void AP_Landing::type_slope_init_start_nav_cmd(void)
{
complete = false;
pre_flare = false;
// if a go around had been commanded, clear it now.
commanded_go_around = false;
// once landed, post some landing statistics to the GCS
post_stats = false;
}