Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI
# Conflicts: # source/RobotAPI/components/armem/server/GraspMemory/GraspMemory.cpp
Showing
- source/RobotAPI/components/armem/server/GraspMemory/GraspMemory.cpp 16 additions, 9 deletions...otAPI/components/armem/server/GraspMemory/GraspMemory.cpp
- source/RobotAPI/components/units/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/components/units/CMakeLists.txt
- source/RobotAPI/components/units/GraspCandidateObserver.cpp 3 additions, 1 deletionsource/RobotAPI/components/units/GraspCandidateObserver.cpp
- source/RobotAPI/components/units/GraspCandidateObserver.h 4 additions, 1 deletionsource/RobotAPI/components/units/GraspCandidateObserver.h
- source/RobotAPI/components/units/RobotUnit/Devices/DeviceBase.h 18 additions, 11 deletions.../RobotAPI/components/units/RobotUnit/Devices/DeviceBase.h
- source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleControlThread.cpp 338 additions, 220 deletions...botUnit/RobotUnitModules/RobotUnitModuleControlThread.cpp
- source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleLogging.cpp 525 additions, 478 deletions...its/RobotUnit/RobotUnitModules/RobotUnitModuleLogging.cpp
- source/RobotAPI/interface/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/interface/CMakeLists.txt
- source/RobotAPI/interface/units/RobotUnit/GazeController.ice 63 additions, 0 deletionssource/RobotAPI/interface/units/RobotUnit/GazeController.ice
- source/RobotAPI/libraries/GraspingUtility/GraspCandidateReader.cpp 2 additions, 2 deletions...botAPI/libraries/GraspingUtility/GraspCandidateReader.cpp
- source/RobotAPI/libraries/GraspingUtility/aron/GraspCandidate.xml 9 additions, 9 deletions...obotAPI/libraries/GraspingUtility/aron/GraspCandidate.xml
- source/RobotAPI/libraries/GraspingUtility/aron_conversions.cpp 95 additions, 74 deletions...e/RobotAPI/libraries/GraspingUtility/aron_conversions.cpp
- source/RobotAPI/libraries/armem/client/Reader.cpp 1 addition, 0 deletionssource/RobotAPI/libraries/armem/client/Reader.cpp
- source/RobotAPI/libraries/core/FramedPose.cpp 128 additions, 0 deletionssource/RobotAPI/libraries/core/FramedPose.cpp
- source/RobotAPI/libraries/core/FramedPose.h 39 additions, 115 deletionssource/RobotAPI/libraries/core/FramedPose.h
- source/RobotAPI/libraries/core/LinkedPose.cpp 1 addition, 0 deletionssource/RobotAPI/libraries/core/LinkedPose.cpp
- source/RobotAPI/libraries/core/Pose.cpp 5 additions, 0 deletionssource/RobotAPI/libraries/core/Pose.cpp
- source/RobotAPI/libraries/core/Pose.h 0 additions, 3 deletionssource/RobotAPI/libraries/core/Pose.h
- source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp 1 addition, 0 deletionssource/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp
- source/RobotAPI/libraries/core/remoterobot/RemoteRobotNode.cpp 1 addition, 1 deletion...e/RobotAPI/libraries/core/remoterobot/RemoteRobotNode.cpp
Loading
Please register or sign in to comment