Merge pull request fkanehiro#929 from eisoku9618/patch-3

[Stabilizer.cpp] enable to change compensation limit : omission of ht…
snozawa · Dec 27, 2015 · 685f73a · 685f73a
2 parents 4300807 + 2c6d540
commit 685f73a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/rtc/Stabilizer/Stabilizer.cpp b/rtc/Stabilizer/Stabilizer.cpp
@@ -906,7 +906,8 @@ void Stabilizer::getActualParameters ()
  pos_ctrl = calcDampingControl (tmp_ratio * ref_f_diff, tmp_ratio * f_diff, pos_ctrl, tmp_damping_gain, tmp_time_const);
  }
  // zctrl = vlimit(zctrl, -0.02, 0.02);
- pos_ctrl = vlimit(pos_ctrl, -0.05, 0.05);
+ // Temporarily use first pos compensation limit (stikp[0])
+ pos_ctrl = vlimit(pos_ctrl, -1 * stikp[0].eefm_pos_compensation_limit * 2, stikp[0].eefm_pos_compensation_limit * 2);
  // Convert pos_ctrl actual frame => foot origin frame
  pos_ctrl = foot_origin_rot.transpose() * pos_ctrl;
  // Divide pos_ctrl into rfoot and lfoot