Commits · c016953f84bb1d74989623c72a4b305810780212 · Software / ArmarX / RobotAPI

Nov 04, 2021
- Merge remote-tracking branch 'origin/refactor/new_arch' into refactor/new_arch_armem · c016953f
  Rainer Kartmann authored 3 years ago
  
  c016953f
- Add virtual destructors · a732df97
  Rainer Kartmann authored 3 years ago
  
  a732df97
Oct 28, 2021
- fix: RobotReader: iterating over all entity instances · 75a886b5
  Fabian Reister authored 3 years ago
  
  75a886b5
Oct 27, 2021
- armem_robot(_state): fixing circular dependency · 09f12810
  Fabian Reister authored 3 years ago
  
  09f12810
- armem_robot_state: fixing getRobotJointStates · 5819cddb
  Fabian Reister authored 3 years ago
  
  5819cddb
- robotstatememory: byebye, batch size! · 65dd1bf1
  Fabian Reister authored 3 years ago
  
  65dd1bf1
- Fix differing signedness · b27eefd5
  Rainer Kartmann authored 3 years ago
  
  b27eefd5
- Allow passing server memory to disk ltm · 0000bccd
  Rainer Kartmann authored 3 years ago
  
  0000bccd
Oct 26, 2021
- Merge branch 'refactor/new_arch' of gitlab.com:ArmarX/RobotAPI into refactor/new_arch · 72720bd9
  Rainer Kartmann authored 3 years ago
  
  72720bd9
- RobotReader: querying forces and torques (interval) · 38eb0ab8
  Fabian Reister authored 3 years ago
  
  38eb0ab8
- Merge branch 'armem/dev' into refactor/new_arch · 17b1f530
  Rainer Kartmann authored 3 years ago
  
  17b1f530
- Use AronClassFromAron() · 34663c64
  Rainer Kartmann authored 3 years ago
  
  34663c64
- Add static AronClass::FromAron(data) · effff0d0
  Rainer Kartmann authored 3 years ago
  
  effff0d0
- Pass info objects instead of single arguments · a414ec76
  Rainer Kartmann authored 3 years ago
  
  a414ec76
- Add missing include · ca94fb99
  Rainer Kartmann authored 3 years ago
  
  ca94fb99
- Remove generating toJSON/fromJSON() · e7215e94
  Rainer Kartmann authored 3 years ago
  
  e7215e94
- Use AronClassFromAron() · a26aace4
  Rainer Kartmann authored 3 years ago
  
  a26aace4
- Add static AronClass::FromAron(data) · e869278a
  Rainer Kartmann authored 3 years ago
  
  e869278a
- Pass info objects instead of single arguments · 97875eb6
  Rainer Kartmann authored 3 years ago
  
  97875eb6
- Add missing include · 0a0ed3eb
  Rainer Kartmann authored 3 years ago
  
  0a0ed3eb
- Remove generating toJSON/fromJSON() · c669ec5e
  Rainer Kartmann authored 3 years ago
  
  c669ec5e
- Merge branch 'armem/dev' into refactor/new_arch · df20c54f
  Rainer Kartmann authored 3 years ago
  
  # Conflicts: # source/RobotAPI/libraries/DSControllers/Gaussians.h # source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp # source/RobotAPI/libraries/aron/core/navigator/Navigator.h # source/RobotAPI/libraries/aron/core/navigator/data/NavigatorFactory.h
  df20c54f
- Merge branch 'master' into refactor/new_arch · aea29267
  Rainer Kartmann authored 3 years ago
  
  # Conflicts: # source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.h
  aea29267
- ltm memory changes and first folder structure for filter->encode->store->forget pipeline · 229ce364
  Fabian Tërnava authored 3 years ago
  
  229ce364
Oct 25, 2021
- Remove duplicated DebugObserver from scenario · ca9477b7
  Rainer Kartmann authored 3 years ago
  
  ca9477b7
Oct 22, 2021
- RobotReader: querying forces and torques of both hands · e100a964
  Fabian Reister authored 3 years ago
  
  e100a964
- ltm implementation for disk memory, new interfaces, connection to query_proc · 07611ad8
  Fabian Tërnava authored 3 years ago
  
  07611ad8
Oct 18, 2021
- Merge branch 'master' into dev/ArmemMPs · b35437df
  Franziska Krebs authored 3 years ago
  
  b35437df
- added MPs to motion memory · 7de7b065
  Franziska Krebs authored 3 years ago
  
  7de7b065
Oct 16, 2021
- Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into armem/dev · b29c6df3
  Fabian Tërnava authored 3 years ago
  
  b29c6df3
- updates to ltm · 64745f94
  Fabian Tërnava authored 3 years ago
  
  64745f94
Oct 14, 2021
- set controlValues to zero when calling reset() · 4a9d0cbd
  Johann Mantel authored 3 years ago
  
  4a9d0cbd
Oct 12, 2021
- cleanup · d42aff90
  Franziska Krebs authored 3 years ago
  
  d42aff90
- added from and toAron · 9b69df8b
  Franziska Krebs authored 3 years ago
  
  9b69df8b
Oct 11, 2021
- Merge remote-tracking branch 'origin/master' into refactor/new_arch · 1bdaa33f
  Fabian Reister authored 3 years ago
  
  1bdaa33f
- Add hint to comment in the ListeningPluginUser header · 625b9944
  Patrick Hegemann authored 3 years ago
  
  625b9944
- aron documentation · 3f9c83de
  Fabian Tërnava authored 3 years ago
  
  3f9c83de
Oct 07, 2021

removed images from example memory · 4bea1ce1
Fabian Tërnava authored 3 years ago
```
added first rudimentary documentation to aron
```
4bea1ce1
basic running version · 72e8a0b0
Franziska Krebs authored 3 years ago

72e8a0b0

Merge branch 'armem/ltm' of https://gitlab.com/ArmarX/RobotAPI into armem/dev · 701ce312

Fabian Tërnava authored 3 years ago

# Conflicts:
#	source/RobotAPI/components/armem/client/ExampleMemoryClient/CMakeLists.txt
#	source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
#	source/RobotAPI/components/armem/server/ExampleMemory/CMakeLists.txt
#	source/RobotAPI/libraries/aron/converter/ivt/IVTConverter.h
#	source/RobotAPI/libraries/aron/converter/opencv/OpenCVConverter.h

701ce312