Skip to content

Commit

Permalink
Blimp: Guided Yaw Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
lthall authored and rmackay9 committed Mar 20, 2023
1 parent 715bb6e commit bfbc76e
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions Blimp/mode.h
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,6 @@ class Mode
{

public:

// yaw(): main product of AutoYaw; the heading:
float yaw();

// mode(): current method of determining desired yaw:
autopilot_yaw_mode mode() const
{
Expand All @@ -129,8 +125,6 @@ class Mode
void set_mode(autopilot_yaw_mode new_mode);
autopilot_yaw_mode default_mode(bool rtl) const;

// rate_cds(): desired yaw rate in centidegrees/second:
float rate_cds() const;
void set_rate(float new_rate_cds);

// set_roi(...): set a "look at" location:
Expand All @@ -143,6 +137,12 @@ class Mode

private:

// yaw_cd(): main product of AutoYaw; the heading:
float yaw_cd();

// rate_cds(): desired yaw rate in centidegrees/second:
float rate_cds();

float look_ahead_yaw();
float roi_yaw();

Expand All @@ -164,9 +164,6 @@ class Mode
// heading when in yaw_look_ahead_yaw
float _look_ahead_yaw;

// turn rate (in cds) when auto_yaw_mode is set to AUTO_YAW_RATE
float _rate_cds;

// used to reduce update rate to 100hz:
uint8_t roi_yaw_counter;

Expand Down

0 comments on commit bfbc76e

Please sign in to comment.