Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
talos-data
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
Stack Of Tasks
talos-data
Commits
dfe867d2
Commit
dfe867d2
authored
5 years ago
by
Guilhem Saurel
Browse files
Options
Downloads
Patches
Plain Diff
fix Gazebo 9
parent
3194b1a6
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#6586
passed
5 years ago
Stage: test
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+0
-1
0 additions, 1 deletion
CMakeLists.txt
src/SpringPlugin.cc
+4
-0
4 additions, 0 deletions
src/SpringPlugin.cc
with
4 additions
and
1 deletion
CMakeLists.txt
+
0
−
1
View file @
dfe867d2
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8.3
)
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8.3
)
SET
(
PROJECT_ORG pyrene-dev
)
SET
(
PROJECT_ORG pyrene-dev
)
SET
(
PROJECT_NAME talos_data
)
SET
(
PROJECT_NAME talos_data
)
SET
(
PROJECT_DESCRIPTION
"Talos urdf model, srdf model and other data"
)
SET
(
PROJECT_DESCRIPTION
"Talos urdf model, srdf model and other data"
)
...
...
This diff is collapsed.
Click to expand it.
src/SpringPlugin.cc
+
4
−
0
View file @
dfe867d2
...
@@ -65,7 +65,11 @@ void SpringPlugin::ExplicitUpdate() {
...
@@ -65,7 +65,11 @@ void SpringPlugin::ExplicitUpdate() {
common
::
Time
stepTime
=
currTime
-
this
->
prevUpdateTime
;
common
::
Time
stepTime
=
currTime
-
this
->
prevUpdateTime
;
this
->
prevUpdateTime
=
currTime
;
this
->
prevUpdateTime
=
currTime
;
#if GAZEBO_MAJOR_VERSION < 9
double
pos
=
this
->
jointExplicit
->
GetAngle
(
0
).
Radian
();
double
pos
=
this
->
jointExplicit
->
GetAngle
(
0
).
Radian
();
#else
double
pos
=
this
->
jointExplicit
->
Position
(
0
);
#endif
double
vel
=
this
->
jointExplicit
->
GetVelocity
(
0
);
double
vel
=
this
->
jointExplicit
->
GetVelocity
(
0
);
double
force
=
-
this
->
kpExplicit
*
pos
-
this
->
kdExplicit
*
vel
;
double
force
=
-
this
->
kpExplicit
*
pos
-
this
->
kdExplicit
*
vel
;
this
->
jointExplicit
->
SetForce
(
0
,
force
);
this
->
jointExplicit
->
SetForce
(
0
,
force
);
...
...
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