Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Simox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
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
Simox
Simox
Commits
157d22da
Commit
157d22da
authored
1 year ago
by
Andre Meixner
Browse files
Options
Downloads
Patches
Plain Diff
Fixed createReducedRobotModel for robots where the joint value of 0. is not within joint limits
parent
bb9add64
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!162
Feature/improved manip map
Pipeline
#15386
passed
1 year ago
Stage: build-and-test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
VirtualRobot/RobotFactory.cpp
+8
-0
8 additions, 0 deletions
VirtualRobot/RobotFactory.cpp
with
8 additions
and
0 deletions
VirtualRobot/RobotFactory.cpp
+
8
−
0
View file @
157d22da
...
...
@@ -1066,6 +1066,7 @@ namespace VirtualRobot
// Check joint nodes and set robot joints to default value
std
::
map
<
std
::
string
,
float
>
joint_values
;
std
::
map
<
std
::
string
,
bool
>
enforce_joint_limits
;
for
(
const
auto
&
joint_name
:
actuatedJointNames
)
{
if
(
robot
.
hasRobotNode
(
joint_name
))
...
...
@@ -1077,7 +1078,9 @@ namespace VirtualRobot
return
nullptr
;
}
joint_values
[
joint_name
]
=
node
->
getJointValue
();
enforce_joint_limits
[
joint_name
]
=
node
->
getEnforceJointLimits
();
// Set joints do default starting value
node
->
setEnforceJointLimits
(
false
);
// required if 0. is not within in the limits
node
->
setJointValueNoUpdate
(
0.
);
}
else
...
...
@@ -1244,6 +1247,11 @@ namespace VirtualRobot
reducedModel
->
setGlobalPose
(
globalPose
);
reducedModel
->
setJointValues
(
joint_values
);
for
(
const
auto
&
[
joint_name
,
enforce_limits
]
:
enforce_joint_limits
)
{
robot
.
getRobotNode
(
joint_name
)
->
setEnforceJointLimits
(
enforce_limits
);
}
cloneRNS
(
robot
,
reducedModel
);
if
(
robot
.
getHumanMapping
().
has_value
())
...
...
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