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

armem_robot_mapping: adding list of sensors to query result

parent 94c7ea23
No related branches found
No related tags found
No related merge requests found
#include "MappingDataReader.h" #include "MappingDataReader.h"
#include "RobotAPI/libraries/armem_robot_localization/MemoryConnector.h"
#include <vector> #include <vector>
#include <IceUtil/Time.h> #include <IceUtil/Time.h>
#include <SimoxUtility/algorithm/get_map_keys_values.h>
#include <ArmarXCore/core/logging/Logging.h> #include <ArmarXCore/core/logging/Logging.h>
#include <RobotAPI/libraries/armem/core/EntityInstance.h> #include <RobotAPI/libraries/armem/core/EntityInstance.h>
...@@ -14,6 +15,7 @@ ...@@ -14,6 +15,7 @@
#include <RobotAPI/libraries/armem_robot_mapping/aron_conversions.h> #include <RobotAPI/libraries/armem_robot_mapping/aron_conversions.h>
#include <RobotAPI/libraries/armem_robot_mapping/types.h> #include <RobotAPI/libraries/armem_robot_mapping/types.h>
#include <RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/AronCppClass.h> #include <RobotAPI/libraries/aron/core/codegenerator/codeWriter/cpp/AronCppClass.h>
#include "RobotAPI/libraries/armem_robot_localization/MemoryConnector.h"
namespace armarx::armem namespace armarx::armem
{ {
...@@ -109,6 +111,7 @@ namespace armarx::armem ...@@ -109,6 +111,7 @@ namespace armarx::armem
ARMARX_WARNING << "Failed to query data from memory: " ARMARX_WARNING << "Failed to query data from memory: "
<< qResult.errorMessage; << qResult.errorMessage;
return {.laserScans = {}, return {.laserScans = {},
.sensors = {},
.status = Result::Status::Error, .status = Result::Status::Error,
.errorMessage = qResult.errorMessage}; .errorMessage = qResult.errorMessage};
} }
...@@ -128,7 +131,10 @@ namespace armarx::armem ...@@ -128,7 +131,10 @@ namespace armarx::armem
return laserScan; return laserScan;
}); });
const auto sensors = simox::alg::get_keys(entities);
return {.laserScans = std::move(laserScans), return {.laserScans = std::move(laserScans),
.sensors = sensors,
.status = Result::Status::Success, .status = Result::Status::Success,
.errorMessage = ""}; .errorMessage = ""};
} }
......
...@@ -82,6 +82,8 @@ namespace armarx::armem ...@@ -82,6 +82,8 @@ namespace armarx::armem
std::vector<LaserScanStamped> laserScans; std::vector<LaserScanStamped> laserScans;
std::vector<std::string> sensors;
enum Status enum Status
{ {
Error, Error,
......
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