From 3f078df9e7ab1f9910c714132767750c25ec82ee Mon Sep 17 00:00:00 2001
From: Fabian Peller-Konrad <fabian.peller-konrad@kit.edu>
Date: Tue, 19 Jul 2022 16:02:57 +0200
Subject: [PATCH 1/2] aron xml include updates
---
.../navigation/global_planning/aron/AStarParams.xml | 5 +----
.../global_planning/aron/Point2PointParams.xml | 5 +----
.../navigation/global_planning/aron/SPFAParams.xml | 5 +----
.../aron/TrajectoryControllerParams.xml | 5 +----
.../aron/TrajectoryFollowingControllerParams.xml | 11 +++--------
.../aron/WaypointControllerParams.xml | 5 +----
6 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/source/armarx/navigation/global_planning/aron/AStarParams.xml b/source/armarx/navigation/global_planning/aron/AStarParams.xml
index 1e35c5c5..fd8b9263 100644
--- a/source/armarx/navigation/global_planning/aron/AStarParams.xml
+++ b/source/armarx/navigation/global_planning/aron/AStarParams.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
- <CodeIncludes>
- <Include include="<armarx/navigation/global_planning/aron/GlobalPlannerParams.aron.generated.h>" />
- </CodeIncludes>
<AronIncludes>
- <Include include="GlobalPlannerParams.xml" />
+ <Include include="armarx/navigation/global_planning/aron/GlobalPlannerParams.xml" />
</AronIncludes>
<GenerateTypes>
diff --git a/source/armarx/navigation/global_planning/aron/Point2PointParams.xml b/source/armarx/navigation/global_planning/aron/Point2PointParams.xml
index a1e6b05b..71f77b19 100644
--- a/source/armarx/navigation/global_planning/aron/Point2PointParams.xml
+++ b/source/armarx/navigation/global_planning/aron/Point2PointParams.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
- <CodeIncludes>
- <Include include="<armarx/navigation/global_planning/aron/GlobalPlannerParams.aron.generated.h>" />
- </CodeIncludes>
<AronIncludes>
- <Include include="GlobalPlannerParams.xml" />
+ <Include include="armarx/navigation/global_planning/aron/GlobalPlannerParams.xml" />
</AronIncludes>
<GenerateTypes>
diff --git a/source/armarx/navigation/global_planning/aron/SPFAParams.xml b/source/armarx/navigation/global_planning/aron/SPFAParams.xml
index b1a34a4d..63b61b6f 100644
--- a/source/armarx/navigation/global_planning/aron/SPFAParams.xml
+++ b/source/armarx/navigation/global_planning/aron/SPFAParams.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
- <CodeIncludes>
- <Include include="<armarx/navigation/global_planning/aron/GlobalPlannerParams.aron.generated.h>" />
- </CodeIncludes>
<AronIncludes>
- <Include include="GlobalPlannerParams.xml" />
+ <Include include="armarx/navigation/global_planning/aron/GlobalPlannerParams.xml" />
</AronIncludes>
<GenerateTypes>
diff --git a/source/armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.xml b/source/armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.xml
index b40e68ba..44429d94 100644
--- a/source/armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.xml
+++ b/source/armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
- <CodeIncludes>
- <Include include="<armarx/navigation/core/aron/TwistLimits.aron.generated.h>" />
- </CodeIncludes>
<AronIncludes>
- <Include include="../../core/aron/TwistLimits.xml" />
+ <Include include="armarx/navigation/core/aron/TwistLimits.xml" />
</AronIncludes>
<GenerateTypes>
diff --git a/source/armarx/navigation/trajectory_control/aron/TrajectoryFollowingControllerParams.xml b/source/armarx/navigation/trajectory_control/aron/TrajectoryFollowingControllerParams.xml
index 357cfb65..860dcfe1 100644
--- a/source/armarx/navigation/trajectory_control/aron/TrajectoryFollowingControllerParams.xml
+++ b/source/armarx/navigation/trajectory_control/aron/TrajectoryFollowingControllerParams.xml
@@ -1,14 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
- <CodeIncludes>
- <Include include="<armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.aron.generated.h>" />
- <Include include="<armarx/navigation/core/aron/PIDParams.aron.generated.h>" />
- <Include include="<armarx/navigation/core/aron/TwistLimits.aron.generated.h>" />
- </CodeIncludes>
<AronIncludes>
- <Include include="TrajectoryControllerParams.xml" />
- <Include include="../../core/aron/PIDParams.xml" />
- <Include include="../../core/aron/TwistLimits.xml" />
+ <Include include="armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.xml" />
+ <Include include="armarx/navigation/core/aron/PIDParams.xml" />
+ <Include include="armarx/navigation/core/aron/TwistLimits.xml" />
</AronIncludes>
<GenerateTypes>
diff --git a/source/armarx/navigation/trajectory_control/aron/WaypointControllerParams.xml b/source/armarx/navigation/trajectory_control/aron/WaypointControllerParams.xml
index 9f1e482d..6a63d734 100644
--- a/source/armarx/navigation/trajectory_control/aron/WaypointControllerParams.xml
+++ b/source/armarx/navigation/trajectory_control/aron/WaypointControllerParams.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
- <CodeIncludes>
- <Include include="<armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.aron.generated.h>" />
- </CodeIncludes>
<AronIncludes>
- <Include include="TrajectoryControllerParams.xml" />
+ <Include include="armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.xml" />
</AronIncludes>
<GenerateTypes>
--
GitLab
From f6dca8dc91cbc4522d9dfdb330bf4219051ab1a3 Mon Sep 17 00:00:00 2001
From: Fabian Peller-Konrad <fabian.peller-konrad@kit.edu>
Date: Tue, 26 Jul 2022 16:19:46 +0200
Subject: [PATCH 2/2] fixed broken aron includes
---
source/armarx/navigation/core/json_conversions.h | 2 +-
.../aron/PlatformTrajectoryControllerConfig.xml | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/source/armarx/navigation/core/json_conversions.h b/source/armarx/navigation/core/json_conversions.h
index 7be22d49..9faf7098 100644
--- a/source/armarx/navigation/core/json_conversions.h
+++ b/source/armarx/navigation/core/json_conversions.h
@@ -23,7 +23,7 @@
#include <SimoxUtility/json/json.hpp>
-#include <RobotAPI/libraries/aron/core/codegenerator/codewriter/cpp/AronGeneratedClass.h>
+#include <RobotAPI/libraries/aron/core/codegeneration/cpp/AronGeneratedClass.h>
#include <RobotAPI/libraries/aron/core/data/rw/reader/nlohmannJSON/NlohmannJSONReader.h>
#include <RobotAPI/libraries/aron/core/data/rw/writer/nlohmannJSON/NlohmannJSONWriter.h>
diff --git a/source/armarx/navigation/platform_controller/aron/PlatformTrajectoryControllerConfig.xml b/source/armarx/navigation/platform_controller/aron/PlatformTrajectoryControllerConfig.xml
index a6551b53..8b51bccc 100644
--- a/source/armarx/navigation/platform_controller/aron/PlatformTrajectoryControllerConfig.xml
+++ b/source/armarx/navigation/platform_controller/aron/PlatformTrajectoryControllerConfig.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<AronTypeDefinition>
<AronIncludes>
- <Include include="../../core/aron/TwistLimits.xml" />
- <Include include="../../core/aron/PIDParams.xml" />
- <Include include="../../core/aron/Trajectory.xml" />
- <Include include="../../trajectory_control/aron/TrajectoryFollowingControllerParams.xml" />
+ <Include include="armarx_navigation/core/aron/TwistLimits.xml" />
+ <Include include="armarx_navigation/core/aron/PIDParams.xml" />
+ <Include include="armarx_navigation/core/aron/Trajectory.xml" />
+ <Include include="armarx_navigation/trajectory_control/aron/TrajectoryFollowingControllerParams.xml" />
<!-- <Include include="<armarx/control/common/control_law/aron/TaskspaceImpedanceControllerConfig.xml>" /> -->
</AronIncludes>
<CodeIncludes>
--
GitLab