diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformVelocityControllerWithRamp.h b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformVelocityControllerWithRamp.h index 186d7c581b852cd81503c83a74c2ef7fc93e9473..9070f028755423cb4117825d036809b7d3f545a8 100644 --- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformVelocityControllerWithRamp.h +++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformVelocityControllerWithRamp.h @@ -27,7 +27,6 @@ #include <RobotAPI/libraries/core/CartesianVelocityRamp.h> #include "../ControlTargets/ControlTargetHolonomicPlatformVelocity.h" -#include "../util.h" #include "NJointControllerWithTripleBuffer.h" namespace armarx diff --git a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleUnits.cpp b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleUnits.cpp index 16af4f8c064391718d3aef43efac649030d41ed8..7a60318dce48c96eebcc5e565d3767de721544be 100644 --- a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleUnits.cpp +++ b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleUnits.cpp @@ -449,15 +449,19 @@ namespace armarx::RobotUnitModule Component::create<UnitT>(properties, configName, getConfigDomain()); //config ARMARX_TRACE; - NJointHolonomicPlatformUnitVelocityPassThroughControllerConfigPtr config = - new NJointHolonomicPlatformUnitVelocityPassThroughControllerConfig; + NJointHolonomicPlatformVelocityControllerWithRampConfigPtr config = + new NJointHolonomicPlatformVelocityControllerWithRampConfig; config->initialVelocityX = 0; config->initialVelocityY = 0; config->initialVelocityRotation = 0; config->platformName = _module<RobotData>().getRobotPlatformName(); - auto ctrl = NJointHolonomicPlatformUnitVelocityPassThroughControllerPtr::dynamicCast( + + config->maxPositionAcceleration = 800; + config->maxOrientationAcceleration = 80; + + auto ctrl = NJointHolonomicPlatformVelocityControllerWithRampPtr::dynamicCast( _module<ControllerManagement>().createNJointController( - "NJointHolonomicPlatformUnitVelocityPassThroughController", + "NJointHolonomicPlatformVelocityControllerWithRamp", getName() + "_" + configName + "_VelPTContoller", config, false, @@ -479,7 +483,6 @@ namespace armarx::RobotUnitModule false, true)); ARMARX_CHECK_EXPRESSION(ctrlRelativePosition); - unit->pt = ctrl; unit->relativePosCtrl = ctrlRelativePosition; // unit->platformSensorIndex = _module<Devices>().getSensorDevices().index(_module<RobotData>().getRobotPlatformName()); @@ -496,7 +499,6 @@ namespace armarx::RobotUnitModule true)); ARMARX_TRACE; ARMARX_CHECK_EXPRESSION(ctrlGlobalPosition); - unit->pt = ctrl; unit->globalPosCtrl = ctrlGlobalPosition; ARMARX_TRACE; diff --git a/source/RobotAPI/components/units/RobotUnit/Units/PlatformSubUnit.h b/source/RobotAPI/components/units/RobotUnit/Units/PlatformSubUnit.h index 90d5443bfd71a795ba244f650ae97b24988359e2..5c2bb4a8d7ab42c3e255b50391f920f6597ea516 100755 --- a/source/RobotAPI/components/units/RobotUnit/Units/PlatformSubUnit.h +++ b/source/RobotAPI/components/units/RobotUnit/Units/PlatformSubUnit.h @@ -31,6 +31,7 @@ #include <RobotAPI/components/units/PlatformUnit.h> #include <RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformGlobalPositionController.h> #include <RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformRelativePositionController.h> +#include <RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformVelocityControllerWithRamp.h> #include <RobotAPI/interface/core/RobotState.h> #include <RobotAPI/libraries/core/Pose.h> @@ -93,7 +94,7 @@ namespace armarx void stopPlatform(const Ice::Current& c = Ice::emptyCurrent) override; - NJointHolonomicPlatformUnitVelocityPassThroughControllerPtr pt; + NJointHolonomicPlatformVelocityControllerWithRampPtr pt; NJointHolonomicPlatformRelativePositionControllerPtr relativePosCtrl; NJointHolonomicPlatformGlobalPositionControllerPtr globalPosCtrl;