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
0bf83dfd
Commit
0bf83dfd
authored
5 years ago
by
Steven Macenski
Browse files
Options
Downloads
Patches
Plain Diff
moving getInput for controller name to on_tick
parent
3eaff13a
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_behavior_tree/include/nav2_behavior_tree/follow_path_action.hpp
+1
-1
1 addition, 1 deletion
...or_tree/include/nav2_behavior_tree/follow_path_action.hpp
nav2_controller/src/nav2_controller.cpp
+1
-1
1 addition, 1 deletion
nav2_controller/src/nav2_controller.cpp
with
2 additions
and
2 deletions
nav2_behavior_tree/include/nav2_behavior_tree/follow_path_action.hpp
+
1
−
1
View file @
0bf83dfd
...
...
@@ -38,6 +38,7 @@ public:
void
on_tick
()
override
{
getInput
(
"path"
,
goal_
.
path
);
getInput
(
"controller_name"
,
goal_
.
controller_name
);
}
void
on_server_timeout
()
override
...
...
@@ -50,7 +51,6 @@ public:
// Grab the new goal and set the flag so that we send the new goal to
// the action server on the next loop iteration
getInput
(
"path"
,
goal_
.
path
);
getInput
(
"controller_name"
,
goal_
.
controller_name
);
goal_updated_
=
true
;
}
}
...
...
This diff is collapsed.
Click to expand it.
nav2_controller/src/nav2_controller.cpp
+
1
−
1
View file @
0bf83dfd
...
...
@@ -189,7 +189,7 @@ void ControllerServer::computeControl()
if
(
!
single_controller_warning_given_
)
{
RCLCPP_WARN
(
get_logger
(),
"No controller was specified in action call."
" Server will use only plugin loaded %s. "
"This warning will appear once."
,
controller_names_concat_
);
"This warning will appear once."
,
controller_names_concat_
.
c_str
()
);
single_controller_warning_given_
=
true
;
}
current_controller_
=
controllers_
.
begin
()
->
first
;
...
...
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