From 63501e5d1d7457976872347546238319830e42dc Mon Sep 17 00:00:00 2001 From: Fabian Paus <fabian.paus@kit.edu> Date: Thu, 21 Apr 2022 10:54:25 +0200 Subject: [PATCH] Add missing includes --- .../NJointCartesianNaturalPositionController.cpp | 2 ++ .../NJointControllers/NJointCartesianWaypointController.cpp | 2 ++ .../RobotUnit/NJointControllers/NJointControllerBase.h | 2 ++ .../NJointHolonomicPlatformGlobalPositionController.h | 3 ++- .../NJointHolonomicPlatformRelativePositionController.cpp | 2 ++ .../NJointControllers/NJointTrajectoryController.cpp | 6 ++++++ .../NJointControllers/NJointTrajectoryController.h | 2 ++ 7 files changed, 18 insertions(+), 1 deletion(-) diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianNaturalPositionController.cpp b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianNaturalPositionController.cpp index fd692bfe2..3cbe59bdf 100644 --- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianNaturalPositionController.cpp +++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianNaturalPositionController.cpp @@ -7,6 +7,8 @@ #include <RobotAPI/components/units/RobotUnit/NJointControllers/NJointControllerRegistry.h> #include <RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h> +#include <RobotAPI/interface/visualization/DebugDrawerInterface.h> + #include <VirtualRobot/math/Helpers.h> #include <iomanip> diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.cpp b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.cpp index 5e80b3642..0ae54afc6 100644 --- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.cpp +++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.cpp @@ -8,6 +8,8 @@ #include <RobotAPI/components/units/RobotUnit/Devices/SensorDevice.h> #include <RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h> +#include <RobotAPI/interface/visualization/DebugDrawerInterface.h> + #include "NJointCartesianWaypointController.h" #include <iomanip> diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointControllerBase.h b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointControllerBase.h index 81afaef0d..b18689724 100644 --- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointControllerBase.h +++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointControllerBase.h @@ -40,6 +40,7 @@ namespace IceProxy::armarx { class DebugDrawerInterface; + class DebugObserverInterface; class RobotUnitInterface; } @@ -70,6 +71,7 @@ namespace armarx using ConstSensorDevicePtr = std::shared_ptr<const class SensorDevice>; typedef ::IceInternal::ProxyHandle< ::IceProxy::armarx::DebugDrawerInterface> DebugDrawerInterfacePrx; + typedef ::IceInternal::ProxyHandle< ::IceProxy::armarx::DebugObserverInterface> DebugObserverInterfacePrx; typedef ::IceInternal::ProxyHandle< ::IceProxy::armarx::RobotUnitInterface> RobotUnitInterfacePrx; using ThreadPoolPtr = std::shared_ptr<class ThreadPool>; diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformGlobalPositionController.h b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformGlobalPositionController.h index b722dbf67..a343e404f 100755 --- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformGlobalPositionController.h +++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformGlobalPositionController.h @@ -37,8 +37,9 @@ #include <RobotAPI/libraries/core/PIDController.h> #include <RobotAPI/components/units/RobotUnit/ControlTargets/ControlTargetHolonomicPlatformVelocity.h> - #include <RobotAPI/components/units/RobotUnit/BasicControllers.h> +#include <RobotAPI/interface/units/PlatformUnitInterface.h> + namespace armarx { diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformRelativePositionController.cpp b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformRelativePositionController.cpp index 7293c150c..40d37c7ae 100644 --- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformRelativePositionController.cpp +++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointHolonomicPlatformRelativePositionController.cpp @@ -25,6 +25,8 @@ #include <RobotAPI/components/units/RobotUnit/NJointControllers/NJointControllerRegistry.h> +#include <Eigen/Geometry> + namespace armarx { NJointControllerRegistration<NJointHolonomicPlatformRelativePositionController> diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.cpp b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.cpp index 297841f70..3b270bd05 100644 --- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.cpp +++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.cpp @@ -4,6 +4,7 @@ #include <RobotAPI/components/units/RobotUnit/util/RtLogging.h> #include <RobotAPI/libraries/core/math/MathUtils.h> +#include <ArmarXCore/interface/observers/ObserverInterface.h> #include <ArmarXCore/core/time/TimeUtil.h> #include <VirtualRobot/TimeOptimalTrajectory/TimeOptimalTrajectory.h> @@ -44,6 +45,11 @@ namespace armarx } } + NJointTrajectoryController::~NJointTrajectoryController() + { + + } + std::string NJointTrajectoryController::getClassName(const Ice::Current&) const { return "NJointTrajectoryController"; diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.h b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.h index 060c918b8..072f02567 100644 --- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.h +++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.h @@ -30,6 +30,8 @@ namespace armarx public: NJointTrajectoryController(RobotUnit* prov, const NJointControllerConfigPtr& config, const VirtualRobot::RobotPtr&); + ~NJointTrajectoryController(); + // NJointControllerInterface interface std::string getClassName(const Ice::Current&) const override; void onInitNJointController() override; -- GitLab