diff --git a/source/RobotAPI/libraries/skills/provider/SimpleSkill.cpp b/source/RobotAPI/libraries/skills/provider/SimpleSkill.cpp index 96ec8391771ba52b6a5d6d813f3692a3116e12b0..b6e834b4cf3114bd0938328482d00a2d243eb60e 100644 --- a/source/RobotAPI/libraries/skills/provider/SimpleSkill.cpp +++ b/source/RobotAPI/libraries/skills/provider/SimpleSkill.cpp @@ -3,42 +3,42 @@ namespace armarx::skills { Skill::InitResult - SimpleSKill::init() + SimpleSkill::init() { InitInput i; i.executorName = this->executorName; - i.params = this->parameters; + i.parameters = this->parameters; return this->init(i); } Skill::MainResult - SimpleSKill::main() + SimpleSkill::main() { MainInput i; i.executorName = this->executorName; - i.params = this->parameters; + i.parameters = this->parameters; i.callback = this->callback; return this->main(i); } Skill::ExitResult - SimpleSKill::exit() + SimpleSkill::exit() { ExitInput i; i.executorName = this->executorName; - i.params = this->parameters; + i.parameters = this->parameters; return this->exit(i); } Skill::InitResult - SimpleSKill::init(const InitInput& in) + SimpleSkill::init(const InitInput& in) { // Default nothing to init return {.status = TerminatedSkillStatus::Succeeded}; } Skill::MainResult - SimpleSKill::main(const MainInput& in) + SimpleSkill::main(const MainInput& in) { // This is just a dummy implementation ARMARX_IMPORTANT << "Dummy executing skill '" << description.skillId @@ -47,7 +47,7 @@ namespace armarx::skills } Skill::ExitResult - SimpleSKill::exit(const ExitInput& in) + SimpleSkill::exit(const ExitInput& in) { // Default nothing to exit return {.status = TerminatedSkillStatus::Succeeded}; diff --git a/source/RobotAPI/libraries/skills/provider/SimpleSkill.h b/source/RobotAPI/libraries/skills/provider/SimpleSkill.h index c4b736dfb0b96f12fb42ffcf6eb6d0218252daa2..a6cc87324f965176ff2fd7ea0dc5ff313e3439a7 100644 --- a/source/RobotAPI/libraries/skills/provider/SimpleSkill.h +++ b/source/RobotAPI/libraries/skills/provider/SimpleSkill.h @@ -6,7 +6,7 @@ namespace armarx { namespace skills { - class SimpleSKill : public Skill + class SimpleSkill : public Skill { public: using Skill::Skill; @@ -14,20 +14,20 @@ namespace armarx struct InitInput { std::string executorName; - aron::data::DictPtr params; + aron::data::DictPtr parameters; }; struct MainInput { std::string executorName; - aron::data::DictPtr params; + aron::data::DictPtr parameters; CallbackT callback; }; struct ExitInput { std::string executorName; - aron::data::DictPtr params; + aron::data::DictPtr parameters; }; diff --git a/source/RobotAPI/libraries/skills/provider/SimpleSpecializedSkill.h b/source/RobotAPI/libraries/skills/provider/SimpleSpecializedSkill.h index a62ca4ae5c7a2aa54c231beb6805a1b71d044f7a..1572c16b70dc1744da2bff7c13280bdbe747ac82 100644 --- a/source/RobotAPI/libraries/skills/provider/SimpleSpecializedSkill.h +++ b/source/RobotAPI/libraries/skills/provider/SimpleSpecializedSkill.h @@ -16,20 +16,20 @@ namespace armarx struct SpecializedInitInput { std::string executorName; - AronT params; + AronT parameters; }; struct SpecializedMainInput { std::string executorName; - AronT params; + AronT parameters; CallbackT callback; }; struct SpecializedExitInput { std::string executorName; - AronT params; + AronT parameters; }; @@ -64,7 +64,7 @@ namespace armarx SpecializedInitInput i; i.executorName = this->executorName; - i.params = p; + i.parameters = p; return this->init(i); } @@ -77,7 +77,7 @@ namespace armarx SpecializedMainInput i; i.executorName = this->executorName; i.callback = this->callback; - i.params = p; + i.parameters = p; return this->main(i); } @@ -89,7 +89,7 @@ namespace armarx SpecializedExitInput i; i.executorName = this->executorName; - i.params = p; + i.parameters = p; return this->exit(i); } };