diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h index 12678d7c8cd32cb454d08e23334333a9db88e2ef..49e8bb65bb875e8faeb847a2273d24f355580509 100644 --- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h +++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h @@ -752,14 +752,6 @@ namespace armarx */ void rtDeactivateControllerBecauseOfError(); - - - - - - - - public: static const NJointControllerPtr NullPtr; @@ -802,10 +794,15 @@ namespace armarx // ///////////////////////////////////////// data ///////////////////////////////////////// // // //////////////////////////////////////////////////////////////////////////////////////// // private: + /// @brief reference to the owning \ref RobotUnit RobotUnit& robotUnit; + /// @brief Maps names of used \ref ControlDevice "ControlDevices" to the \ref JointController "JointController's" control mode StringStringDictionary controlDeviceControlModeMap; + /// @brief Maps names of used \ref ControlDevice "ControlDevices" to the used \ref JointController for this \ref ControlDevice std::map<std::string, const JointController*> controlDeviceUsedJointController; + /// @brief Bitmap of used \ref ControlDevice "ControlDevices" (1 == used, 0 == not used) std::vector<char> controlDeviceUsedBitmap; + /// @brief Indices of used \ref ControlDevice "ControlDevices" std::vector<std::size_t> controlDeviceUsedIndices; //this data is filled by the robot unit to provide convenience functions