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
!286
skill provider usability updates
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
skill provider usability updates
armem/ltm/dev
into
master
Overview
0
Commits
22
Pipelines
0
Changes
57
Merged
Fabian Tërnava
requested to merge
armem/ltm/dev
into
master
2 years ago
Overview
0
Commits
22
Pipelines
0
Changes
57
Expand
skill provider usability updates
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
5634f09b
22 commits,
2 years ago
57 files
+
1663
−
420
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
57
Search (e.g. *.vue) (Ctrl+P)
source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.cpp
+
10
−
3
Options
@@ -138,10 +138,17 @@ namespace armarx
SkillManagerComponentPluginUser
::
removeProvider
(
skillProviderName
,
current
);
}
void
SkillsMemory
::
executeSkill
(
const
skills
::
manager
::
dto
::
SkillExecutionRequest
&
info
,
const
Ice
::
Current
&
current
)
skills
::
provider
::
dto
::
SkillStatusUpdate
SkillsMemory
::
executeSkill
(
const
skills
::
manager
::
dto
::
SkillExecutionRequest
&
info
,
const
Ice
::
Current
&
current
)
{
skillExecutionRequestCoreSegment
.
addSkillExecutionRequest
(
info
);
SkillManagerComponentPluginUser
::
executeSkill
(
info
,
current
);
skills
::
manager
::
dto
::
SkillExecutionRequest
requestCopy
=
info
;
if
(
requestCopy
.
skillId
.
providerName
==
"*"
)
{
// sanitize the provider name if set to 'any'
requestCopy
.
skillId
.
providerName
=
getFirstProviderNameThatHasSkill
(
requestCopy
.
skillId
.
skillName
);
}
skillExecutionRequestCoreSegment
.
addSkillExecutionRequest
(
requestCopy
);
return
SkillManagerComponentPluginUser
::
executeSkill
(
requestCopy
,
current
);
}
void
SkillsMemory
::
updateStatusForSkill
(
const
skills
::
provider
::
dto
::
SkillStatusUpdate
&
update
,
const
Ice
::
Current
&
current
)
Loading