-
- Downloads
Merge branch 'master' into ObjectPoseObserver
# Conflicts: # source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp
No related branches found
No related tags found
Showing
- data/RobotAPI/VariantInfo-RobotAPI.xml 9 additions, 7 deletionsdata/RobotAPI/VariantInfo-RobotAPI.xml
- source/RobotAPI/components/ArViz/Coin/VisualizationObject.cpp 16 additions, 1 deletion...ce/RobotAPI/components/ArViz/Coin/VisualizationObject.cpp
- source/RobotAPI/components/DSObstacleAvoidance/DSObstacleAvoidance.cpp 11 additions, 6 deletions...PI/components/DSObstacleAvoidance/DSObstacleAvoidance.cpp
- source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.cpp 9 additions, 4 deletions...ponents/DynamicObstacleManager/DynamicObstacleManager.cpp
- source/RobotAPI/components/GamepadControlUnit/GamepadControlUnit.cpp 10 additions, 1 deletion...tAPI/components/GamepadControlUnit/GamepadControlUnit.cpp
- source/RobotAPI/components/GamepadControlUnit/GamepadControlUnit.h 2 additions, 0 deletions...botAPI/components/GamepadControlUnit/GamepadControlUnit.h
- source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp 10 additions, 0 deletions...tAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp
- source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.h 7 additions, 0 deletions...botAPI/components/ObjectPoseObserver/ObjectPoseObserver.h
- source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleManagement.h 5 additions, 0 deletions...ts/RobotUnit/RobotUnitModules/RobotUnitModuleManagement.h
- source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.cpp 11 additions, 0 deletionssource/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.cpp
- source/RobotAPI/gui-plugins/CartesianNaturalPositionController/CartesianNaturalPositionControllerWidgetController.h 1 addition, 1 deletion...ller/CartesianNaturalPositionControllerWidgetController.h
- source/RobotAPI/gui-plugins/CartesianWaypointControlGui/CartesianWaypointControlGuiWidgetController.h 1 addition, 6 deletions...tControlGui/CartesianWaypointControlGuiWidgetController.h
- source/RobotAPI/interface/CMakeLists.txt 3 additions, 0 deletionssource/RobotAPI/interface/CMakeLists.txt
- source/RobotAPI/interface/aron.ice 6 additions, 30 deletionssource/RobotAPI/interface/aron.ice
- source/RobotAPI/interface/components/CartesianPositionControlInterface.ice 42 additions, 0 deletions...nterface/components/CartesianPositionControlInterface.ice
- source/RobotAPI/interface/components/NaturalIKInterface.ice 41 additions, 0 deletionssource/RobotAPI/interface/components/NaturalIKInterface.ice
- source/RobotAPI/interface/components/ObstacleAvoidance/DSObstacleAvoidanceInterface.ice 1 addition, 2 deletions...onents/ObstacleAvoidance/DSObstacleAvoidanceInterface.ice
- source/RobotAPI/interface/units/GraspCandidateProviderInterface.ice 1 addition, 0 deletions...otAPI/interface/units/GraspCandidateProviderInterface.ice
- source/RobotAPI/interface/units/RobotUnit/RobotUnitInterface.ice 1 addition, 0 deletions...RobotAPI/interface/units/RobotUnit/RobotUnitInterface.ice
- source/RobotAPI/libraries/ArmarXEtherCAT/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/libraries/ArmarXEtherCAT/CMakeLists.txt
Loading
Please register or sign in to comment