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

refactored params member name

parent 3237be1d
No related branches found
No related tags found
1 merge request!388Refactor skills framework
......@@ -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};
......
......@@ -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;
};
......
......@@ -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);
}
};
......
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