Merge remote-tracking branch 'origin/master' into Ice3.7
# Conflicts: # source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h
No related branches found
No related tags found
Showing
- CMakeLists.txt 1 addition, 1 deletionCMakeLists.txt
- data/RobotAPI/robots/Head/KA-Head.xml 2 additions, 0 deletionsdata/RobotAPI/robots/Head/KA-Head.xml
- etc/cmake/ArmarXPackageVersion.cmake 2 additions, 2 deletionsetc/cmake/ArmarXPackageVersion.cmake
- source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.cpp 10 additions, 0 deletionssource/RobotAPI/components/DebugDrawer/DebugDrawerHelper.cpp
- source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h 3 additions, 0 deletionssource/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h
- source/RobotAPI/components/units/RobotUnit/Units/TCPControllerSubUnit.cpp 27 additions, 17 deletions...components/units/RobotUnit/Units/TCPControllerSubUnit.cpp
- source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.cpp 21 additions, 20 deletions...onents/units/RobotUnit/util/ControlThreadOutputBuffer.cpp
- source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h 57 additions, 4 deletions...mponents/units/RobotUnit/util/ControlThreadOutputBuffer.h
- source/RobotAPI/libraries/RobotStatechartHelpers/PositionControllerHelper.cpp 8 additions, 1 deletion...aries/RobotStatechartHelpers/PositionControllerHelper.cpp
- source/RobotAPI/libraries/RobotStatechartHelpers/PositionControllerHelper.h 2 additions, 1 deletion...braries/RobotStatechartHelpers/PositionControllerHelper.h
- source/RobotAPI/libraries/RobotStatechartHelpers/VelocityControllerHelper.cpp 10 additions, 1 deletion...aries/RobotStatechartHelpers/VelocityControllerHelper.cpp
- source/RobotAPI/libraries/core/CartesianVelocityController.cpp 64 additions, 7 deletions...e/RobotAPI/libraries/core/CartesianVelocityController.cpp
- source/RobotAPI/libraries/core/CartesianVelocityController.h 7 additions, 2 deletionssource/RobotAPI/libraries/core/CartesianVelocityController.h
- source/RobotAPI/libraries/core/Trajectory.cpp 13 additions, 3 deletionssource/RobotAPI/libraries/core/Trajectory.cpp
- source/RobotAPI/libraries/core/Trajectory.h 2 additions, 1 deletionsource/RobotAPI/libraries/core/Trajectory.h
- source/RobotAPI/libraries/core/TrajectoryController.cpp 13 additions, 1 deletionsource/RobotAPI/libraries/core/TrajectoryController.cpp
- source/RobotAPI/libraries/core/test/CartesianVelocityControllerTest.cpp 79 additions, 0 deletions...I/libraries/core/test/CartesianVelocityControllerTest.cpp
Loading
Please register or sign in to comment