Skip to content

Commit 10f292c

Browse files
authored
Merge pull request #546 from Naoki-Hiraoka/add-q-r-key-to-calc-walk-pattern-from-footstep-list
[irtrobot.l]add keyworld Q, R to :calc-walk-pattern-from-footstep-list
2 parents 693c74b + 41a3b09 commit 10f292c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

irteus/irtrobot.l

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,7 @@
685685
(start-with-double-support t)
686686
(end-with-double-support t)
687687
(ik-thre 1) (ik-rthre (deg2rad 1))
688+
(q 1.0) (r 1e-6) ;; Q is weighting of output error and R is weighting of input.
688689
(calc-zmp t))
689690
"Calculate walking pattern from foot step list and return pattern list as a list of angle-vector, root-coords, time, and so on."
690691
(let* ((res) (ret) (tm 0)
@@ -696,7 +697,8 @@
696697
:default-step-height default-step-height :default-double-support-ratio 0.2
697698
:default-zmp-offsets dzo :all-limbs al
698699
:thre ik-thre :rthre ik-rthre
699-
:start-with-double-support start-with-double-support :end-with-double-support end-with-double-support)
700+
:start-with-double-support start-with-double-support :end-with-double-support end-with-double-support
701+
:q q :r r)
700702

701703
(while (null (setq ret (send gg :proc-one-tick :type :cycloid :debug t :solve-angle-vector-args solve-angle-vector-args))))
702704
(if calc-zmp (dotimes (i 2) (send self :calc-zmp))) ;; for zmp initialization

0 commit comments

Comments
 (0)