Skip to content
Snippets Groups Projects
Commit f64b2dea authored by Olivier Stasse's avatar Olivier Stasse
Browse files

Revert "Add types trunk_t, supportfoot_t, reference_t"

This reverts commit fc8c8c64.
parent ee3e6e21
No related branches found
No related tags found
No related merge requests found
...@@ -56,43 +56,4 @@ namespace PatternGeneratorJRL ...@@ -56,43 +56,4 @@ namespace PatternGeneratorJRL
reset(); reset();
} }
struct trunk_s & trunk_t::operator=(const trunk_s &aTS)
{
for(unsigned int i=0;i<3;i++)
{
x[i] = aTS.x[i];
y[i] = aTS.y[i];
z[i] = aTS.z[i];
yaw[i] = aTS.yaw[i];
pitch[i] = aTS.pitch[i];
roll[i] = aTS.roll[i];
};
return *this;
}
void trunk_t::reset()
{
for(unsigned int i=0;i<3;i++)
{
MAL_VECTOR_RESIZE(x,3);
MAL_VECTOR_RESIZE(y,3);
MAL_VECTOR_RESIZE(z,3);
MAL_VECTOR_RESIZE(yaw,3);
MAL_VECTOR_RESIZE(pitch,3);
MAL_VECTOR_RESIZE(roll,3);
x[i] = 0.0;
y[i] = 0.0;
z[i] = 0.0;
yaw[i] = 0.0;
pitch[i] = 0.0;
roll[i] = 0.0;
}
}
trunk_s::trunk_s()
{
reset();
}
} }
...@@ -35,13 +35,13 @@ namespace PatternGeneratorJRL ...@@ -35,13 +35,13 @@ namespace PatternGeneratorJRL
{ {
// Support state of the robot at a certain point in time // Support state of the robot at a certain point in time
struct support_state_s struct SupportState_s
{ {
int Phase, Foot, StepsLeft, StepNumber; int Phase, Foot, StepsLeft, StepNumber;
bool SSSS, StateChanged; bool SSSS, StateChanged;
double TimeLimit; double TimeLimit;
}; };
typedef struct support_state_s support_state_t; typedef struct SupportState_s SupportState_t;
// Support state of the robot at a certain point in time // Support state of the robot at a certain point in time
struct com_s struct com_s
...@@ -58,53 +58,10 @@ namespace PatternGeneratorJRL ...@@ -58,53 +58,10 @@ namespace PatternGeneratorJRL
}; };
typedef struct com_s com_t; typedef struct com_s com_t;
// Support state of the robot at a certain point in time const static int MEAN_VELOCITY = 0;
struct trunk_s const static int INSTANT_VELOCITY = 1;
{ const static int COP_CENTERING = 2;
MAL_VECTOR(x,double); const static int JERK = 3;
MAL_VECTOR(y,double);
MAL_VECTOR(z,double);
MAL_VECTOR(yaw,double);
MAL_VECTOR(pitch,double);
MAL_VECTOR(roll,double);
struct trunk_s & operator=(const trunk_s &aTS);
void reset();
trunk_s();
};
typedef struct trunk_s trunk_t;
//State of the feet on the ground
struct supportfoot_s
{
double x,y,theta,StartTime;
int SupportFoot;
};
typedef struct supportfoot_s
supportfoot_t;
/// Absolute reference.
struct reference_s
{
struct frame_s
{
/// \brief Constant reference
double x,y, yaw;
/// \brief Reference vectors
MAL_VECTOR(X,double);
MAL_VECTOR(Y,double);
MAL_VECTOR(YAW,double);
};
typedef struct frame_s frame_t;
frame_t global, local;
};
typedef struct reference_s reference_t;
} }
......
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