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

Merge branch 'skills/dev' into fabianpk

# Conflicts:
#	source/RobotAPI/libraries/armem_skills/server/segment/ExecutableSkillLibrarySegment.cpp
parents 9b58c045 7ef0a5ab
No related branches found
No related tags found
1 merge request!337Merge fabianpk dev branch
...@@ -13,6 +13,7 @@ armarx_add_library( ...@@ -13,6 +13,7 @@ armarx_add_library(
RobotAPI::armem_server RobotAPI::armem_server
RobotAPI::skills RobotAPI::skills
aronjsonconverter aronjsonconverter
aroncommonconverter
SOURCES SOURCES
./aron_conversions.cpp ./aron_conversions.cpp
......
...@@ -31,11 +31,11 @@ The memory should look like the following: ...@@ -31,11 +31,11 @@ The memory should look like the following:
</ObjectChild> </ObjectChild>
<ObjectChild key='timeoutMs'> <ObjectChild key='timeoutMs'>
<long /> <int64 />
</ObjectChild> </ObjectChild>
<ObjectChild key='acceptedType'> <ObjectChild key='acceptedType'>
<string /> <!-- TODO REPLACE! --> <AnyObject shared_ptr="1" />
</ObjectChild> </ObjectChild>
</Object> </Object>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <SimoxUtility/algorithm/string.h> #include <SimoxUtility/algorithm/string.h>
#include <RobotAPI/libraries/aron/converter/json/NLohmannJSONConverter.h> #include <RobotAPI/libraries/aron/converter/json/NLohmannJSONConverter.h>
#include <RobotAPI/libraries/aron/converter/common/DatatypeConverter.h>
#include <RobotAPI/libraries/armem_skills/aron/Skill.aron.generated.h> #include <RobotAPI/libraries/armem_skills/aron/Skill.aron.generated.h>
...@@ -43,13 +44,19 @@ namespace armarx::skills::segment ...@@ -43,13 +44,19 @@ namespace armarx::skills::segment
if (desc.acceptedType) if (desc.acceptedType)
{ {
auto t = aron::type::Object::FromAronObjectDTO(desc.acceptedType); auto t = aron::type::Object::FromAronObjectDTO(desc.acceptedType);
skillDescription.acceptedType = aron::converter::AronNlohmannJSONConverter::ConvertToNlohmannJSON(t).dump(2);
aron::converter::DatatypeConverter c;
aron::type::visit(c, t);
skillDescription.acceptedType = aron::data::Dict::DynamicCastAndCheck(c.latest);
} }
armem::Commit commit; armem::Commit commit;
auto& entityUpdate = commit.add(); auto& entityUpdate = commit.add();
entityUpdate.confidence = 1.0; entityUpdate.confidence = 1.0;
entityUpdate.referencedTime = armem::Time::Now(); entityUpdate.referencedTime = armem::Time::Now();
entityUpdate.sentTime = armem::Time::Now();
entityUpdate.arrivedTime = armem::Time::Now();
entityUpdate.instancesData = {skillDescription.toAron()}; entityUpdate.instancesData = {skillDescription.toAron()};
entityUpdate.entityID = provId.withEntityName(skillDescription.skillName); entityUpdate.entityID = provId.withEntityName(skillDescription.skillName);
......
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