Commit b41b52a1 authored 3 years ago by Fabian Paus

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

parents 9295da5c f951799a

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

data/RobotAPI/VariantInfo-RobotAPI.xml 11 additions, 3 deletions

data/RobotAPI/VariantInfo-RobotAPI.xml
source/RobotAPI/components/ArViz/Client/elements/Path.cpp 14 additions, 16 deletions

source/RobotAPI/components/ArViz/Client/elements/Path.cpp
source/RobotAPI/components/ArViz/Client/elements/Path.h 1 addition, 11 deletions

source/RobotAPI/components/ArViz/Client/elements/Path.h
source/RobotAPI/components/ArViz/Coin/VisualizationPath.cpp 37 additions, 3 deletions

source/RobotAPI/components/ArViz/Coin/VisualizationPath.cpp
source/RobotAPI/components/ArViz/Coin/VisualizationPath.h 8 additions, 0 deletions

source/RobotAPI/components/ArViz/Coin/VisualizationPath.h
source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.cpp 48 additions, 5 deletions

...ponents/DynamicObstacleManager/DynamicObstacleManager.cpp
source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.h 2 additions, 0 deletions

...omponents/DynamicObstacleManager/DynamicObstacleManager.h
source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.cpp 16 additions, 1 deletion

...API/components/DynamicObstacleManager/ManagedObstacle.cpp
source/RobotAPI/components/units/CMakeLists.txt 1 addition, 0 deletions

source/RobotAPI/components/units/CMakeLists.txt
source/RobotAPI/components/units/ObstacleAwarePlatformUnit/CMakeLists.txt 10 additions, 0 deletions

...components/units/ObstacleAwarePlatformUnit/CMakeLists.txt
source/RobotAPI/components/units/ObstacleAwarePlatformUnit/ObstacleAwarePlatformUnit.cpp 728 additions, 0 deletions

...s/ObstacleAwarePlatformUnit/ObstacleAwarePlatformUnit.cpp
source/RobotAPI/components/units/ObstacleAwarePlatformUnit/ObstacleAwarePlatformUnit.h 259 additions, 0 deletions

...its/ObstacleAwarePlatformUnit/ObstacleAwarePlatformUnit.h
source/RobotAPI/components/units/ObstacleAwarePlatformUnit/main.cpp 40 additions, 0 deletions

...otAPI/components/units/ObstacleAwarePlatformUnit/main.cpp
source/RobotAPI/interface/ArViz/Elements.ice 0 additions, 1 deletion

source/RobotAPI/interface/ArViz/Elements.ice
source/RobotAPI/interface/components/ObstacleAvoidance/DynamicObstacleManagerInterface.ice 17 additions, 0 deletions

...nts/ObstacleAvoidance/DynamicObstacleManagerInterface.ice
source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 2 additions, 0 deletions

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.cpp 65 additions, 34 deletions

...s/DMPController/NJointTaskSpaceImpedanceDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.h 25 additions, 23 deletions

...ers/DMPController/NJointTaskSpaceImpedanceDMPController.h
source/RobotAPI/libraries/armem_robot_state/common/localization/TransformHelper.cpp 6 additions, 3 deletions

...armem_robot_state/common/localization/TransformHelper.cpp
source/RobotAPI/libraries/core/CartesianVelocityController.cpp 10 additions, 0 deletions

...e/RobotAPI/libraries/core/CartesianVelocityController.cpp

with 1300 additions and 100 deletions

Please register or to comment