Merge branch 'master' of gitlab.com:ArmarX/RobotAPI
Showing
- etc/cmake/FindNLOPT.cmake 41 additions, 0 deletionsetc/cmake/FindNLOPT.cmake
- source/RobotAPI/interface/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/interface/CMakeLists.txt
- source/RobotAPI/interface/components/RobotNameServiceInterface.ice 1 addition, 4 deletions...botAPI/interface/components/RobotNameServiceInterface.ice
- source/RobotAPI/interface/components/TrajectoryPlayerInterface.ice 2 additions, 5 deletions...botAPI/interface/components/TrajectoryPlayerInterface.ice
- source/RobotAPI/interface/core/moved_to_robotcomponents_RobotIK.ice 0 additions, 291 deletions...otAPI/interface/core/moved_to_robotcomponents_RobotIK.ice
- source/RobotAPI/interface/units/RobotUnit/NJointBimanualForceMPController.ice 84 additions, 0 deletions...rface/units/RobotUnit/NJointBimanualForceMPController.ice
- source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt 3 additions, 0 deletions...botAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
- source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualForceMPController.cpp 496 additions, 0 deletions...rollers/DMPController/NJointBimanualForceMPController.cpp
- source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointBimanualForceMPController.h 173 additions, 0 deletions...ntrollers/DMPController/NJointBimanualForceMPController.h
- source/RobotAPI/libraries/SimpleJsonLogger/SimpleJsonLoggerEntry.cpp 15 additions, 0 deletions...tAPI/libraries/SimpleJsonLogger/SimpleJsonLoggerEntry.cpp
- source/RobotAPI/libraries/SimpleJsonLogger/SimpleJsonLoggerEntry.h 3 additions, 0 deletions...botAPI/libraries/SimpleJsonLogger/SimpleJsonLoggerEntry.h
Loading
Please register or sign in to comment