Skip to content

Commit

Permalink
Merge pull request #310 from knorth55/fix-typo-in-condition
Browse files Browse the repository at this point in the history
[pr2eus_moveit] fix typo in total-time condition
  • Loading branch information
k-okada authored Jul 10, 2017
2 parents 11b048b + 30a8a47 commit 98f716d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pr2eus_moveit/euslisp/robot-moveit.l
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@
(setq total-time
(cond
((eq total-time :fast) (* scale (* orig-total-time 1000)))
((or (null total-time) (> orig-total-time (/ total-time 1000))) (* orig-total-time 1000))
((or (null total-time) (< orig-total-time (/ total-time 1000))) (* orig-total-time 1000))
(t total-time)))
(setq traj (send* self :trajectory-filter traj :start-offset-time start-offset-time :total-time total-time args))
(ros::ros-info ";; Scaled Trajectory Total Time ~7,3f [sec]" (/ total-time 1000))
Expand Down

0 comments on commit 98f716d

Please sign in to comment.