Merge branch 'main' of git.h2t.iar.kit.edu:sw/armarx/skills/manipulation into...
Merge branch 'main' of git.h2t.iar.kit.edu:sw/armarx/skills/manipulation into feature/tof-grasping-live # Conflicts: # source/armarx/manipulation/components/CMakeLists.txt # source/armarx/manipulation/components/tof_based_grasping/Component.cpp # source/armarx/manipulation/components/tof_based_grasping/Component.h # source/armarx/manipulation/skills/CMakeLists.txt
No related branches found
No related tags found
Showing
- CMakeLists.txt 2 additions, 8 deletionsCMakeLists.txt
- data/armarx_manipulation/actions.yaml 99 additions, 0 deletionsdata/armarx_manipulation/actions.yaml
- data/armarx_manipulation/mdb/Pour5_bc_sb_01.xml 0 additions, 108234 deletionsdata/armarx_manipulation/mdb/Pour5_bc_sb_01.xml
- source/armarx/manipulation/CMakeLists.txt 4 additions, 4 deletionssource/armarx/manipulation/CMakeLists.txt
- source/armarx/manipulation/action_execution/ActionExecutorInterface.ice 3 additions, 2 deletions...manipulation/action_execution/ActionExecutorInterface.ice
- source/armarx/manipulation/action_planning/ExecutableActionFactory.cpp 1 addition, 0 deletions.../manipulation/action_planning/ExecutableActionFactory.cpp
- source/armarx/manipulation/action_planning/ExecutableActionFactory.h 3 additions, 1 deletion...rx/manipulation/action_planning/ExecutableActionFactory.h
- source/armarx/manipulation/action_planning/Pipeline.h 2 additions, 0 deletionssource/armarx/manipulation/action_planning/Pipeline.h
- source/armarx/manipulation/action_planning/planning_steps/CMakeLists.txt 73 additions, 8 deletions...anipulation/action_planning/planning_steps/CMakeLists.txt
- source/armarx/manipulation/action_planning/planning_steps/augmentation/BimanualPlatformPoseAugmenter.h 2 additions, 1 deletion...anning_steps/augmentation/BimanualPlatformPoseAugmenter.h
- source/armarx/manipulation/action_planning/planning_steps/augmentation/HandednessAugmenter.cpp 1 addition, 1 deletion...nning/planning_steps/augmentation/HandednessAugmenter.cpp
- source/armarx/manipulation/action_planning/planning_steps/augmentation/HandednessAugmenter.h 1 addition, 0 deletions...lanning/planning_steps/augmentation/HandednessAugmenter.h
- source/armarx/manipulation/action_planning/planning_steps/augmentation/PlatformPoseAugmenter.h 1 addition, 0 deletions...nning/planning_steps/augmentation/PlatformPoseAugmenter.h
- source/armarx/manipulation/action_planning/planning_steps/filtering/AffordanceTypeFilter.cpp 5 additions, 3 deletions...lanning/planning_steps/filtering/AffordanceTypeFilter.cpp
- source/armarx/manipulation/action_planning/planning_steps/filtering/AffordanceTypeFilter.h 1 addition, 0 deletions..._planning/planning_steps/filtering/AffordanceTypeFilter.h
- source/armarx/manipulation/action_planning/planning_steps/filtering/ApproachDirectionFilter.cpp 1 addition, 1 deletion...ning/planning_steps/filtering/ApproachDirectionFilter.cpp
- source/armarx/manipulation/action_planning/planning_steps/filtering/ApproachDirectionFilter.h 2 additions, 1 deletion...anning/planning_steps/filtering/ApproachDirectionFilter.h
- source/armarx/manipulation/action_planning/planning_steps/filtering/ApproachTypeFilter.cpp 1 addition, 1 deletion..._planning/planning_steps/filtering/ApproachTypeFilter.cpp
- source/armarx/manipulation/action_planning/planning_steps/filtering/ApproachTypeFilter.h 3 additions, 2 deletions...on_planning/planning_steps/filtering/ApproachTypeFilter.h
- source/armarx/manipulation/action_planning/planning_steps/filtering/CollisionAtExecutionPosePointCloudFilter.cpp 12 additions, 3 deletions...ps/filtering/CollisionAtExecutionPosePointCloudFilter.cpp
Loading
Please register or sign in to comment