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
Commits
286e9f81
Commit
286e9f81
authored
1 year ago
by
Julian Tusch
Browse files
Options
Downloads
Patches
Plain Diff
added comment
parent
85185bd3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
3 merge requests
!460
Draft: fluxio/dev-skill-timeout
,
!449
Fluxio preliminary release
,
!446
Draft: Fluxio related changes
Pipeline
#18650
failed
1 year ago
Stage: build-and-test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/RobotAPI/interface/skills/SkillManagerInterface.ice
+1
-1
1 addition, 1 deletion
source/RobotAPI/interface/skills/SkillManagerInterface.ice
source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp
+1
-0
1 addition, 0 deletions
.../libraries/skills/manager/SkillManagerComponentPlugin.cpp
with
2 additions
and
1 deletion
source/RobotAPI/interface/skills/SkillManagerInterface.ice
+
1
−
1
View file @
286e9f81
...
...
@@ -69,7 +69,7 @@ module armarx
string
id
;
string
name
;
string
description
;
FluxioIdentificator
parentId
;
FluxioIdentificator
parentId
;
// zusätzlicher boolean für optional fields
};
[
"cpp:type:std::list<armarx::skills::manager::dto::FluxioProfile>"
,
"python:seq:list"
]
...
...
This diff is collapsed.
Click to expand it.
source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp
+
1
−
0
View file @
286e9f81
...
...
@@ -845,6 +845,7 @@ namespace armarx
bool
SkillManagerComponentPluginUser
::
getSkillMutex
(
const
std
::
string
&
skillId
,
const
std
::
string
&
userId
,
const
Ice
::
Current
&
current
){
return
this
->
plugin
->
getSkillMutex
(
skillId
,
userId
);
}
void
SkillManagerComponentPluginUser
::
deleteSkillMutex
(
const
std
::
string
&
skillId
,
const
std
::
string
&
userId
,
const
Ice
::
Current
&
current
){
this
->
plugin
->
deleteSkillMutex
(
skillId
,
userId
);
}
...
...
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