Browse Source

AC_WPNav: stop casting poscontrol's roll/pitch/yaw to int32_t

master
Peter Barker 6 years ago committed by Randy Mackay
parent
commit
6364e6d4c1
  1. 6
      libraries/AC_WPNav/AC_Circle.h
  2. 4
      libraries/AC_WPNav/AC_Loiter.h
  3. 4
      libraries/AC_WPNav/AC_WPNav.h

6
libraries/AC_WPNav/AC_Circle.h

@ -47,9 +47,9 @@ public:
void update(); void update();
/// get desired roll, pitch which should be fed into stabilize controllers /// get desired roll, pitch which should be fed into stabilize controllers
int32_t get_roll() const { return _pos_control.get_roll(); } float get_roll() const { return _pos_control.get_roll(); }
int32_t get_pitch() const { return _pos_control.get_pitch(); } float get_pitch() const { return _pos_control.get_pitch(); }
int32_t get_yaw() const { return _yaw; } float get_yaw() const { return _yaw; }
// get_closest_point_on_circle - returns closest point on the circle // get_closest_point_on_circle - returns closest point on the circle
// circle's center should already have been set // circle's center should already have been set

4
libraries/AC_WPNav/AC_Loiter.h

@ -54,8 +54,8 @@ public:
void update(); void update();
/// get desired roll, pitch which should be fed into stabilize controllers /// get desired roll, pitch which should be fed into stabilize controllers
int32_t get_roll() const { return _pos_control.get_roll(); } float get_roll() const { return _pos_control.get_roll(); }
int32_t get_pitch() const { return _pos_control.get_pitch(); } float get_pitch() const { return _pos_control.get_pitch(); }
static const struct AP_Param::GroupInfo var_info[]; static const struct AP_Param::GroupInfo var_info[];

4
libraries/AC_WPNav/AC_WPNav.h

@ -214,8 +214,8 @@ public:
/// ///
/// get desired roll, pitch which should be fed into stabilize controllers /// get desired roll, pitch which should be fed into stabilize controllers
int32_t get_roll() const { return _pos_control.get_roll(); } float get_roll() const { return _pos_control.get_roll(); }
int32_t get_pitch() const { return _pos_control.get_pitch(); } float get_pitch() const { return _pos_control.get_pitch(); }
/// advance_wp_target_along_track - move target location along track from origin to destination /// advance_wp_target_along_track - move target location along track from origin to destination
bool advance_wp_target_along_track(float dt); bool advance_wp_target_along_track(float dt);

Loading…
Cancel
Save