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.

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

[pr2eus_moveit] support tm :fast in :angle-vector-motion-plan #297

Merged
merged 4 commits into from
Jun 19, 2017

Conversation

knorth55
Copy link
Member

When max_velocity_scaling_factor and max_acceleration_scaling_factor is 1.0 in MotionPlanRequest, it is same as :fast in :angle-vector-raw

Changes

  • support tm :fast in :angle-vector-motion-plan
  • add :scale key in :angle-vector-motion-plan

Minor Changes

  • add trajectory_constraints comment out
  • add max_velocity_scaling_factor and max_acceleration_scaling_factor key

@knorth55 knorth55 changed the title support tm :fast in :angle-vector-motion-plan [pr2eus_moveit] support tm :fast in :angle-vector-motion-plan Jun 13, 2017
((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))
(unless (eq (* orig-total-time 1000) total-time)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

eps= ???

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you. Updated

@knorth55
Copy link
Member Author

MotionPlanRequest in hydro does not have max_velocity_scaling_factor and max_acceleration_scaling_factor.

@k-okada
Copy link
Member

k-okada commented Jun 14, 2017

it seems ok to me, but is it equal to (if (eq total-time :fast) (setq total-time nil)) ???

How about

 (setq orig-total-time (send (send (car (last (send traj :points))) :time_from_start) :to-sec)) ;; [sec]
(ros::ros-info ";; Moveit calculated Trajectory Total Time ~7,3f [sec]" orig-total-time)

...
(when (or (eq total-time :fast) (null total-time) (>= orig-total-time (/ total-time 1000))) ;; if orig-total-time is larger than total-time, use orig-total-time for safety reason.
  (cond ((eq total-time :fast)
         (setq total-time (* scale (* orig-total-time 1000))))
        (t
         (setq total-time (* orig-total-time 1000))))
  (ros::ros-info ";; Scaled Trajectory Total Time ~7,3f [sec]" (/ total-time 1000))
  )
(setq traj (send* self :trajectory-filter traj :start-offset-time start-offset-time :total-time total-time args))
(ros::ros-info ";; generated ~A points for ~A sec using [~A] group" (length (send traj :points)) (/ total-time 1000) (send ret :group_name)))

@knorth55
Copy link
Member Author

Updated.
I change to show ros-info every time.

@knorth55
Copy link
Member Author

@k-okada could you please merge this?

@k-okada k-okada merged commit aa88841 into jsk-ros-pkg:master Jun 19, 2017
@knorth55 knorth55 deleted the add-tm-fast-and-scale branch June 19, 2017 04:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants