Commit 17eb3696 authored 1 year ago by Fabian Tërnava

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

parents 36fbcd9b c06a1aec

Expand all Hide whitespace changes

Inline Side-by-side

Showing

data/RobotAPI/robots/Armar3/ArmarIII-Head.xml 9 additions, 0 deletions

data/RobotAPI/robots/Armar3/ArmarIII-Head.xml
data/RobotAPI/robots/Armar3/ArmarIII-LeftArm.xml 29 additions, 0 deletions

data/RobotAPI/robots/Armar3/ArmarIII-LeftArm.xml
data/RobotAPI/robots/Armar3/ArmarIII-RightArm.xml 29 additions, 0 deletions

data/RobotAPI/robots/Armar3/ArmarIII-RightArm.xml
data/RobotAPI/robots/Armar3/ArmarIII.xml 20 additions, 0 deletions

data/RobotAPI/robots/Armar3/ArmarIII.xml
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/armem/server/RobotStateMemory/RobotStateMemory.cpp 94 additions, 69 deletions

...onents/armem/server/RobotStateMemory/RobotStateMemory.cpp
source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.h 6 additions, 7 deletions

...mponents/armem/server/RobotStateMemory/RobotStateMemory.h
source/RobotAPI/components/skills/SkillProviderExample/aron/HelloWorldAcceptedType.xml 2 additions, 2 deletions

...ills/SkillProviderExample/aron/HelloWorldAcceptedType.xml
source/RobotAPI/components/units/RobotUnit/BasicControllers.cpp 443 additions, 292 deletions

.../RobotAPI/components/units/RobotUnit/BasicControllers.cpp
source/RobotAPI/components/units/RobotUnit/BasicControllers.h 117 additions, 67 deletions

...ce/RobotAPI/components/units/RobotUnit/BasicControllers.h
source/RobotAPI/components/units/RobotUnit/Constants.h 1 addition, 2 deletions

source/RobotAPI/components/units/RobotUnit/Constants.h
source/RobotAPI/components/units/RobotUnit/ControlModes.h 6 additions, 5 deletions

source/RobotAPI/components/units/RobotUnit/ControlModes.h

with 1068 additions and 495 deletions

Please register or to comment