Merge branch 'aron/dev' into 'master'
aron uses new time. completely removed time type in aron and added easy way to... See merge request ArmarX/RobotAPI!270
No related branches found
No related tags found
Showing
- scenarios/SkillProviderTest/SkillProviderTest.scx 6 additions, 0 deletionsscenarios/SkillProviderTest/SkillProviderTest.scx
- scenarios/SkillProviderTest/config/SkillProviderExample.cfg 196 additions, 0 deletionsscenarios/SkillProviderTest/config/SkillProviderExample.cfg
- scenarios/SkillProviderTest/config/SkillsMemory.cfg 358 additions, 0 deletionsscenarios/SkillProviderTest/config/SkillsMemory.cfg
- scenarios/SkillProviderTest/config/global.cfg 4 additions, 0 deletionsscenarios/SkillProviderTest/config/global.cfg
- source/RobotAPI/applications/AronCodeGenerator/CMakeLists.txt 1 addition, 1 deletion...ce/RobotAPI/applications/AronCodeGenerator/CMakeLists.txt
- source/RobotAPI/applications/AronCodeGenerator/main.cpp 2 additions, 2 deletionssource/RobotAPI/applications/AronCodeGenerator/main.cpp
- source/RobotAPI/components/armem/addon/LegacyRobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.cpp 1 addition, 1 deletion...RobotStateMemoryAdapter/LegacyRobotStateMemoryAdapter.cpp
- source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.cpp 2 additions, 2 deletions...API/components/armem/server/SkillsMemory/SkillsMemory.cpp
- source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.h 1 addition, 1 deletion...otAPI/components/armem/server/SkillsMemory/SkillsMemory.h
- source/RobotAPI/components/skills/SkillProviderExample/SkillProviderExample.cpp 27 additions, 16 deletions...ents/skills/SkillProviderExample/SkillProviderExample.cpp
- source/RobotAPI/components/skills/SkillProviderExample/SkillProviderExample.h 4 additions, 4 deletions...onents/skills/SkillProviderExample/SkillProviderExample.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt 11 additions, 0 deletions...ce/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui 30 additions, 23 deletions...i-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp 31 additions, 37 deletions...killManagerPlugin/SkillManagerMonitorWidgetController.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.h 3 additions, 9 deletions.../SkillManagerPlugin/SkillManagerMonitorWidgetController.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetController.cpp 28 additions, 7 deletions...ManagerPlugin/aronTreeWidget/AronTreeWidgetController.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetController.h 1 addition, 1 deletion...llManagerPlugin/aronTreeWidget/AronTreeWidgetController.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/modal/bool/AronTreeWidgetBoolInputModal.ui 52 additions, 0 deletions...aronTreeWidget/modal/bool/AronTreeWidgetBoolInputModal.ui
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/modal/bool/AronTreeWidgetBoolInputModalController.cpp 27 additions, 0 deletions...get/modal/bool/AronTreeWidgetBoolInputModalController.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/modal/bool/AronTreeWidgetBoolInputModalController.h 27 additions, 0 deletions...idget/modal/bool/AronTreeWidgetBoolInputModalController.h
Loading
Please register or sign in to comment