Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pr2eus_moveit] fix typo in total-time condition #310

Merged
merged 1 commit into from
Jul 10, 2017
Merged

[pr2eus_moveit] fix typo in total-time condition #310

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pr2eus_moveit/euslisp/robot-moveit.l
View file
Open in desktop
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