Skip to content

Commit 9bc838a

Browse files
Merge pull request #117 from robotology/min_jerk_traj
Enable the minimum jerk trajectory for the DCM first DS phase
2 parents 082c36e + d4007d6 commit 9bc838a

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

cmake/WalkingControllersFindDependencies.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ checkandset_dependency(iDynTree)
134134
find_package(Eigen3 3.2.92 QUIET)
135135
checkandset_dependency(Eigen3)
136136

137-
find_package(UnicyclePlanner 0.4.2 QUIET)
137+
find_package(UnicyclePlanner 0.4.3 QUIET)
138138
checkandset_dependency(UnicyclePlanner)
139139

140140
find_package(osqp QUIET)

src/TrajectoryPlanner/src/TrajectoryGenerator.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ bool TrajectoryGenerator::configurePlanner(const yarp::os::Searchable& config)
168168
m_dcmGenerator = m_trajectoryGenerator.addDCMTrajectoryGenerator();
169169
m_dcmGenerator->setFootOriginOffset(leftZMPDelta, rightZMPDelta);
170170
m_dcmGenerator->setOmega(sqrt(9.81/comHeight));
171+
m_dcmGenerator->setFirstDCMTrajectoryMode(FirstDCMTrajectoryMode::FifthOrderPoly);
171172
ok = ok && m_dcmGenerator->setLastStepDCMOffsetPercentage(lastStepDCMOffset);
172173

173174
m_correctLeft = true;

src/WalkingModule/app/robots/iCubGenova09/dcm_walking/common/plannerParams.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ minWidth 0.12
2020
maxAngleVariation 18.0
2121
minAngleVariation 5.0
2222
#Timings
23-
maxStepDuration 1.1
23+
maxStepDuration 1.31
2424
minStepDuration 0.7
2525

2626
##Nominal Values
@@ -32,7 +32,7 @@ stepLandingVelocity -0.15
3232
footApexTime 0.5
3333
comHeightDelta 0.01
3434
#Timings
35-
nominalDuration 0.9
35+
nominalDuration 1.3
3636
lastStepSwitchTime 0.8
3737
switchOverSwingRatio 0.3
3838

0 commit comments

Comments
 (0)