Commit c097711d authored 4 years ago by JeffGao

Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

parents 5c6776b6 55c176f1

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 0 deletions

.gitignore
source/RobotAPI/components/ArViz/Client/elements/ElementOps.h 16 additions, 0 deletions

...ce/RobotAPI/components/ArViz/Client/elements/ElementOps.h
source/RobotAPI/components/ArViz/Coin/VisualizationRobot.cpp 3 additions, 3 deletions

source/RobotAPI/components/ArViz/Coin/VisualizationRobot.cpp
source/RobotAPI/gui-plugins/CartesianImpedanceController/CartesianImpedanceControllerWidgetController.h 2 additions, 2 deletions

...Controller/CartesianImpedanceControllerWidgetController.h
source/RobotAPI/interface/units/RobotUnit/NJointBimanualObjLevelController.ice 51 additions, 0 deletions

...face/units/RobotUnit/NJointBimanualObjLevelController.ice
source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 10 additions, 0 deletions

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h 52 additions, 0 deletions

...RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
source/RobotAPI/libraries/NJointControllerGuiPluginUtility/CMakeLists.txt 1 addition, 2 deletions

...libraries/NJointControllerGuiPluginUtility/CMakeLists.txt
source/RobotAPI/libraries/NJointControllerGuiPluginUtility/SpinBoxToPose.h 0 additions, 115 deletions

...ibraries/NJointControllerGuiPluginUtility/SpinBoxToPose.h
source/RobotAPI/libraries/NJointControllerGuiPluginUtility/SpinBoxToVector.h 0 additions, 202 deletions

...raries/NJointControllerGuiPluginUtility/SpinBoxToVector.h
source/RobotAPI/libraries/RobotAPIComponentPlugins/RobotStateComponentPlugin.cpp 12 additions, 0 deletions

...es/RobotAPIComponentPlugins/RobotStateComponentPlugin.cpp
source/RobotAPI/libraries/RobotAPIComponentPlugins/RobotStateComponentPlugin.h 6 additions, 1 deletion

...ries/RobotAPIComponentPlugins/RobotStateComponentPlugin.h
source/RobotAPI/libraries/RobotAPINJointControllerWidgets/CartesianImpedanceControllerConfigWidget.h 2 additions, 2 deletions

...trollerWidgets/CartesianImpedanceControllerConfigWidget.h
source/RobotAPI/libraries/RobotAPINJointControllers/BimanualForceControllers/NJointBimanualObjLevelController.cpp 62 additions, 1 deletion

...nualForceControllers/NJointBimanualObjLevelController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/BimanualForceControllers/NJointBimanualObjLevelController.h 13 additions, 0 deletions

...manualForceControllers/NJointBimanualObjLevelController.h
source/RobotAPI/libraries/RobotAPINJointControllers/BimanualForceControllers/NJointBimanualObjLevelVelController.cpp 685 additions, 0 deletions

...lForceControllers/NJointBimanualObjLevelVelController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/BimanualForceControllers/NJointBimanualObjLevelVelController.h 245 additions, 0 deletions

...ualForceControllers/NJointBimanualObjLevelVelController.h
source/RobotAPI/libraries/RobotAPINJointControllers/CMakeLists.txt 2 additions, 0 deletions

...botAPI/libraries/RobotAPINJointControllers/CMakeLists.txt
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.cpp 20 additions, 0 deletions

...NJointControllers/DMPController/NJointTSDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTSDMPController.h 5 additions, 0 deletions

...PINJointControllers/DMPController/NJointTSDMPController.h

with 1189 additions and 328 deletions

Please register or to comment