Commit 1e12c7ac authored 3 years ago by Fabian Reister

Merge remote-tracking branch 'origin/master' into armem/dev

parents 7fe56c22 2f0c8506

1 merge request!184moved aron test xmls to aron folder, used autoinclude for some. Reenabled...

Hide whitespace changes

Inline Side-by-side

Showing

scenarios/ArMemObjectMemory/ArMemObjectMemory.scx 1 addition, 1 deletion

scenarios/ArMemObjectMemory/ArMemObjectMemory.scx
scenarios/ArMemObjectMemory/config/ArticulatedObjectLocalizerExample.cfg 4 additions, 4 deletions

...ObjectMemory/config/ArticulatedObjectLocalizerExample.cfg
scenarios/ArMemObjectMemory/config/ArticulatedObjectLocalizerExample.instance1.cfg 254 additions, 0 deletions

...ry/config/ArticulatedObjectLocalizerExample.instance1.cfg
scenarios/ArMemObjectMemory/config/ObjectMemory.cfg 9 additions, 0 deletions

scenarios/ArMemObjectMemory/config/ObjectMemory.cfg
source/RobotAPI/components/ArViz/Client/drawer/ArVizDrawerBase.cpp 11 additions, 5 deletions

...botAPI/components/ArViz/Client/drawer/ArVizDrawerBase.cpp
source/RobotAPI/components/ArViz/Client/drawer/ArVizDrawerBase.h 11 additions, 9 deletions

...RobotAPI/components/ArViz/Client/drawer/ArVizDrawerBase.h
source/RobotAPI/components/ArViz/Coin/Visualizer.cpp 23 additions, 11 deletions

source/RobotAPI/components/ArViz/Coin/Visualizer.cpp
source/RobotAPI/components/ArViz/Coin/Visualizer.h 5 additions, 0 deletions

source/RobotAPI/components/ArViz/Coin/Visualizer.h
source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.cpp 36 additions, 46 deletions

...ectLocalizerExample/ArticulatedObjectLocalizerExample.cpp
source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.h 10 additions, 15 deletions

...bjectLocalizerExample/ArticulatedObjectLocalizerExample.h
source/RobotAPI/components/SkillObserver/SkillObserver.h 1 addition, 0 deletions

source/RobotAPI/components/SkillObserver/SkillObserver.h
source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp 0 additions, 26 deletions

...API/components/armem/server/ObjectMemory/ObjectMemory.cpp
source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h 0 additions, 2 deletions

...otAPI/components/armem/server/ObjectMemory/ObjectMemory.h
source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp 7 additions, 1 deletion

...onents/armem/server/RobotStateMemory/RobotStateMemory.cpp
source/RobotAPI/components/units/ObstacleAwarePlatformUnit/ObstacleAwarePlatformUnit.cpp 30 additions, 8 deletions

...s/ObstacleAwarePlatformUnit/ObstacleAwarePlatformUnit.cpp
source/RobotAPI/components/units/ObstacleAwarePlatformUnit/ObstacleAwarePlatformUnit.h 1 addition, 1 deletion

...its/ObstacleAwarePlatformUnit/ObstacleAwarePlatformUnit.h
source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.cpp 12 additions, 1 deletion

source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.cpp
source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.h 2 additions, 0 deletions

source/RobotAPI/gui-plugins/ArViz/ArVizWidgetController.h
source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp 3 additions, 3 deletions

source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp
source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h 5 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h

with 425 additions and 133 deletions

Please register or to comment