Merge branch 'master' into armem/robot-state-memory
No related branches found
No related tags found
Showing
- source/RobotAPI/components/ArViz/Coin/Visualizer.cpp 2 additions, 12 deletionssource/RobotAPI/components/ArViz/Coin/Visualizer.cpp
- source/RobotAPI/components/ArViz/Coin/Visualizer.h 0 additions, 1 deletionsource/RobotAPI/components/ArViz/Coin/Visualizer.h
- source/RobotAPI/drivers/SickLaserUnit/CMakeLists.txt 1 addition, 1 deletionsource/RobotAPI/drivers/SickLaserUnit/CMakeLists.txt
- source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.cpp 23 additions, 40 deletionssource/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.cpp
- source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.h 10 additions, 30 deletionssource/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.h
- source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.cpp 9 additions, 13 deletionssource/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.cpp
- source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.h 4 additions, 5 deletionssource/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.h
- source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.cpp 54 additions, 19 deletionssource/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.cpp
- source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.h 3 additions, 0 deletionssource/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.h
- source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 1 addition, 0 deletions...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
- source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointPeriodicTSDMPCompliantController.cpp 6 additions, 0 deletions.../DMPController/NJointPeriodicTSDMPCompliantController.cpp
- source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointPeriodicTSDMPCompliantController.h 1 addition, 0 deletions...rs/DMPController/NJointPeriodicTSDMPCompliantController.h
- source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.cpp 11 additions, 4 deletions...s/DMPController/NJointTaskSpaceImpedanceDMPController.cpp
- source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.h 5 additions, 0 deletions...ers/DMPController/NJointTaskSpaceImpedanceDMPController.h
Loading
Please register or sign in to comment