Skip to content

Commit

Permalink
add :execute-trajectory method to pr2eus-moveit
Browse files Browse the repository at this point in the history
  • Loading branch information
YoheiKakiuchi committed Sep 1, 2013
1 parent dd3aba4 commit 7d461b7
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion pr2eus_moveit/euslisp/pr2eus-moveit.l
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
:slots (config-list
scene-service
planning-service
execute-service
robot
default-frame-id default-link
multi-dof-name multi-dof-frame
Expand All @@ -54,17 +55,21 @@
(:init
(&key ((:scene-service sc-srv) "/get_planning_scene")
((:planning-service pl-srv) "/plan_kinematic_path")
((:execute-service ex-srv) "/execute_kinematic_path")
((:robot rb) *pr2*) (frame-id "base_footprint") ;; frame-id needs to be contained in robot_model
(multi-dof-joint-name "virtual_joint")
(multi-dof-frame-id "odom_combined"))
(setq scene-service sc-srv
planning-service pl-srv
execute-service ex-srv
robot rb
default-frame-id frame-id
multi-dof-name multi-dof-joint-name
multi-dof-frame multi-dof-frame-id)
(setq default-link (send self :search-link-from-name frame-id))
(setq config-list (send self :default-configuration))
(unless (ros::ok)
(ros::roseus "pr2eus_moveit_environment"))
self)
(:robot (&rest args) (forward-message-to robot args))
(:search-link-from-name
Expand Down Expand Up @@ -155,7 +160,7 @@
(send (send default-link :worldcoords) :transformation
(send wcds :worldcoords)))
(:get-group-tip-coords (confkey) ;; get-robot-coords
(let ((link-inst(cdr (assoc :target-link (cdr (assoc confkey config-list))))))
(let ((link-inst (cdr (assoc :target-link (cdr (assoc confkey config-list))))))
(send link-inst :copy-worldcoords)))
(:get-planning-scene (&optional (components 1023))
(get-planning-scene :scene-service scene-service :components components))
Expand Down Expand Up @@ -204,6 +209,12 @@
(return-from :get-ik-for-pose nil)))
(send robot :angle-vector)
)))
(:execute-trajectory
(msg &optional (wait nil))

This comment has been minimized.

Copy link
@k-okada

k-okada May 17, 2016

Member

ここではwait&optional だけど,ce07e28#diff-7745a85d6312739497f01b309c2f7df5R292 ではキーワードになっている.&key が正解? @YoheiKakiuchi

This comment has been minimized.

Copy link
@YoheiKakiuchi

YoheiKakiuchi May 17, 2016

Author Member

はい、そうだと思います。

(let ((req (instance moveit_msgs::ExecuteKnownTrajectoryRequest :init
:trajectory msg)))
(send req :wait_for_execution wait)
(ros::service-call execute-service req)))
(:motion-plan
(confkey &key (scene)
(group-name (cdr (assoc :group-name (cdr (assoc confkey config-list)))))
Expand Down

0 comments on commit 7d461b7

Please sign in to comment.