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

Complete merge with vel-ref for FootConstraints.

parent 6b8bd9d3
No related branches found
No related tags found
No related merge requests found
......@@ -84,7 +84,7 @@ namespace PatternGeneratorJRL
int computeLinearSystem(std::vector<CH_Point> aVecOfPoints,
MAL_MATRIX(&D,double),
MAL_MATRIX(&Dc,double),
SupportState * Support);
SupportState_t PrwSupport);
/*! Build a queue of constraint Inequalities based on a list of Foot Absolute
Position.
......@@ -98,7 +98,8 @@ namespace PatternGeneratorJRL
ReferenceAbsoluteVelocity & RefVel,
double StartingTime,
double m_QP_N,
SupportState * Support, std::deque<double> &PreviewedSupportAngles,
SupportFSM * SupportFSM, SupportState_t CurrentSupport, SupportState_t & PrwSupport,
std::deque<double> &PreviewedSupportAngles,
int & NbOfConstraints);
/*! Build a queue of constraint Inequalities based on a list of Foot Absolute Position. */
......@@ -127,13 +128,6 @@ namespace PatternGeneratorJRL
CjrlHumanoidDynamicRobot * m_HS;
std::vector<CH_Point> ConvexHullFP;
//Andremize: Caused memory errors when initialized in the constructor
/* float CHLeftFPosConstrArrayX[5]; */
/* float CHLeftFPosConstrArrayY[5]; */
/* float CHRightFPosConstrArrayX[5]; */
/* float CHRightFPosConstrArrayY[5]; */
float* CHFPosConstrArrayX;
float* CHFPosConstrArrayY;
......
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