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
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Florian Leander Singer
RobotAPI
Commits
945911d7
Commit
945911d7
authored
1 year ago
by
Fabian Tërnava
Browse files
Options
Downloads
Patches
Plain Diff
change callback type of skill for callbacks
parent
22071cd5
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/RobotAPI/libraries/skills/core/Skill.h
+7
-5
7 additions, 5 deletions
source/RobotAPI/libraries/skills/core/Skill.h
with
7 additions
and
5 deletions
source/RobotAPI/libraries/skills/core/Skill.h
+
7
−
5
View file @
945911d7
...
...
@@ -29,7 +29,8 @@ namespace armarx
class
Skill
:
public
armarx
::
Logging
{
public:
using
CallbackT
=
std
::
function
<
void
(
const
aron
::
data
::
DictPtr
&
)
>
;
using
CallbackT
=
std
::
function
<
void
(
const
SkillStatus
s
,
const
armarx
::
aron
::
data
::
DictPtr
&
)
>
;
struct
InitResult
{
...
...
@@ -160,23 +161,24 @@ namespace armarx
armarx
::
core
::
time
::
DateTime
started
=
armarx
::
core
::
time
::
DateTime
::
Invalid
();
armarx
::
core
::
time
::
DateTime
exited
=
armarx
::
core
::
time
::
DateTime
::
Invalid
();
// parameterization.Will be set from implementation wrapper.
// parameterization.
Will be set from implementation wrapper.
// const params after initialization!!
std
::
function
<
void
(
const
SkillStatus
s
,
const
armarx
::
aron
::
data
::
DictPtr
&
)
>
callback
;
CallbackT
callback
;
manager
::
dti
::
SkillManagerInterfacePrx
manager
=
nullptr
;
std
::
string
executorName
=
"INVALID EXECUTOR NAME"
;
protected
:
// non-const params
mutable
std
::
mutex
parametersMutex
;
armarx
::
aron
::
data
::
DictPtr
parameters
;
armarx
::
aron
::
data
::
DictPtr
parameters
=
nullptr
;
// The descripion of the skill
SkillDescription
description
;
// active conditions. First is condition (bool return func)
mutable
std
::
mutex
conditionCallbacksMutex
;
std
::
vector
<
std
::
pair
<
std
::
function
<
bool
()
>
,
std
::
function
<
void
()
>>>
conditionCallbacks
;
std
::
vector
<
std
::
pair
<
std
::
function
<
bool
()
>
,
std
::
function
<
void
()
>>>
conditionCallbacks
=
{};
/// Use conditions this way
...
...
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