From 73e85157f08c8c23f15b4c6328b0c5de5d36bf9f Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Mon, 5 Sep 2022 17:48:07 +0200
Subject: [PATCH] fixing merge
---
.../armem_laser_scans/aron_conversions.cpp | 2 +-
.../armem_vision/aron_conversions.cpp | 35 +------------------
2 files changed, 2 insertions(+), 35 deletions(-)
diff --git a/source/RobotAPI/libraries/armem_laser_scans/aron_conversions.cpp b/source/RobotAPI/libraries/armem_laser_scans/aron_conversions.cpp
index 4706fafd2..aaa39472e 100644
--- a/source/RobotAPI/libraries/armem_laser_scans/aron_conversions.cpp
+++ b/source/RobotAPI/libraries/armem_laser_scans/aron_conversions.cpp
@@ -69,7 +69,7 @@ namespace armarx::armem::laser_scans
aronSensorHeader.agent = sensorHeader.agent;
aronSensorHeader.frame = sensorHeader.frame;
- toAron(aronSensorHeader.timestamp, sensorHeader.timestamp);
+ aron::toAron(aronSensorHeader.timestamp, sensorHeader.timestamp);
return aronSensorHeader;
}
diff --git a/source/RobotAPI/libraries/armem_vision/aron_conversions.cpp b/source/RobotAPI/libraries/armem_vision/aron_conversions.cpp
index 12bde0a1a..814ec5463 100644
--- a/source/RobotAPI/libraries/armem_vision/aron_conversions.cpp
+++ b/source/RobotAPI/libraries/armem_vision/aron_conversions.cpp
@@ -31,40 +31,7 @@ namespace armarx::armem::vision
{
return timestamp.toMicroSecondsSinceEpoch();
}
-
- arondto::SensorHeader
- toAron(const SensorHeader& sensorHeader)
- {
- arondto::SensorHeader aronSensorHeader;
-
- aron::toAron(aronSensorHeader.agent, sensorHeader.agent);
- aron::toAron(aronSensorHeader.frame, sensorHeader.frame);
- aron::toAron(aronSensorHeader.timestamp, sensorHeader.timestamp);
-
- return aronSensorHeader;
- }
-
- void
- toAron(const LaserScanStamped& laserScanStamped,
- arondto::LaserScanStamped& aronLaserScanStamped)
- {
- aronLaserScanStamped.header = toAron(laserScanStamped.header);
- // toAron(laserScanStamped.data, aronLaserScanStamped.data);
- }
-
- void
- toAron(const LaserScan& laserScan,
- const armem::Time& timestamp,
- const std::string& frame,
- const std::string& agentName,
- arondto::LaserScanStamped& aronLaserScanStamped)
- {
- const SensorHeader header{.agent = agentName, .frame = frame, .timestamp = timestamp};
-
- const LaserScanStamped laserScanStamped{.header = header, .data = laserScan};
-
- toAron(laserScanStamped, aronLaserScanStamped);
- }
+
void
toAron(arondto::OccupancyGrid& dto, const OccupancyGrid& bo)
--
GitLab