Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Merge requests
!451
Improve armar7 platform movement
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Improve armar7 platform movement
feature/improve-armar7-platform-movement
into
master
Overview
6
Commits
9
Pipelines
28
Changes
2
All threads resolved!
Hide all comments
Merged
Tobias Gröger
requested to merge
feature/improve-armar7-platform-movement
into
master
10 months ago
Overview
6
Commits
9
Pipelines
28
Changes
2
All threads resolved!
Hide all comments
Expand
0
0
Merge request reports
Viewing commit
9d8defd6
Show latest version
2 files
+
18
−
6
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
9d8defd6
asd
· 9d8defd6
Tobias Gröger
authored
10 months ago
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformVelocityControllerWithRamp.cpp
+
14
−
4
Options
@@ -92,10 +92,20 @@ namespace armarx
rtGetControlStruct
().
velocityY
,
rtGetControlStruct
().
velocityRotation
);
Eigen
::
VectorXf
result
=
ramp
.
update
(
x
,
timeSinceLastIteration
.
toSecondsDouble
());
target
->
velocityX
=
result
(
0
);
target
->
velocityY
=
result
(
1
);
target
->
velocityRotation
=
result
(
2
);
if
(
x
==
Eigen
::
Vector3f
::
Zero
())
{
target
->
velocityX
=
0
;
target
->
velocityY
=
0
;
target
->
velocityRotation
=
0
;
}
else
{
Eigen
::
VectorXf
result
=
ramp
.
update
(
x
,
timeSinceLastIteration
.
toSecondsDouble
());
target
->
velocityX
=
result
(
0
);
target
->
velocityY
=
result
(
1
);
target
->
velocityRotation
=
result
(
2
);
}
}
}
Loading