-
- Downloads
Merge branch 'master' into TCPSubUnit
Conflicts: source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTCPController.cpp source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTCPController.h
Showing
- CMakeLists.txt 1 addition, 1 deletionCMakeLists.txt
- source/RobotAPI/components/RobotState/RobotStateComponent.cpp 2 additions, 1 deletion...ce/RobotAPI/components/RobotState/RobotStateComponent.cpp
- source/RobotAPI/components/units/HandUnit.cpp 6 additions, 1 deletionsource/RobotAPI/components/units/HandUnit.cpp
- source/RobotAPI/components/units/HandUnit.h 2 additions, 0 deletionssource/RobotAPI/components/units/HandUnit.h
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTCPController.cpp 10 additions, 9 deletions...units/RobotUnit/NJointControllers/NJointTCPController.cpp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTCPController.h 1 addition, 0 deletions...s/units/RobotUnit/NJointControllers/NJointTCPController.h
- source/RobotAPI/components/units/RobotUnit/SensorValues/SensorValueHolonomicPlatform.h 15 additions, 15 deletions...its/RobotUnit/SensorValues/SensorValueHolonomicPlatform.h
- source/RobotAPI/components/units/RobotUnit/util.h 9 additions, 5 deletionssource/RobotAPI/components/units/RobotUnit/util.h
- source/RobotAPI/gui-plugins/DebugDrawerViewer/CMakeLists.txt 1 addition, 1 deletionsource/RobotAPI/gui-plugins/DebugDrawerViewer/CMakeLists.txt
- source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitGuiPlugin.cpp 11 additions, 1 deletion...RobotAPI/gui-plugins/HandUnitPlugin/HandUnitGuiPlugin.cpp
- source/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitGuiPlugin.h 2 additions, 0 deletions...e/RobotAPI/gui-plugins/HandUnitPlugin/HandUnitGuiPlugin.h
- source/RobotAPI/gui-plugins/LaserScannerPlugin/CMakeLists.txt 1 addition, 1 deletion...ce/RobotAPI/gui-plugins/LaserScannerPlugin/CMakeLists.txt
- source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.ui 2 additions, 2 deletions...I/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.ui
- source/RobotAPI/gui-plugins/ViewSelection/CMakeLists.txt 1 addition, 1 deletionsource/RobotAPI/gui-plugins/ViewSelection/CMakeLists.txt
- source/RobotAPI/interface/units/HandUnitInterface.ice 1 addition, 0 deletionssource/RobotAPI/interface/units/HandUnitInterface.ice
- source/RobotAPI/libraries/core/math/MathUtils.h 5 additions, 0 deletionssource/RobotAPI/libraries/core/math/MathUtils.h
- source/RobotAPI/libraries/core/test/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/libraries/core/test/CMakeLists.txt
- source/RobotAPI/libraries/core/test/MathUtilsTest.cpp 62 additions, 0 deletionssource/RobotAPI/libraries/core/test/MathUtilsTest.cpp
Loading
Please register or sign in to comment