Skip to content

Commit

Permalink
update for using (send *ri* :potentio-vector)
Browse files Browse the repository at this point in the history
  • Loading branch information
YoheiKakiuchi committed Mar 10, 2013
1 parent 0c5c145 commit 93f422b
Showing 1 changed file with 8 additions and 13 deletions.
21 changes: 8 additions & 13 deletions pr2eus/robot-interface.l
Original file line number Diff line number Diff line change
Expand Up @@ -214,15 +214,12 @@
(send self :spin-once))
t)
;;
(:reference-vector
()
(send self :state-vector :desired))
(:potentio-vector
() ;; not use this method, -> use update-robot-state and :state :potentio-vector
(send self :state-vector :actual))
(:error-vector
()
(send self :state-vector :error))
(:worldcoords () (send robot :copy-worldcoords))
(:torque-vector () (send robot :torque-vector))
(:potentio-vector () (send robot :angle-vector))
(:reference-vector () (send self :state-vector :desired))
(:actual-vector () (send self :state-vector :actual))
(:error-vector () (send self :state-vector :error))
(:state-vector
(type &key ((:controller-actions ca) controller-actions)
((:controller-type ct) controller-type))
Expand Down Expand Up @@ -337,11 +334,9 @@
(:state
(&rest args)
(send self :update-robot-state)
(unless args (return-from :state))
(case (car args)
((:angle-vector nil)
(ros::ros-warn "please use :state :potentio-vector~%")
(send self :state :potentio-vector))
(:potentio-vector
((:potentio-vector :angle-vector)
(send robot :angle-vector))
(:torque-vector
(send robot :torque-vector))
Expand Down

0 comments on commit 93f422b

Please sign in to comment.