Skip to content
Snippets Groups Projects
Commit 2312e7e6 authored by Fabian Reister's avatar Fabian Reister
Browse files

Merge branch 'fix/armem_robot_state' into 'master'

Fix/armem robot state

See merge request ArmarX/RobotAPI!194
parents 8167340d b535f3bf
No related branches found
No related tags found
2 merge requests!194Fix/armem robot state,!135Resolve "Add Grasp (Affordance) Memory"
......@@ -149,14 +149,14 @@ namespace armarx::armem::robot_state
const auto jointMap = queryJointState(description, timestamp);
if (not jointMap)
{
ARMARX_WARNING << "Failed to query joint state";
ARMARX_WARNING << "Failed to query joint state for robot " << description.name;
return std::nullopt;
}
const auto globalPose = queryGlobalPose(description, timestamp);
if (not globalPose)
{
ARMARX_WARNING << "Failed to query global pose";
ARMARX_WARNING << "Failed to query global pose for robot " << description.name;
return std::nullopt;
}
......
......@@ -42,7 +42,7 @@ namespace armarx::armem::robot_state
const auto robotState = queryState(robotDescription, timestamp);
if (not robotState)
{
ARMARX_WARNING << "Querying robot state failed!";
ARMARX_WARNING << "Querying robot state failed for robot `" << robot.getName() << " / " << robot.getType() << "`!";
return false;
}
......@@ -67,7 +67,9 @@ namespace armarx::armem::robot_state
const std::string xmlFilename = ArmarXDataPath::resolvePath(description->xml.serialize().path);
ARMARX_INFO << "Loading (virtual) robot '" << description->name << "' from XML file '" << xmlFilename << "'";
return VirtualRobot::RobotIO::loadRobot(xmlFilename, loadMode);
auto robot = VirtualRobot::RobotIO::loadRobot(xmlFilename, loadMode);
robot->setName(name);
return robot;
}
......
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