diff --git a/source/RobotAPI/libraries/skills/provider/Skill.cpp b/source/RobotAPI/libraries/skills/provider/Skill.cpp index fa68245928b32e12f1f948a786aa8b8af2b9f983..d4a373f78298718f05d7ef90ee9d065517d36ded 100644 --- a/source/RobotAPI/libraries/skills/provider/Skill.cpp +++ b/source/RobotAPI/libraries/skills/provider/Skill.cpp @@ -39,28 +39,20 @@ namespace armarx _notifyStopped(); } - void Skill::_notifyTimeoutReached() - { - - } - - void Skill::_notifyStopped() - { - - } - void Skill::reset() { stopped = false; timeoutReached = false; + provider = nullptr; + manager = nullptr; + _reset(); } - void Skill::_reset() - { - - } + void Skill::_notifyTimeoutReached() { } + void Skill::_notifyStopped() { } + void Skill::_reset() { } Skill::Status Skill::execute(const aron::data::DictPtr& params, const CallbackT& callback) { diff --git a/source/RobotAPI/libraries/skills/provider/Skill.h b/source/RobotAPI/libraries/skills/provider/Skill.h index a4bf8ba687d332e2598c728e7f77be053d93e884..a11599be0fe72ee8bee1a5f9694249addf0bd2b0 100644 --- a/source/RobotAPI/libraries/skills/provider/Skill.h +++ b/source/RobotAPI/libraries/skills/provider/Skill.h @@ -62,9 +62,15 @@ namespace armarx public: const SkillDescription description; + + /// running params std::atomic_bool running = false; long started = 0; + /// proxies that called the skills + provider::dti::SkillProviderInterfacePrx provider; + manager::dti::SkillManagerInterfacePrx manager; + protected: /// Use conditions during runtime this way std::atomic_bool stopped = false; diff --git a/source/RobotAPI/libraries/skills/provider/SpecializedSkill.h b/source/RobotAPI/libraries/skills/provider/SpecializedSkill.h index a1b617a49700fc57f97e904c79de2882d3b6b690..fec98231ad74cf58da95c3bfd9324bc342e99c47 100644 --- a/source/RobotAPI/libraries/skills/provider/SpecializedSkill.h +++ b/source/RobotAPI/libraries/skills/provider/SpecializedSkill.h @@ -21,7 +21,7 @@ namespace armarx /// returns the accepted type of the skill static armarx::aron::type::ObjectPtr GetAcceptedType() { - return AronT::toAronType(); + return AronT::ToAronType(); } /// Override this method with the actual implementation. The callback is for status updates to the calling instance