Merge branch 'master' into 72-add-gui-actions-to-grasp-memory-to-visualize-grasps
# Conflicts: # source/RobotAPI/components/armem/server/GraspMemory/GraspMemory.cpp # source/RobotAPI/libraries/GraspingUtility/GraspCandidateVisu.cpp
No related branches found
No related tags found
Showing
- scenarios/ArmemGraspMemory/ArmemGraspMemory.scx 1 addition, 0 deletionsscenarios/ArmemGraspMemory/ArmemGraspMemory.scx
- scenarios/ArmemGraspMemory/config/DebugObserver.cfg 1 addition, 1 deletionscenarios/ArmemGraspMemory/config/DebugObserver.cfg
- scenarios/ArmemGraspMemory/config/GraspMemory.cfg 44 additions, 4 deletionsscenarios/ArmemGraspMemory/config/GraspMemory.cfg
- scenarios/ArmemGraspMemory/config/GraspProviderExample.cfg 1 addition, 1 deletionscenarios/ArmemGraspMemory/config/GraspProviderExample.cfg
- scenarios/ArmemGraspMemory/config/MemoryNameSystem.cfg 1 addition, 1 deletionscenarios/ArmemGraspMemory/config/MemoryNameSystem.cfg
- scenarios/ArmemGraspMemory/config/RemoteGuiProviderApp.cfg 1 addition, 1 deletionscenarios/ArmemGraspMemory/config/RemoteGuiProviderApp.cfg
- source/RobotAPI/components/armem/client/GraspProviderExample/GraspProviderExample.cpp 54 additions, 36 deletions...rmem/client/GraspProviderExample/GraspProviderExample.cpp
- source/RobotAPI/components/armem/client/GraspProviderExample/GraspProviderExample.h 7 additions, 0 deletions.../armem/client/GraspProviderExample/GraspProviderExample.h
- source/RobotAPI/components/armem/server/GraspMemory/GraspMemory.cpp 59 additions, 12 deletions...otAPI/components/armem/server/GraspMemory/GraspMemory.cpp
- source/RobotAPI/components/armem/server/GraspMemory/GraspMemory.h 5 additions, 0 deletions...obotAPI/components/armem/server/GraspMemory/GraspMemory.h
- source/RobotAPI/libraries/GraspingUtility/GraspCandidateVisu.cpp 3 additions, 2 deletions...RobotAPI/libraries/GraspingUtility/GraspCandidateVisu.cpp
- source/RobotAPI/libraries/GraspingUtility/aron/GraspCandidate.xml 10 additions, 34 deletions...obotAPI/libraries/GraspingUtility/aron/GraspCandidate.xml
- source/RobotAPI/libraries/GraspingUtility/aron_conversions.cpp 56 additions, 47 deletions...e/RobotAPI/libraries/GraspingUtility/aron_conversions.cpp
- source/RobotAPI/libraries/RobotStatechartHelpers/PositionControllerHelper.cpp 13 additions, 8 deletions...aries/RobotStatechartHelpers/PositionControllerHelper.cpp
- source/RobotAPI/libraries/RobotStatechartHelpers/PositionControllerHelper.h 1 addition, 0 deletions...braries/RobotStatechartHelpers/PositionControllerHelper.h
Loading
Please register or sign in to comment