Commit 3d0afcf0 authored 1 year ago by Rainer Kartmann

Merge branch 'master' into feature/subskill-convenience-functions

parents 929e7894 5d2d2f30

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/RobotNameService/RobotNameService.cpp 5 additions, 5 deletions

...RobotAPI/components/RobotNameService/RobotNameService.cpp
source/RobotAPI/components/RobotNameService/RobotNameService.h 6 additions, 6 deletions

...e/RobotAPI/components/RobotNameService/RobotNameService.h
source/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt 2 additions, 0 deletions

...ce/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt
source/RobotAPI/gui-plugins/SkillManagerPlugin/PeriodicUpdateWidget.cpp 141 additions, 0 deletions

...I/gui-plugins/SkillManagerPlugin/PeriodicUpdateWidget.cpp
source/RobotAPI/gui-plugins/SkillManagerPlugin/PeriodicUpdateWidget.h 66 additions, 0 deletions

...API/gui-plugins/SkillManagerPlugin/PeriodicUpdateWidget.h
source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui 116 additions, 113 deletions

...i-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui
source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp 306 additions, 100 deletions

...killManagerPlugin/SkillManagerMonitorWidgetController.cpp
source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.h 41 additions, 9 deletions

.../SkillManagerPlugin/SkillManagerMonitorWidgetController.h
source/RobotAPI/interface/robot_name_service/RobotNameServiceInterface.ice 28 additions, 14 deletions

...nterface/robot_name_service/RobotNameServiceInterface.ice
source/RobotAPI/libraries/armem_robot/aron/Robot.xml 0 additions, 1 deletion

source/RobotAPI/libraries/armem_robot/aron/Robot.xml
source/RobotAPI/libraries/robot_name_service/client/Plugin.cpp 6 additions, 4 deletions

...e/RobotAPI/libraries/robot_name_service/client/Plugin.cpp
source/RobotAPI/libraries/robot_name_service/client/Plugin.h 1 addition, 1 deletion

source/RobotAPI/libraries/robot_name_service/client/Plugin.h
source/RobotAPI/libraries/robot_name_service/core/CMakeLists.txt 10 additions, 0 deletions

...RobotAPI/libraries/robot_name_service/core/CMakeLists.txt
source/RobotAPI/libraries/robot_name_service/core/Robot.cpp 21 additions, 25 deletions

source/RobotAPI/libraries/robot_name_service/core/Robot.cpp
source/RobotAPI/libraries/robot_name_service/core/Robot.h 12 additions, 14 deletions

source/RobotAPI/libraries/robot_name_service/core/Robot.h
source/RobotAPI/libraries/robot_name_service/core/aron/Robot.xml 40 additions, 0 deletions

...RobotAPI/libraries/robot_name_service/core/aron/Robot.xml
source/RobotAPI/libraries/robot_name_service/core/aron_conversions.cpp 6 additions, 0 deletions

...PI/libraries/robot_name_service/core/aron_conversions.cpp
source/RobotAPI/libraries/robot_name_service/core/aron_conversions.h 14 additions, 0 deletions

...tAPI/libraries/robot_name_service/core/aron_conversions.h
source/RobotAPI/libraries/robot_name_service/server/CMakeLists.txt 2 additions, 0 deletions

...botAPI/libraries/robot_name_service/server/CMakeLists.txt
source/RobotAPI/libraries/robot_name_service/server/segments/RobotSegment.cpp 6 additions, 0 deletions

...aries/robot_name_service/server/segments/RobotSegment.cpp

with 829 additions and 292 deletions

Please register or to comment