Skip to content
Snippets Groups Projects
Commit 945911d7 authored by Fabian Tërnava's avatar Fabian Tërnava
Browse files

change callback type of skill for callbacks

parent 22071cd5
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment