diff --git a/source/RobotAPI/components/units/RobotUnit/BasicControllers.h b/source/RobotAPI/components/units/RobotUnit/BasicControllers.h index 16f222d827a91c7eba560695487f756b3e7de2f7..c544ea8dd4b54eb15cebd9fb10e36a00e0623234 100644 --- a/source/RobotAPI/components/units/RobotUnit/BasicControllers.h +++ b/source/RobotAPI/components/units/RobotUnit/BasicControllers.h @@ -27,7 +27,6 @@ #include <ArmarXCore/core/util/algorithm.h> #include <RobotAPI/libraries/core/math/MathUtils.h> #include <RobotAPI/libraries/core/PIDController.h> -#include <ArmarXCore/core/rapidxml/wrapper/DefaultRapidXmlReader.h> // #define DEBUG_POS_CTRL #ifdef DEBUG_POS_CTRL #include <boost/circular_buffer.hpp> @@ -203,20 +202,6 @@ namespace armarx { public: RampedAccelerationVelocityControllerConfiguration() = default; - static RampedAccelerationVelocityControllerConfigurationPtr CreateFromXml(DefaultRapidXmlReaderNode node) - { - RampedAccelerationVelocityControllerConfigurationPtr config(new RampedAccelerationVelocityControllerConfiguration()); - FillFromXml(*config, node); - return config; - } - static void FillFromXml(RampedAccelerationVelocityControllerConfiguration& config, DefaultRapidXmlReaderNode node) - { - config.maxVelocityRad = node.first_node("maxVelocityRad").value_as_float(); - config.maxDecelerationRad = node.first_node("maxDecelerationRad").value_as_float(); - config.jerk = node.first_node("jerk").value_as_float(); - config.maxDt = node.first_node("maxDt").value_as_float(); - config.directSetVLimit = node.first_node("directSetVLimit").value_as_float(); - } float maxVelocityRad; float maxDecelerationRad; diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointControllerBase.h b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointControllerBase.h index b18689724a120d17a3eff61158d9e57cfd2ee7a9..d393f02ea5f90ff5ed41eab507fb6bf94cc7415a 100644 --- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointControllerBase.h +++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointControllerBase.h @@ -23,6 +23,7 @@ #pragma once #include <RobotAPI/interface/units/RobotUnit/NJointController.h> +#include <RobotAPI/components/units/RobotUnit/RobotUnit.h> #include <ArmarXCore/core/ManagedIceObject.h> #include <ArmarXCore/core/exceptions/local/ExpressionException.h> // for ARMARX_CHECK