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] Add key topic-name to :send-cmd-vel-raw #481

Merged
merged 4 commits into from May 28, 2022
Merged

[pr2eus] Add key topic-name to :send-cmd-vel-raw #481

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0f4e66
Add key :topic-name to send-cmd-vel-raw
nakane11 May 21, 2022
94b1beb
Use let instead of setq
nakane11 May 21, 2022
af9016f
Add :namespace key
nakane11 May 23, 2022
dd725e4
Merge branch 'master' into add-cmd-vel-topic-key
k-okada May 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 10 additions & 4 deletions pr2eus/robot-interface.l
View file
Open in desktop
Expand Up @@ -1592,17 +1592,23 @@ Return value is a list of interpolatingp for all controllers, so (null (some #'i
(send self :move-to-wait :retry 1 :frame-id base-frame-id :no-wait nil)
))
(:send-cmd-vel-raw
(x y d) ;; [m] [m] [degree]
(x y d &key topic-name) ;; [m] [m] [degree]
(when (send self :simulation-modep)
(return-from :send-cmd-vel-raw t))
(unless (ros::get-topic-publisher (if namespace (format nil "~A/~A" namespace cmd-vel-topic) cmd-vel-topic))
(ros::advertise (if namespace (format nil "~A/~A" namespace cmd-vel-topic) cmd-vel-topic) geometry_msgs::Twist 1)
(setq vel-topic
(if topic-name
(if namespace
(if (eq (char "/" 0) (char topic-name 0)) topic-name (format nil "~A/~A" namespace topic-name))
topic-name)
(if namespace (format nil "~A/~A" namespace cmd-vel-topic) cmd-vel-topic)))
Copy link
Member

Choose a reason for hiding this comment

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

It may be better to use let instead of setq to set vel-topic as a local variable.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for the review. I have revised it.

(unless (ros::get-topic-publisher vel-topic)
(ros::advertise vel-topic geometry_msgs::Twist 1)
(unix:sleep 1))
(let ((msg (instance geometry_msgs::Twist :init)))
(send msg :linear :x x)
(send msg :linear :y y)
(send msg :angular :z d)
(ros::publish (if namespace (format nil "~A/~A" namespace cmd-vel-topic) cmd-vel-topic) msg)))
(ros::publish vel-topic msg)))
(:go-velocity
(x y d ;; [m/sec] [m/sec] [rad/sec]
&optional (msec 1000) ;; msec is total animation time [msec]
Expand Down