Commit 134bd333 authored 1 year ago by Timo Weberruß

Merge branch 'master' into feature/primitive-collision-model-armar3

parents 13fd9145 14834c63

No related branches found

No related tags found

1 merge request!359Add primitive collision model for ArmarIII

Hide whitespace changes

Inline Side-by-side

Showing

scenarios/ArticulatedObjectWriterExample/ArticulatedObjectWriterExample.scx 1 addition, 0 deletions

...tedObjectWriterExample/ArticulatedObjectWriterExample.scx
scenarios/ArticulatedObjectWriterExample/config/ArticulatedObjectLocalizerExample.cfg 2 additions, 10 deletions

...riterExample/config/ArticulatedObjectLocalizerExample.cfg
scenarios/ArticulatedObjectWriterExample/config/DebugObserver.cfg 221 additions, 0 deletions

...s/ArticulatedObjectWriterExample/config/DebugObserver.cfg
scenarios/ArticulatedObjectWriterExample/config/ObjectMemory.cfg 25 additions, 6 deletions

...os/ArticulatedObjectWriterExample/config/ObjectMemory.cfg
scenarios/ArticulatedObjectWriterExample/config/RobotStateMemory.cfg 27 additions, 2 deletions

...rticulatedObjectWriterExample/config/RobotStateMemory.cfg
source/RobotAPI/components/AronComponentConfigExample/aron/ComponentConfig.xml 11 additions, 11 deletions

...nents/AronComponentConfigExample/aron/ComponentConfig.xml
source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.cpp 14 additions, 13 deletions

...ectLocalizerExample/ArticulatedObjectLocalizerExample.cpp
source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.h 2 additions, 0 deletions

...bjectLocalizerExample/ArticulatedObjectLocalizerExample.h
source/RobotAPI/components/armem/server/ExampleMemory/aron/ExampleData.xml 9 additions, 9 deletions

...omponents/armem/server/ExampleMemory/aron/ExampleData.xml
source/RobotAPI/components/skills/SkillProviderExample/aron/HelloWorldAcceptedType.xml 2 additions, 2 deletions

...ills/SkillProviderExample/aron/HelloWorldAcceptedType.xml
source/RobotAPI/drivers/GamepadUnit/README.md 17 additions, 0 deletions

source/RobotAPI/drivers/GamepadUnit/README.md
source/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml 3 additions, 4 deletions

source/RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.xml
source/RobotAPI/libraries/GraspingUtility/aron/GraspCandidate.xml 8 additions, 8 deletions

...obotAPI/libraries/GraspingUtility/aron/GraspCandidate.xml
source/RobotAPI/libraries/armem/aron/MemoryID.xml 1 addition, 1 deletion

source/RobotAPI/libraries/armem/aron/MemoryID.xml
source/RobotAPI/libraries/armem_grasping/aron/KnownGraspCandidate.xml 1 addition, 2 deletions

...API/libraries/armem_grasping/aron/KnownGraspCandidate.xml
source/RobotAPI/libraries/armem_motions/aron/MDBReference.xml 6 additions, 6 deletions

...ce/RobotAPI/libraries/armem_motions/aron/MDBReference.xml
source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectReader.cpp 42 additions, 16 deletions

...cts/client/articulated_object/ArticulatedObjectReader.cpp
source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectReader.h 8 additions, 3 deletions

...jects/client/articulated_object/ArticulatedObjectReader.h
source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp 44 additions, 60 deletions

...raries/armem_objects/client/articulated_object/Reader.cpp
source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.h 21 additions, 20 deletions

...ibraries/armem_objects/client/articulated_object/Reader.h

with 465 additions and 173 deletions

Please register or to comment