Merge branch 'master' of gitlab.com:ArmarX/RobotAPI
Showing
- data/RobotAPI/VariantInfo-RobotAPI.xml 4 additions, 0 deletionsdata/RobotAPI/VariantInfo-RobotAPI.xml
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.cpp 3 additions, 3 deletions...obotUnit/NJointControllers/NJointTrajectoryController.cpp
- source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp 1 addition, 1 deletionsource/RobotAPI/components/units/RobotUnit/RobotUnit.cpp
- source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualCCDMPController.cpp 1 addition, 1 deletion...ntrollers/DMPController/NJointBimanualCCDMPController.cpp
- source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.cpp 1 addition, 1 deletion...s/DMPController/NJointTaskSpaceImpedanceDMPController.cpp
- source/RobotAPI/libraries/core/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/libraries/core/CMakeLists.txt
- source/RobotAPI/libraries/core/MultiDimPIDController.h 238 additions, 0 deletionssource/RobotAPI/libraries/core/MultiDimPIDController.h
- source/RobotAPI/libraries/core/PIDController.cpp 0 additions, 143 deletionssource/RobotAPI/libraries/core/PIDController.cpp
- source/RobotAPI/libraries/core/PIDController.h 1 addition, 35 deletionssource/RobotAPI/libraries/core/PIDController.h
- source/RobotAPI/libraries/core/Trajectory.cpp 3 additions, 4 deletionssource/RobotAPI/libraries/core/Trajectory.cpp
- source/RobotAPI/libraries/core/Trajectory.h 2 additions, 2 deletionssource/RobotAPI/libraries/core/Trajectory.h
- source/RobotAPI/libraries/core/TrajectoryController.cpp 32 additions, 6 deletionssource/RobotAPI/libraries/core/TrajectoryController.cpp
- source/RobotAPI/libraries/core/TrajectoryController.h 5 additions, 0 deletionssource/RobotAPI/libraries/core/TrajectoryController.h
Loading
Please register or sign in to comment