Skip to content

Commit

Permalink
pepper-interface: update joint action server name space for newer pep…
Browse files Browse the repository at this point in the history
…per_bringup
  • Loading branch information
k-okada committed Oct 2, 2015
1 parent 70892b0 commit 04c265f
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions jsk_pepper_robot/peppereus/pepper-interface.l
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

(load "package://peppereus/pepper.l")
(load "package://pr2eus/robot-interface.l")
(ros::load-ros-manifest "jsk_pepper_startup")
(ros::load-ros-manifest "peppereus")

(if (not (find-package "NAOQI_BRIDGE_MSGS"))
Expand All @@ -20,18 +19,18 @@
(ros::advertise "cmd_pose" geometry_msgs::Pose2D 1)
(ros::advertise "cmd_vel" geometry_msgs::Twist 1)
(ros::advertise "/speech" std_msgs::String 1)
(ros::advertise "joint_angles" naoqi_bridge_msgs::JointAnglesWithSpeed 1)
(ros::advertise "/pepper_robot/pose/joint_angles" naoqi_bridge_msgs::JointAnglesWithSpeed 1)
(setq joint-stiffness-trajectory-action
(instance ros::simple-action-client :init
"joint_stiffness_trajectory"
"/pepper_robot/pose/joint_stiffness_trajectory"
naoqi_bridge_msgs::JointTrajectoryAction))
self)
;;
(:naoqi-controller
()
(list
(list
(cons :controller-action "joint_trajectory")
(cons :controller-action "/pepper_robot/pose/joint_trajectory")
;;(cons :controller-state "joint_trajectory")
(cons :controller-state "dummy_state") ;; this is dummy
(cons :action-type naoqi_bridge_msgs::JointTrajectoryAction)
Expand Down Expand Up @@ -76,7 +75,7 @@
(:larm
(send start_grasp_msg :joint_names (list "LHand"))
(send start_grasp_msg :joint_angles (list value))))
(ros::publish "joint_angles" start_grasp_msg)
(ros::publish "/pepper_robot/pose/joint_angles" start_grasp_msg)
))
(:start-grasp
(&optional (arm :arms))
Expand Down Expand Up @@ -176,8 +175,8 @@
:time_from_start (ros::time 1))))
(send joint-stiffness-trajectory-action :send-goal goal)
))
(:servo-on () (call-empty-service "wakeup"))
(:servo-off () (call-empty-service "rest"))
(:servo-on () (call-empty-service "pepper_robot/pose/wakeup"))
(:servo-off () (call-empty-service "pepper_robot/pose/rest"))
)

(defmethod pepper-robot
Expand Down

0 comments on commit 04c265f

Please sign in to comment.