Merge remote-tracking branch 'origin/master' into feature/poses-and-velocities-with-timestamp
No related branches found
No related tags found
Showing
- source/RobotAPI/components/ArViz/Coin/VisualizationArrowCircle.h 155 additions, 31 deletions...RobotAPI/components/ArViz/Coin/VisualizationArrowCircle.h
- source/RobotAPI/components/ArViz/Coin/VisualizationMesh.h 6 additions, 10 deletionssource/RobotAPI/components/ArViz/Coin/VisualizationMesh.h
- source/RobotAPI/components/ArViz/Coin/Visualizer.cpp 3 additions, 3 deletionssource/RobotAPI/components/ArViz/Coin/Visualizer.cpp
- source/RobotAPI/components/ArViz/Coin/Visualizer.h 1 addition, 1 deletionsource/RobotAPI/components/ArViz/Coin/Visualizer.h
- source/RobotAPI/components/RobotState/RobotStateComponent.cpp 435 additions, 657 deletions...ce/RobotAPI/components/RobotState/RobotStateComponent.cpp
- source/RobotAPI/components/RobotState/RobotStateComponent.h 58 additions, 28 deletionssource/RobotAPI/components/RobotState/RobotStateComponent.h
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp 6 additions, 1 deletion...s/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
- source/RobotAPI/gui-plugins/CartesianImpedanceController/CartesianImpedanceControllerWidget.ui 91 additions, 25 deletions...ImpedanceController/CartesianImpedanceControllerWidget.ui
- source/RobotAPI/gui-plugins/CartesianImpedanceController/CartesianImpedanceControllerWidgetController.cpp 11 additions, 2 deletions...ntroller/CartesianImpedanceControllerWidgetController.cpp
- source/RobotAPI/interface/core/RobotState.ice 5 additions, 5 deletionssource/RobotAPI/interface/core/RobotState.ice
- source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 1 addition, 0 deletions...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
- source/RobotAPI/libraries/RobotAPINJointControllerWidgets/CartesianImpedanceControllerConfigWidget.cpp 12 additions, 12 deletions...ollerWidgets/CartesianImpedanceControllerConfigWidget.cpp
- source/RobotAPI/libraries/RobotAPINJointControllerWidgets/CartesianImpedanceControllerConfigWidget.ui 86 additions, 13 deletions...rollerWidgets/CartesianImpedanceControllerConfigWidget.ui
- source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointPeriodicTSDMPCompliantController.cpp 23 additions, 3 deletions.../DMPController/NJointPeriodicTSDMPCompliantController.cpp
- source/RobotAPI/libraries/armem/core/MemoryID.cpp 121 additions, 24 deletionssource/RobotAPI/libraries/armem/core/MemoryID.cpp
- source/RobotAPI/libraries/armem/core/MemoryID.h 135 additions, 23 deletionssource/RobotAPI/libraries/armem/core/MemoryID.h
- source/RobotAPI/libraries/armem/server/query_proc/EntityQueryProcessor.cpp 9 additions, 2 deletions...ibraries/armem/server/query_proc/EntityQueryProcessor.cpp
- source/RobotAPI/libraries/armem/test/ArMemMemoryIDTest.cpp 91 additions, 6 deletionssource/RobotAPI/libraries/armem/test/ArMemMemoryIDTest.cpp
- source/RobotAPI/libraries/armem/test/ArMemQueryTest.cpp 50 additions, 27 deletionssource/RobotAPI/libraries/armem/test/ArMemQueryTest.cpp
Loading
Please register or sign in to comment