Merge branch 'armem/ltm/dev' of git.h2t.iar.kit.edu:sw/armarx/robot-api into armem/ltm/dev
Showing
- scenarios/ArMemExample/config/ExampleMemory.cfg 12 additions, 4 deletionsscenarios/ArMemExample/config/ExampleMemory.cfg
- scenarios/RobotSkillsMemory/RobotSkillsMemory.scx 2 additions, 0 deletionsscenarios/RobotSkillsMemory/RobotSkillsMemory.scx
- scenarios/RobotSkillsMemory/config/MemoryNameSystem.cfg 1 addition, 1 deletionscenarios/RobotSkillsMemory/config/MemoryNameSystem.cfg
- scenarios/RobotSkillsMemory/config/RemoteGuiProviderApp.cfg 1 addition, 1 deletionscenarios/RobotSkillsMemory/config/RemoteGuiProviderApp.cfg
- scenarios/RobotSkillsMemory/config/SkillsMemory.cfg 49 additions, 32 deletionsscenarios/RobotSkillsMemory/config/SkillsMemory.cfg
- scenarios/SkillProviderTest/config/SkillsMemory.cfg 12 additions, 4 deletionsscenarios/SkillProviderTest/config/SkillsMemory.cfg
- source/RobotAPI/components/skills/SkillProviderExample/SkillProviderExample.cpp 18 additions, 0 deletions...ents/skills/SkillProviderExample/SkillProviderExample.cpp
- source/RobotAPI/components/skills/SkillProviderExample/SkillProviderExample.h 4 additions, 7 deletions...onents/skills/SkillProviderExample/SkillProviderExample.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp 123 additions, 96 deletions...killManagerPlugin/SkillManagerMonitorWidgetController.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.h 8 additions, 10 deletions.../SkillManagerPlugin/SkillManagerMonitorWidgetController.h
- source/RobotAPI/libraries/armem/server/ltm/Entity.cpp 34 additions, 33 deletionssource/RobotAPI/libraries/armem/server/ltm/Entity.cpp
- source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp 16 additions, 7 deletions.../libraries/skills/manager/SkillManagerComponentPlugin.cpp
Loading
Please register or sign in to comment