Merge branch 'master' into fix/default-constructor-for-marker
Showing
- 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/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/libraries/armem_grasping/client/KnownGraspCandidateReader.cpp 2 additions, 2 deletions...aries/armem_grasping/client/KnownGraspCandidateReader.cpp
- source/RobotAPI/libraries/armem_robot/client/interfaces.h 3 additions, 3 deletionssource/RobotAPI/libraries/armem_robot/client/interfaces.h
- source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp 6 additions, 6 deletions...libraries/armem_robot_state/client/common/RobotReader.cpp
- source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h 6 additions, 6 deletions...I/libraries/armem_robot_state/client/common/RobotReader.h
- source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp 1 addition, 1 deletion...es/armem_robot_state/client/common/VirtualRobotReader.cpp
- source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.h 1 addition, 1 deletion...ries/armem_robot_state/client/common/VirtualRobotReader.h
- source/RobotAPI/libraries/aron/core/data/variant/detail/PrimitiveVariant.h 1 addition, 1 deletion...ibraries/aron/core/data/variant/detail/PrimitiveVariant.h
Loading
Please register or sign in to comment