Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
dynamic_graph_bridge
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Guilhem Saurel
dynamic_graph_bridge
Commits
930b3401
Commit
930b3401
authored
4 years ago
by
Guilhem Saurel
Browse files
Options
Downloads
Plain Diff
Merge branch 'devel' into release/3.4.0
parents
277acaf9
a24601af
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/ros_parameter.cpp
+4
-3
4 additions, 3 deletions
src/ros_parameter.cpp
with
4 additions
and
3 deletions
src/ros_parameter.cpp
+
4
−
3
View file @
930b3401
#include
<sot/core/robot-utils.hh>
#include
"pinocchio/multibody/model.hpp"
#include
"pinocchio/multibody/model.hpp"
#include
"pinocchio/parsers/urdf.hpp"
#include
"pinocchio/parsers/urdf.hpp"
...
@@ -7,7 +9,6 @@
...
@@ -7,7 +9,6 @@
#include
<urdf_parser/urdf_parser.h>
#include
<urdf_parser/urdf_parser.h>
#include
<sot/core/robot-utils.hh>
#include
<ros/ros.h>
#include
<ros/ros.h>
#include
"dynamic_graph_bridge/ros_parameter.hh"
#include
"dynamic_graph_bridge/ros_parameter.hh"
...
@@ -30,7 +31,7 @@ bool parameter_server_read_robot_description()
...
@@ -30,7 +31,7 @@ bool parameter_server_read_robot_description()
// Search for the robot util related to robot_name.
// Search for the robot util related to robot_name.
sot
::
RobotUtilShrPtr
aRobotUtil
=
sot
::
getRobotUtil
(
model_name
);
sot
::
RobotUtilShrPtr
aRobotUtil
=
sot
::
getRobotUtil
(
model_name
);
// If does not exist then it is created.
// If does not exist then it is created.
if
(
aRobotUtil
!
=
sot
::
RefVoidRobotUtil
())
if
(
aRobotUtil
=
=
sot
::
RefVoidRobotUtil
())
aRobotUtil
=
sot
::
createRobotUtil
(
model_name
);
aRobotUtil
=
sot
::
createRobotUtil
(
model_name
);
// If the creation is fine
// If the creation is fine
...
@@ -50,4 +51,4 @@ bool parameter_server_read_robot_description()
...
@@ -50,4 +51,4 @@ bool parameter_server_read_robot_description()
}
}
}
;
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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