Commit d3723160 authored 5 years ago by Fabian Paus

Merge remote-tracking branch 'origin/SecondHandsDemo2020'

parents 8f5fe525 408c5df2

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/NaturalIKTest/NaturalIKTest.cpp 174 additions, 62 deletions

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

source/RobotAPI/components/NaturalIKTest/NaturalIKTest.h
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianNaturalPositionController.cpp 14 additions, 5 deletions

...tControllers/NJointCartesianNaturalPositionController.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianNaturalPositionController.h 3 additions, 2 deletions

...intControllers/NJointCartesianNaturalPositionController.h
source/RobotAPI/gui-plugins/CMakeLists.txt 1 addition, 0 deletions

source/RobotAPI/gui-plugins/CMakeLists.txt
source/RobotAPI/gui-plugins/CartesianNaturalPositionController/CMakeLists.txt 31 additions, 0 deletions

...plugins/CartesianNaturalPositionController/CMakeLists.txt
source/RobotAPI/gui-plugins/CartesianNaturalPositionController/CartesianNaturalPositionControllerGuiPlugin.cpp 33 additions, 0 deletions

...ontroller/CartesianNaturalPositionControllerGuiPlugin.cpp
source/RobotAPI/gui-plugins/CartesianNaturalPositionController/CartesianNaturalPositionControllerGuiPlugin.h 50 additions, 0 deletions

...nController/CartesianNaturalPositionControllerGuiPlugin.h
source/RobotAPI/gui-plugins/CartesianNaturalPositionController/CartesianNaturalPositionControllerWidget.ui 144 additions, 0 deletions

...ionController/CartesianNaturalPositionControllerWidget.ui
source/RobotAPI/gui-plugins/CartesianNaturalPositionController/CartesianNaturalPositionControllerWidgetController.cpp 234 additions, 0 deletions

...er/CartesianNaturalPositionControllerWidgetController.cpp
source/RobotAPI/gui-plugins/CartesianNaturalPositionController/CartesianNaturalPositionControllerWidgetController.h 135 additions, 0 deletions

...ller/CartesianNaturalPositionControllerWidgetController.h
source/RobotAPI/interface/CMakeLists.txt 1 addition, 0 deletions

source/RobotAPI/interface/CMakeLists.txt
source/RobotAPI/interface/armem.ice 23 additions, 0 deletions

source/RobotAPI/interface/armem.ice
source/RobotAPI/interface/aron.ice 46 additions, 25 deletions

source/RobotAPI/interface/aron.ice
source/RobotAPI/interface/core/CartesianNaturalPositionControllerConfig.ice 2 additions, 1 deletion

...terface/core/CartesianNaturalPositionControllerConfig.ice
source/RobotAPI/interface/units/RobotUnit/NJointCartesianNaturalPositionController.ice 1 addition, 1 deletion

...ts/RobotUnit/NJointCartesianNaturalPositionController.ice
source/RobotAPI/libraries/CMakeLists.txt 2 additions, 1 deletion

source/RobotAPI/libraries/CMakeLists.txt
source/RobotAPI/libraries/armem/CMakeLists.txt 32 additions, 0 deletions

source/RobotAPI/libraries/armem/CMakeLists.txt
source/RobotAPI/libraries/armem/armem.cpp 28 additions, 0 deletions

source/RobotAPI/libraries/armem/armem.cpp
source/RobotAPI/libraries/armem/armem.h 45 additions, 0 deletions

source/RobotAPI/libraries/armem/armem.h

with 1001 additions and 97 deletions

Please register or to comment