Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
2
210910794
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Summer2021
210910794
Commits
09a4878d
Unverified
Commit
09a4878d
authored
5 years ago
by
Daisuke Sato
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
a patch for #1773 BT navigator nodes with use_sim_time (#1776)
Signed-off-by:
Daisuke Sato
<
daisukes@cmu.edu
>
parent
ec7f550c
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
nav2_bt_navigator/src/bt_navigator.cpp
+3
-2
3 additions, 2 deletions
nav2_bt_navigator/src/bt_navigator.cpp
nav2_waypoint_follower/src/waypoint_follower.cpp
+3
-2
3 additions, 2 deletions
nav2_waypoint_follower/src/waypoint_follower.cpp
with
6 additions
and
4 deletions
nav2_bt_navigator/src/bt_navigator.cpp
+
3
−
2
View file @
09a4878d
...
...
@@ -31,7 +31,7 @@ namespace nav2_bt_navigator
{
BtNavigator
::
BtNavigator
()
:
nav2_util
::
LifecycleNode
(
"bt_navigator"
,
""
,
tru
e
),
:
nav2_util
::
LifecycleNode
(
"bt_navigator"
,
""
,
fals
e
),
start_time_
(
0
)
{
RCLCPP_INFO
(
get_logger
(),
"Creating"
);
...
...
@@ -76,9 +76,10 @@ BtNavigator::on_configure(const rclcpp_lifecycle::State & /*state*/)
{
RCLCPP_INFO
(
get_logger
(),
"Configuring"
);
// use suffix '_rclcpp_node' to keep parameter file consistency #1773
auto
options
=
rclcpp
::
NodeOptions
().
arguments
(
{
"--ros-args"
,
"-r"
,
std
::
string
(
"__node:="
)
+
get_name
()
+
"_cl
ient
_node"
,
"-r"
,
std
::
string
(
"__node:="
)
+
get_name
()
+
"_
r
cl
cpp
_node"
,
"--"
});
// Support for handling the topic-based goal pose from rviz
client_node_
=
std
::
make_shared
<
rclcpp
::
Node
>
(
"_"
,
options
);
...
...
This diff is collapsed.
Click to expand it.
nav2_waypoint_follower/src/waypoint_follower.cpp
+
3
−
2
View file @
09a4878d
...
...
@@ -26,7 +26,7 @@ namespace nav2_waypoint_follower
{
WaypointFollower
::
WaypointFollower
()
:
nav2_util
::
LifecycleNode
(
"WaypointFollower"
,
""
,
tru
e
)
:
nav2_util
::
LifecycleNode
(
"WaypointFollower"
,
""
,
fals
e
)
{
RCLCPP_INFO
(
get_logger
(),
"Creating"
);
...
...
@@ -47,8 +47,9 @@ WaypointFollower::on_configure(const rclcpp_lifecycle::State & /*state*/)
stop_on_failure_
=
get_parameter
(
"stop_on_failure"
).
as_bool
();
loop_rate_
=
get_parameter
(
"loop_rate"
).
as_int
();
// use suffix '_rclcpp_node' to keep parameter file consistency #1773
client_node_
=
std
::
make_shared
<
rclcpp
::
Node
>
(
std
::
string
(
get_name
())
+
std
::
string
(
"_cl
ient
_node"
));
std
::
string
(
get_name
())
+
std
::
string
(
"_
r
cl
cpp
_node"
));
nav_to_pose_client_
=
rclcpp_action
::
create_client
<
ClientT
>
(
client_node_
,
"navigate_to_pose"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment