|
104 | 104 | (send self :tmp-force-moment-vector :moment limb)) |
105 | 105 | (:off-force-vector |
106 | 106 | (&optional (limb)) |
107 | | - "Returns offset-removed :force-vector [N] list for all limbs obtained by :state. |
| 107 | + "!! This method is deprecated, use :force-vector !! |
| 108 | + Returns offset-removed :force-vector [N] list for all limbs obtained by :state. |
108 | 109 | This value corresponds to RemoveForceSensorLinkOffset RTC. |
109 | 110 | If a limb argument is specified, returns a vector for the limb." |
| 111 | + (warning-message 1 ";; !!~%;; !! :off-force-vector is deprecated, use :force-vector !!~%;; !!~%") |
110 | 112 | (send self :tmp-force-moment-vector :force limb "off")) |
111 | 113 | (:off-moment-vector |
112 | 114 | (&optional (limb)) |
113 | | - "Returns offset-removed :moment-vector [Nm] list for all limbs obtained by :state. |
| 115 | + "!! This method is deprecated, use :moment-vector !! |
| 116 | + Returns offset-removed :moment-vector [Nm] list for all limbs obtained by :state. |
114 | 117 | This value corresponds to RemoveForceSensorLinkOffset RTC. |
115 | 118 | If a limb argument is specified, returns a vector for the limb." |
| 119 | + (warning-message 1 ";; !!~%;; !! :off-moment-vector is deprecated, use :moment-vector !!~%;; !!~%") |
116 | 120 | (send self :tmp-force-moment-vector :moment limb "off")) |
117 | 121 | (:reference-force-vector |
118 | 122 | (&optional (limb)) |
|
132 | 136 | This value corresponds to RemoveForceSensorLinkOffset RTC. |
133 | 137 | If a limb argument is specified, returns a vector for the limb." |
134 | 138 | (if limb |
135 | | - (send (car (send robot limb :force-sensors)) :rotate-vector (send self :off-force-vector limb)) |
| 139 | + (send (car (send robot limb :force-sensors)) :rotate-vector (send self :force-vector limb)) |
136 | 140 | (mapcar #'(lambda (fs force) |
137 | 141 | (send fs :rotate-vector force)) |
138 | | - (send robot :force-sensors) (send self :off-force-vector)))) |
| 142 | + (send robot :force-sensors) (send self :force-vector)))) |
139 | 143 | (:absolute-moment-vector |
140 | 144 | (&optional (limb)) |
141 | 145 | "Returns offset-removed :moment-vector [Nm] list for all limbs in world frame obtained by :state. |
142 | 146 | This value corresponds to RemoveForceSensorLinkOffset RTC. |
143 | 147 | If a limb argument is specified, returns a vector for the limb." |
144 | 148 | (if limb |
145 | | - (send (car (send robot limb :force-sensors)) :rotate-vector (send self :off-moment-vector limb)) |
| 149 | + (send (car (send robot limb :force-sensors)) :rotate-vector (send self :moment-vector limb)) |
146 | 150 | (mapcar #'(lambda (fs moment) |
147 | 151 | (send fs :rotate-vector moment)) |
148 | | - (send robot :force-sensors) (send self :off-moment-vector)))) |
| 152 | + (send robot :force-sensors) (send self :moment-vector)))) |
149 | 153 | (:zmp-vector |
150 | 154 | (&optional (wrt :local)) |
151 | 155 | "Returns zmp vector [mm]. |
|
1053 | 1057 | (let* ((params (mapcar #'(lambda (alimb) (send self :get-forcemoment-offset-param alimb)) limbs))) |
1054 | 1058 | (labels ((calc-off |
1055 | 1059 | (alimb) |
1056 | | - (send self (if (eq f/m :force) :off-force-vector :off-moment-vector) alimb)) |
| 1060 | + (send self (if (eq f/m :force) :force-vector :moment-vector) alimb)) |
1057 | 1061 | (get-avg-fm |
1058 | 1062 | () |
1059 | 1063 | (let ((fm (mapcar #'(lambda (i) |
1060 | 1064 | (send self :state) |
1061 | | - (mapcar #'(lambda (alimb) (send self (if (eq f/m :force) :off-force-vector :off-moment-vector) alimb)) limbs)) |
| 1065 | + (mapcar #'(lambda (alimb) (send self (if (eq f/m :force) :force-vector :moment-vector) alimb)) limbs)) |
1062 | 1066 | (make-list itr)))) |
1063 | 1067 | (mapcar #'(lambda (alimb) |
1064 | 1068 | (let ((idx (position alimb limbs))) |
|
0 commit comments