Merge branch 'aron/dev' into 'master'

Aron/dev

See merge request ArmarX/skills/navigation!26

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>
 

source/armarx/navigation/global_planning/aron/AStarParams.xml

 <?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>

source/armarx/navigation/global_planning/aron/Point2PointParams.xml

 <?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>

source/armarx/navigation/global_planning/aron/SPFAParams.xml

 <?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>

source/armarx/navigation/platform_controller/aron/PlatformTrajectoryControllerConfig.xml

 <?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>

source/armarx/navigation/trajectory_control/aron/TrajectoryControllerParams.xml

 <?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>

source/armarx/navigation/trajectory_control/aron/TrajectoryFollowingControllerParams.xml

 <?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>

source/armarx/navigation/trajectory_control/aron/WaypointControllerParams.xml

 <?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>