Skip to content

Commit

Permalink
add moveit config init option in baxter-interface
Browse files Browse the repository at this point in the history
this option is needed for customize baxter like jsk_baxter_apc
  • Loading branch information
knorth55 committed Nov 11, 2016
1 parent f9d9636 commit 68a3af3
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions jsk_baxter_robot/baxtereus/baxter-interface.l
Expand Up @@ -13,7 +13,9 @@
:slots (gripper-sequence-id right-gripper-action left-gripper-action
right-gripper-type left-gripper-type moveit-robot))
(defmethod baxter-interface
(:init (&rest args)
(:init (&rest args &key ((:moveit-environment mvit-env) (instance baxter-moveit-environment))
((:moveit-robot mvit-rb) (instance baxter-robot :init))
&allow-other-keys)
(prog1 (send-super* :init :robot baxter-robot :joint-states-topic "/robot/joint_states" :groupname "baxter_interface" args)
(send self :add-controller :larm-controller)
(send self :add-controller :rarm-controller)
Expand Down Expand Up @@ -44,8 +46,8 @@

(setq gripper-sequence-id 0)
(ros::spin-once)
(setq moveit-robot (instance baxter-robot :init))
(send self :set-moveit-environment (instance baxter-moveit-environment :init :robot moveit-robot))
(if mvit-rb (setq moveit-robot mvit-rb))
(if mvit-env (send self :set-moveit-environment (send mvit-env :init :robot moveit-robot)))
))
(:right-property-cb (msg)
(setq right-gripper-type (send msg :id))
Expand Down

0 comments on commit 68a3af3

Please sign in to comment.