Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-26 01:33:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_L1_Control: add missing override keywords

Browse Source
This commit is contained in:
Peter Barker 2019-02-22 10:09:19 +11:00 committed by Francisco Ferreira
parent eb73a14da8
commit 4d62c996b7
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libraries/AP_L1_Control/AP_L1_Control.h
View File

@ -34,44 +34,44 @@ public:
/* see AP_Navigation.h for the definitions and units of these
* functions */
int32_t nav_roll_cd(void) const;
float lateral_acceleration(void) const;
int32_t nav_roll_cd(void) const override;
float lateral_acceleration(void) const override;
// return the desired track heading angle(centi-degrees)
int32_t nav_bearing_cd(void) const;
int32_t nav_bearing_cd(void) const override;
// return the heading error angle (centi-degrees) +ve to left of track
int32_t bearing_error_cd(void) const;
int32_t bearing_error_cd(void) const override;
float crosstrack_error(void) const { return _crosstrack_error; }
float crosstrack_error_integrator(void) const { return _L1_xtrack_i; }
float crosstrack_error(void) const override { return _crosstrack_error; }
float crosstrack_error_integrator(void) const override { return _L1_xtrack_i; }
int32_t target_bearing_cd(void) const;
float turn_distance(float wp_radius) const;
float turn_distance(float wp_radius, float turn_angle) const;
float loiter_radius (const float loiter_radius) const;
void update_waypoint(const struct Location &prev_WP, const struct Location &next_WP, float dist_min = 0.0f);
void update_loiter(const struct Location &center_WP, float radius, int8_t loiter_direction);
void update_heading_hold(int32_t navigation_heading_cd);
void update_level_flight(void);
bool reached_loiter_target(void);
int32_t target_bearing_cd(void) const override;
float turn_distance(float wp_radius) const override;
float turn_distance(float wp_radius, float turn_angle) const override;
float loiter_radius (const float loiter_radius) const override;
void update_waypoint(const struct Location &prev_WP, const struct Location &next_WP, float dist_min = 0.0f) override;
void update_loiter(const struct Location &center_WP, float radius, int8_t loiter_direction) override;
void update_heading_hold(int32_t navigation_heading_cd) override;
void update_level_flight(void) override;
bool reached_loiter_target(void) override;
// set the default NAVL1_PERIOD
void set_default_period(float period) {
_L1_period.set_default(period);
}
void set_data_is_stale(void) {
void set_data_is_stale(void) override {
_data_is_stale = true;
}
bool data_is_stale(void) const {
bool data_is_stale(void) const override {
return _data_is_stale;
}
// this supports the NAVl1_* user settable parameters
static const struct AP_Param::GroupInfo var_info[];
void set_reverse(bool reverse) {
void set_reverse(bool reverse) override {
_reverse = reverse;
}