diff --git a/source/RobotAPI/libraries/armem_mps/aron_conversions.h b/source/RobotAPI/libraries/armem_mps/aron_conversions.h index 8de8754f9f656c61073aea2702910b50bf844cb6..343975886fdf6b6041189500ae40b5662701c5a4 100644 --- a/source/RobotAPI/libraries/armem_mps/aron_conversions.h +++ b/source/RobotAPI/libraries/armem_mps/aron_conversions.h @@ -3,7 +3,7 @@ #include <ArmarXCore/interface/core/Profiler.h> #include <ArmarXCore/observers/ObserverObjectFactories.h> -#include <RobotAPI/libraries/aron/common/aron/Trajectory.aron.generated.h> +#include <RobotAPI/libraries/aron/common/aron/trajectory.aron.generated.h> #include <dmp/representation/trajectory.h> //#include <dmp diff --git a/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/Segment.h b/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/Segment.h index ab14043ea70b511cacefba9409c8eb001d5f316d..f38c3c114b49e33b7f411450d11f0996f8ac5eb8 100644 --- a/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/Segment.h +++ b/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/Segment.h @@ -8,7 +8,7 @@ #include <RobotAPI/libraries/armem/server/segment/SpecializedSegment.h> // ArmarX -#include <RobotAPI/libraries/aron/common/aron/Trajectory.aron.generated.h> +#include <RobotAPI/libraries/aron/common/aron/trajectory.aron.generated.h> namespace armarx::armem::server::motions::mps::segment { diff --git a/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/motionprimitives.cpp b/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/motionprimitives.cpp index 080766eafbaf6bc20e84a8fec0a0912ceac6cfc2..32f0302a2b33486f6c4336b278059c6db5cf9208 100644 --- a/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/motionprimitives.cpp +++ b/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/motionprimitives.cpp @@ -8,8 +8,6 @@ #include <RobotAPI/libraries/armem/core/error.h> #include <RobotAPI/libraries/armem/server/MemoryRemoteGui.h> -#include <RobotAPI/libraries/aron/common/aron/Trajectory.aron.generated.h> - #include <dmp/representation/trajectory.h> #include <ArmarXCore/core/exceptions/local/ExpressionException.h> diff --git a/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/motionprimitives.h b/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/motionprimitives.h index 186074ce0dec8222017b0fb4a420beb227890739..72372ca2fa79a39e1a8ed022f4104627353f9727 100644 --- a/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/motionprimitives.h +++ b/source/RobotAPI/libraries/armem_mps/server/MotionPrimitives/motionprimitives.h @@ -7,7 +7,7 @@ #include <optional> // ArmarX -#include <RobotAPI/libraries/aron/common/aron/Trajectory.aron.generated.h> +#include <RobotAPI/libraries/aron/common/aron/trajectory.aron.generated.h> namespace armarx::armem::server::motions::mps::segment::util { diff --git a/source/RobotAPI/libraries/aron/common/CMakeLists.txt b/source/RobotAPI/libraries/aron/common/CMakeLists.txt index 8c844b040c17cc362b51f8706f5211cbeac2be21..463f59dd1454c0f23fde9b304b5de1b29ae4345b 100644 --- a/source/RobotAPI/libraries/aron/common/CMakeLists.txt +++ b/source/RobotAPI/libraries/aron/common/CMakeLists.txt @@ -32,8 +32,8 @@ armarx_enable_aron_file_generation_for_target( TARGET_NAME "${LIB_NAME}" ARON_FILES - aron/Trajectory.xml - aron/Color.xml + aron/trajectory.xml + aron/color.xml aron/PackagePath.xml aron/AxisAlignedBoundingBox.xml aron/OrientedBox.xml diff --git a/source/RobotAPI/libraries/aron/common/aron/Color.xml b/source/RobotAPI/libraries/aron/common/aron/color.xml similarity index 100% rename from source/RobotAPI/libraries/aron/common/aron/Color.xml rename to source/RobotAPI/libraries/aron/common/aron/color.xml diff --git a/source/RobotAPI/libraries/aron/common/aron/Trajectory.xml b/source/RobotAPI/libraries/aron/common/aron/trajectory.xml similarity index 100% rename from source/RobotAPI/libraries/aron/common/aron/Trajectory.xml rename to source/RobotAPI/libraries/aron/common/aron/trajectory.xml