Merge remote-tracking branch 'origin/master' into armar7-unit
No related branches found
No related tags found
Checking pipeline status
Showing
- .gitlab-ci.yml 103 additions, 0 deletions.gitlab-ci.yml
- .gitlab/ci/armarx-workspace.json 17 additions, 0 deletions.gitlab/ci/armarx-workspace.json
- scenarios/RobotHealthTest/RobotHealthTest.scx 1 addition, 1 deletionscenarios/RobotHealthTest/RobotHealthTest.scx
- scenarios/RobotHealthTest/config/RobotHealthApp.cfg 17 additions, 34 deletionsscenarios/RobotHealthTest/config/RobotHealthApp.cfg
- scenarios/RobotHealthTest/config/RobotHealthDummyApp.HealthDummy1.cfg 1 addition, 1 deletion...botHealthTest/config/RobotHealthDummyApp.HealthDummy1.cfg
- scenarios/RobotHealthTest/config/RobotHealthDummyApp.HealthDummy2.cfg 2 additions, 2 deletions...botHealthTest/config/RobotHealthDummyApp.HealthDummy2.cfg
- source/RobotAPI/components/ArViz/CMakeLists.txt 1 addition, 1 deletionsource/RobotAPI/components/ArViz/CMakeLists.txt
- source/RobotAPI/components/ArViz/Coin/VisualizationRobot.cpp 13 additions, 7 deletionssource/RobotAPI/components/ArViz/Coin/VisualizationRobot.cpp
- source/RobotAPI/components/RobotHealth/RobotHealthDummy.cpp 23 additions, 14 deletionssource/RobotAPI/components/RobotHealth/RobotHealthDummy.cpp
- source/RobotAPI/components/RobotHealth/RobotHealthDummy.h 1 addition, 1 deletionsource/RobotAPI/components/RobotHealth/RobotHealthDummy.h
- source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp 22 additions, 6 deletions.../armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
- source/RobotAPI/components/units/RobotUnit/Devices/RTThreadTimingsSensorDevice.h 20 additions, 15 deletions...nts/units/RobotUnit/Devices/RTThreadTimingsSensorDevice.h
- source/RobotAPI/components/units/RobotUnit/util/RtTiming.h 7 additions, 8 deletionssource/RobotAPI/components/units/RobotUnit/util/RtTiming.h
- source/RobotAPI/gui-plugins/GuiHealthClient/GuiHealthClientWidgetController.cpp 50 additions, 32 deletions...ugins/GuiHealthClient/GuiHealthClientWidgetController.cpp
- source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp 1317 additions, 1185 deletions...ui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectPoseClient.cpp 2 additions, 1 deletionsource/RobotAPI/libraries/ArmarXObjects/ObjectPoseClient.cpp
- source/RobotAPI/libraries/ArmarXObjects/test/ArmarXObjectsTest.cpp 15 additions, 7 deletions...botAPI/libraries/ArmarXObjects/test/ArmarXObjectsTest.cpp
- source/RobotAPI/libraries/GraspingUtility/GraspCandidateReader.cpp 139 additions, 82 deletions...botAPI/libraries/GraspingUtility/GraspCandidateReader.cpp
- source/RobotAPI/libraries/GraspingUtility/GraspCandidateReader.h 27 additions, 22 deletions...RobotAPI/libraries/GraspingUtility/GraspCandidateReader.h
- source/RobotAPI/libraries/GraspingUtility/GraspTrajectory.cpp 218 additions, 84 deletions...ce/RobotAPI/libraries/GraspingUtility/GraspTrajectory.cpp
Loading
Please register or sign in to comment