Commit 3cbd5fda authored 6 years ago by Raphael Grimm

Merge remote-tracking branch 'origin/master' into RobotUnit_v3

Conflicts:
	source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp
	source/RobotAPI/components/units/RobotUnit/RobotUnit.h

parents 37163604 94531405

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp 2 additions, 0 deletions

.../RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
source/RobotAPI/components/units/HeadIKUnit.cpp 12 additions, 12 deletions

source/RobotAPI/components/units/HeadIKUnit.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTrajectoryController.cpp 3 additions, 2 deletions

...obotUnit/NJointControllers/NJointTrajectoryController.cpp
source/RobotAPI/components/units/RobotUnit/Units/TCPControllerSubUnit.cpp 1 addition, 2 deletions

...components/units/RobotUnit/Units/TCPControllerSubUnit.cpp
source/RobotAPI/components/units/RobotUnit/Units/TCPControllerSubUnit.h 1 addition, 1 deletion

...I/components/units/RobotUnit/Units/TCPControllerSubUnit.h
source/RobotAPI/components/units/RobotUnit/Units/TrajectoryControllerSubUnit.cpp 9 additions, 2 deletions

...nts/units/RobotUnit/Units/TrajectoryControllerSubUnit.cpp
source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.cpp 13 additions, 6 deletions

...PI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.cpp
source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.ui 88 additions, 78 deletions

...API/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.ui
source/RobotAPI/interface/visualization/DebugDrawerInterface.ice 8 additions, 0 deletions

...RobotAPI/interface/visualization/DebugDrawerInterface.ice
source/RobotAPI/libraries/CMakeLists.txt 2 additions, 0 deletions

source/RobotAPI/libraries/CMakeLists.txt
source/RobotAPI/libraries/RobotStatechartHelpers/CMakeLists.txt 41 additions, 0 deletions

.../RobotAPI/libraries/RobotStatechartHelpers/CMakeLists.txt
source/RobotAPI/libraries/RobotStatechartHelpers/ForceTorqueHelper.cpp 52 additions, 0 deletions

...PI/libraries/RobotStatechartHelpers/ForceTorqueHelper.cpp
source/RobotAPI/libraries/RobotStatechartHelpers/ForceTorqueHelper.h 53 additions, 0 deletions

...tAPI/libraries/RobotStatechartHelpers/ForceTorqueHelper.h
source/RobotAPI/libraries/RobotStatechartHelpers/PositionControllerHelper.cpp 113 additions, 0 deletions

...aries/RobotStatechartHelpers/PositionControllerHelper.cpp
source/RobotAPI/libraries/RobotStatechartHelpers/PositionControllerHelper.h 78 additions, 0 deletions

...braries/RobotStatechartHelpers/PositionControllerHelper.h
source/RobotAPI/libraries/RobotStatechartHelpers/RobotStatechartHelpers.cpp 28 additions, 0 deletions

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

...libraries/RobotStatechartHelpers/RobotStatechartHelpers.h
source/RobotAPI/libraries/RobotStatechartHelpers/VelocityControllerHelper.cpp 77 additions, 0 deletions

...aries/RobotStatechartHelpers/VelocityControllerHelper.cpp
source/RobotAPI/libraries/RobotStatechartHelpers/VelocityControllerHelper.h 56 additions, 0 deletions

...braries/RobotStatechartHelpers/VelocityControllerHelper.h
source/RobotAPI/libraries/core/CartesianPositionController.cpp 5 additions, 5 deletions

...e/RobotAPI/libraries/core/CartesianPositionController.cpp

with 687 additions and 108 deletions

Please register or to comment