Skip to content
Snippets Groups Projects
Commit 7073187a authored by bresch's avatar bresch Committed by Roman Bapst
Browse files

Trajectory - Add getters for current position and velocity. Move some getters to public section

parent 6a7ce651
No related branches found
No related tags found
No related merge requests found
......@@ -237,6 +237,7 @@ void VelocitySmoothing::integrate(float &accel_setpoint_smooth, float &vel_setpo
_accel = accel_new;
_vel = vel_new;
_pos = pos_new;
/* set output variables */
accel_setpoint_smooth = _accel;
......
......@@ -94,7 +94,9 @@ public:
void setMaxVel(float max_vel) { _max_vel = max_vel; }
void setCurrentVelocity(const float vel) { _vel = vel; }
float getCurrentVelocity() const { return _vel; }
void setCurrentPosition(const float pos) { _pos = pos; }
float getCurrentPosition() const { return _pos; }
/**
* Synchronize several trajectories to have the same total time. This is required to generate
......@@ -105,10 +107,11 @@ public:
*/
static void timeSynchronization(VelocitySmoothing *traj, int n_traj);
private:
float getTotalTime() const { return _T1 + _T2 + _T3; }
float getVelSp() const { return _vel_sp; }
private:
/**
* Compute T1, T2, T3 depending on the current state and velocity setpoint.
* @param T123 optional parameter. If set, the total trajectory time will be T123, if not,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment