Skip to content
Snippets Groups Projects

armem/dev => master

Merged Fabian Reister requested to merge armem/dev into master
1 file
+ 3
3
Compare changes
  • Side-by-side
  • Inline
@@ -43,10 +43,10 @@ namespace armarx::armem::robot
std::optional<RobotState> convertRobotState(const armem::wm::EntityInstance& instance)
{
arondto::RobotState aronRobotState;
arondto::Robot aronRobot;
try
{
aronRobotState.fromAron(instance.data());
aronRobot.fromAron(instance.data());
}
catch (...)
{
@@ -55,7 +55,7 @@ namespace armarx::armem::robot
}
RobotState robotState;
fromAron(aronRobotState, robotState);
fromAron(aronRobot.state, robotState);
return robotState;
}
Loading