Commits · 8106f0264596ded812ee18b458988267b0c604c0 · Software / ArmarX / RobotAPI · GitLab

Snippets Groups Projects

May 26, 2021
- Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into armem/dev · 8106f026
  Fabian Tërnava authored 3 years ago
  
  # Conflicts: # source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp
  8106f026
- updates for longtermmemory and mongodb connection · e4351a1b
  Fabian Tërnava authored 3 years ago
  
  e4351a1b
- Limit history size of object instance segment by default · 304bc970
  Rainer Kartmann authored 3 years ago
  
  304bc970
- bugfix: import error due to missing/moved aron header file · c59124b3
  Fabian Reister authored 3 years ago
  
  c59124b3
- Merge branch 'armem/dev-fixes' into 'armem/dev' · ef00e982
  Fabian Reister authored 3 years ago
  
  Armem/dev fixes See merge request ArmarX/RobotAPI!153
  ef00e982
- articulated object reader: fixing memory queries · fcb8e784
  Fabian Reister authored 3 years ago
  
  fcb8e784
- articulated object writeR: required provider name · 812f59a3
  Fabian Reister authored 3 years ago
  
  812f59a3
- fix: robot conversions: converting robot state · 2c157a19
  Fabian Reister authored 3 years ago
  
  2c157a19
- organizing includes · a320d66a
  Fabian Reister authored 3 years ago
  
  a320d66a
- Merge remote-tracking branch 'origin/master' into armem/dev · 569fc127
  Fabian Reister authored 3 years ago
  
  569fc127
- Merge branch 'arviz_drawer_base' into 'master' · a2f402c2
  Fabian Reister authored 3 years ago
  
  cmake & impl: arviz drawer base class See merge request ArmarX/RobotAPI!152
  a2f402c2
- cmake & impl: arviz drawer base class · 19951065
  Fabian Reister authored 3 years ago
  
  19951065
May 24, 2021
- Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into armem/dev · d3f60bf7
  Fabian Tërnava authored 3 years ago
  
  # Conflicts: # source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp
  d3f60bf7
May 21, 2021
- Merge branch 'feature/armem-object-memory-attachments' into 'armem/dev' · 28e04b64
  Fabian Reister authored 3 years ago
  
  Feature/armem object memory attachments See merge request ArmarX/RobotAPI!145
  28e04b64
May 20, 2021
- minor · 94370f81
  Fabian Reister authored 3 years ago
  
  94370f81
- anonymous namespace · c278500a
  Fabian Reister authored 3 years ago
  
  c278500a
- object memory: added attachments segment · 02aa9633
  Fabian Reister authored 3 years ago
  
  02aa9633
- attachements with timestamp · 33de7dc7
  Fabian Reister authored 3 years ago
  
  33de7dc7
- simplified implementation · 263a2c20
  Fabian Reister authored 3 years ago
  
  263a2c20
- implemented reader · 6a1c01ae
  Fabian Reister authored 3 years ago
  
  6a1c01ae
- extending type · 5b363ef4
  Fabian Reister authored 3 years ago
  
  5b363ef4
- attachments need to be stateful · 8d63cb66
  Fabian Reister authored 3 years ago
  
  8d63cb66
- adding timestamp to bo's · 360a4b89
  Fabian Reister authored 3 years ago
  
  360a4b89
- utils to obtain memoryid · 742ca99f
  Fabian Reister authored 3 years ago
  
  742ca99f
- reader and writer for attachments · 18bb8444
  Fabian Reister authored 3 years ago
  
  18bb8444
- attachments segment: getAttachments · 148c2cfc
  Fabian Reister authored 3 years ago
  
  148c2cfc
- conversions (aron) · 926ac924
  Fabian Reister authored 3 years ago
  
  926ac924
- namespace attachements -> attachment · 0fb8d5fa
  Fabian Reister authored 3 years ago
  
  0fb8d5fa
- updates to review of fabian reister · 1dd0d30c
  Fabian Tërnava authored 3 years ago
  
  1dd0d30c
- attachments segment class · 30af9a42
  Fabian Reister authored 3 years ago
  
  30af9a42
- BO's for attachments · abd5e8f2
  Fabian Reister authored 3 years ago
  
  abd5e8f2
- aron attachment structs · ae941882
  Fabian Reister authored 3 years ago
  
  ae941882
- Merge branch 'armem/dev' into feature/armem-object-memory-attachments · 08573c73
  Fabian Reister authored 3 years ago
  
  08573c73
May 19, 2021
- aron fixes for better code generation. Finalized maybe types. Merged master... · d8a9b057
  Fabian Tërnava authored 3 years ago
  
  aron fixes for better code generation. Finalized maybe types. Merged master and armem/dev into aron/dev. Fixed build issues. Repaired ArMemMemoryTest test since an update now adds a provider segment (instead of throwing MisingEntryException)
  d8a9b057
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI into aron/dev · c81e80da
  Fabian Tërnava authored 3 years ago
  
  c81e80da
- Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into aron/dev · 0964d947
  Fabian Tërnava authored 3 years ago
  
  0964d947
- Merge branch 'statechart_memory_3' into 'armem/dev' · 4a3e9afd
  Patrick Hegemann authored 3 years ago
  
  Statechart memory in the SkillsMemory See merge request ArmarX/RobotAPI!142
  4a3e9afd
May 18, 2021
- Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into aron/dev · a4a021d7
  Fabian Tërnava authored 3 years ago
  
  a4a021d7
- added more samples to example memory · ae02b71e
  Fabian Tërnava authored 3 years ago
  
  ae02b71e
- Move state type conversion maps · 9854d119
  Patrick Hegemann authored 3 years ago
  
  9854d119