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
676bb9ea
Commit
676bb9ea
authored
5 months ago
by
Petrut-Daniel Coman
Browse files
Options
Downloads
Patches
Plain Diff
fixed implicit failed and aborted events
parent
12f1d24f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!449
Fluxio preliminary release
Pipeline
#21721
failed
5 months ago
Stage: build-and-test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/RobotAPI/libraries/skills/core/executor/FluxioCompositeExecutor.cpp
+10
-10
10 additions, 10 deletions
...ibraries/skills/core/executor/FluxioCompositeExecutor.cpp
with
10 additions
and
10 deletions
source/RobotAPI/libraries/skills/core/executor/FluxioCompositeExecutor.cpp
+
10
−
10
View file @
676bb9ea
...
...
@@ -482,16 +482,6 @@ namespace armarx::skills
if
(
outputParam
==
subSkillNode
->
skillPtr
->
parameters
.
end
())
{
if
(
outputEventName
==
"Failed"
)
{
setStatus
(
skills
::
SkillStatus
::
Failed
);
return
;
}
if
(
outputEventName
==
"Aborted"
)
{
setStatus
(
skills
::
SkillStatus
::
Aborted
);
return
;
}
ARMARX_WARNING
<<
"Skill "
<<
subSkillNode
->
skillPtr
->
name
<<
" is missing the output event parameter "
<<
outputEventName
;
setStatus
(
skills
::
SkillStatus
::
Failed
);
...
...
@@ -510,6 +500,16 @@ namespace armarx::skills
if
(
edge
==
skill
.
edges
.
end
())
{
if
(
outputEventName
==
"Failed"
)
{
setStatus
(
skills
::
SkillStatus
::
Failed
);
return
;
}
if
(
outputEventName
==
"Aborted"
)
{
setStatus
(
skills
::
SkillStatus
::
Aborted
);
return
;
}
ARMARX_WARNING
<<
"Skill "
<<
skill
.
name
<<
" has no edge connected to the output event parameter "
<<
outputEventName
;
...
...
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