Commit 1d141644 authored 3 years ago by Rainer Kartmann

Merge branch 'master' into refactor/new_arch

# Conflicts:
#	source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h

parents 897985ef ee063d86

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/armem/CMakeLists.txt 22 additions, 14 deletions

source/RobotAPI/libraries/armem/CMakeLists.txt
source/RobotAPI/libraries/armem/server/MemoryRemoteGui.cpp 2 additions, 1 deletion

source/RobotAPI/libraries/armem/server/MemoryRemoteGui.cpp
source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp 2 additions, 2 deletions

...ce/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
source/RobotAPI/libraries/armem/server/RemoteGuiAronDataVisitor.h 12 additions, 12 deletions

...obotAPI/libraries/armem/server/RemoteGuiAronDataVisitor.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/bson/BsonConverter.cpp 0 additions, 0 deletions

...es/armem/server/ltm/base/converter/bson/BsonConverter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/bson/BsonConverter.h 0 additions, 0 deletions

...ries/armem/server/ltm/base/converter/bson/BsonConverter.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/dict/Converter.cpp 1 addition, 0 deletions

...raries/armem/server/ltm/base/converter/dict/Converter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/dict/Converter.h 35 additions, 0 deletions

...ibraries/armem/server/ltm/base/converter/dict/Converter.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/dict/bson/BsonConverter.cpp 35 additions, 0 deletions

...mem/server/ltm/base/converter/dict/bson/BsonConverter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/dict/bson/BsonConverter.h 27 additions, 0 deletions

...armem/server/ltm/base/converter/dict/bson/BsonConverter.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/dict/json/JsonConverter.cpp 20 additions, 0 deletions

...mem/server/ltm/base/converter/dict/json/JsonConverter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/dict/json/JsonConverter.h 24 additions, 0 deletions

...armem/server/ltm/base/converter/dict/json/JsonConverter.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/image/Converter.cpp 1 addition, 0 deletions

...aries/armem/server/ltm/base/converter/image/Converter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/image/Converter.h 35 additions, 0 deletions

...braries/armem/server/ltm/base/converter/image/Converter.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/image/png/PngConverter.cpp 25 additions, 0 deletions

...rmem/server/ltm/base/converter/image/png/PngConverter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/image/png/PngConverter.h 21 additions, 0 deletions

.../armem/server/ltm/base/converter/image/png/PngConverter.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/json/JsonConverter.cpp 0 additions, 0 deletions

...es/armem/server/ltm/base/converter/json/JsonConverter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/json/JsonConverter.h 0 additions, 0 deletions

...ries/armem/server/ltm/base/converter/json/JsonConverter.h
source/RobotAPI/libraries/armem/server/ltm/base/detail/BufferedMemoryBase.h 11 additions, 2 deletions

...braries/armem/server/ltm/base/detail/BufferedMemoryBase.h
source/RobotAPI/libraries/armem/server/ltm/base/detail/CoreSegmentBase.h 17 additions, 3 deletions

.../libraries/armem/server/ltm/base/detail/CoreSegmentBase.h

with 290 additions and 34 deletions

Please register or to comment