Commit a55e0864 authored 3 years ago by Fabian Paus

Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

parents b4027acf 8f79dbc8

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/armem/server/RobotStateMemory/RobotUnitReader.cpp 5 additions, 4 deletions

...ponents/armem/server/RobotStateMemory/RobotUnitReader.cpp
source/RobotAPI/drivers/SickLaserUnit/CMakeLists.txt 1 addition, 1 deletion

source/RobotAPI/drivers/SickLaserUnit/CMakeLists.txt
source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.cpp 57 additions, 150 deletions

source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.cpp
source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.h 13 additions, 43 deletions

source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.h
source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.cpp 9 additions, 13 deletions

source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.cpp
source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.h 4 additions, 5 deletions

source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.h
source/RobotAPI/interface/units/RobotUnit/NJointTaskSpaceDMPController.ice 1 addition, 1 deletion

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice
source/RobotAPI/libraries/RobotAPIComponentPlugins/CMakeLists.txt 2 additions, 0 deletions

...obotAPI/libraries/RobotAPIComponentPlugins/CMakeLists.txt
source/RobotAPI/libraries/RobotAPIComponentPlugins/HeartbeatComponentPlugin.cpp 98 additions, 0 deletions

...ies/RobotAPIComponentPlugins/HeartbeatComponentPlugin.cpp
source/RobotAPI/libraries/RobotAPIComponentPlugins/HeartbeatComponentPlugin.h 89 additions, 0 deletions

...aries/RobotAPIComponentPlugins/HeartbeatComponentPlugin.h
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.cpp 8 additions, 2 deletions

...s/DMPController/NJointTaskSpaceImpedanceDMPController.cpp
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.h 5 additions, 3 deletions

...ers/DMPController/NJointTaskSpaceImpedanceDMPController.h
source/RobotAPI/libraries/armem/client/Query.h 32 additions, 0 deletions

source/RobotAPI/libraries/armem/client/Query.h
source/RobotAPI/libraries/armem/core/base/MemoryBase.h 19 additions, 0 deletions

source/RobotAPI/libraries/armem/core/base/MemoryBase.h
source/RobotAPI/libraries/armem/core/longtermmemory/CoreSegment.cpp 3 additions, 5 deletions

...otAPI/libraries/armem/core/longtermmemory/CoreSegment.cpp
source/RobotAPI/libraries/armem/core/longtermmemory/Entity.cpp 3 additions, 5 deletions

...e/RobotAPI/libraries/armem/core/longtermmemory/Entity.cpp
source/RobotAPI/libraries/armem/core/longtermmemory/EntitySnapshot.cpp 1 addition, 7 deletions

...PI/libraries/armem/core/longtermmemory/EntitySnapshot.cpp
source/RobotAPI/libraries/armem/core/longtermmemory/Memory.cpp 38 additions, 10 deletions

...e/RobotAPI/libraries/armem/core/longtermmemory/Memory.cpp
source/RobotAPI/libraries/armem/core/longtermmemory/Memory.h 4 additions, 1 deletion

source/RobotAPI/libraries/armem/core/longtermmemory/Memory.h
source/RobotAPI/libraries/armem/core/longtermmemory/ProviderSegment.cpp 3 additions, 6 deletions

...I/libraries/armem/core/longtermmemory/ProviderSegment.cpp

with 395 additions and 256 deletions

Please register or to comment