Commits · 28e8f748c958ad7c248b2bb1f54207b0bdf1cc06 · Software / ArmarX / RobotAPI

Nov 12, 2021

Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI · 28e8f748

Fabian Tërnava authored 3 years ago

# Conflicts:
#	source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp
#	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

28e8f748

Increase tolerance in BB load check · 6def724b
armar-user authored 3 years ago

6def724b
bool flag to enbale/disable ltm. Fix plugin issue · 0f7973bc
armar-user authored 3 years ago

0f7973bc

Nov 11, 2021
- Merge remote-tracking branch 'origin/refactor/new_arch' · e82e1655
  Your Name authored 3 years ago
  
  e82e1655
- source: renaming all occurences of 'Armar6Skills' to 'armar6_skills' · f88ac2e0
  Fabian Reister authored 3 years ago
  
  f88ac2e0
- source: renaming all occurences of 'Armar6RT' to 'armar6_rt' · dcbdec3b
  Fabian Reister authored 3 years ago
  
  dcbdec3b
- scenarios: renaming all occurences of 'Armar6RT' to 'armar6_rt' · cb8978e6
  Fabian Reister authored 3 years ago
  
  cb8978e6
Nov 10, 2021
- Added implementation of UKFM library in C++ · 8a6cd6f6
  Christoph Pohl authored 3 years ago
  
  8a6cd6f6
- Merge branch 'refactor/new_arch' of gitlab.com:ArmarX/RobotAPI into refactor/new_arch · 3b9ad0b0
  armar-user authored 3 years ago
  
  3b9ad0b0
- RobotStateComponent: logging · fcfc48ba
  armar-user authored 3 years ago
  
  fcfc48ba
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · e2fa783d
  armar-user authored 3 years ago
  
  e2fa783d
- NJointHolonomicPlatformGlobalPositionController: increasing default max velocity · a999463d
  armar-user authored 3 years ago
  
  a999463d
- updated disk storage buttons of gui so that load writes into current wm · 812666be
  Fabian Tërnava authored 3 years ago
  
  812666be
- renamed diskstorage · def8866e
  Fabian Tërnava authored 3 years ago
  
  def8866e
- ltm sets properties itself · a7eee714
  Fabian Tërnava authored 3 years ago
  
  a7eee714
- moved ltm pipeline in seperate struct · 0168652f
  Fabian Tërnava authored 3 years ago
  
  0168652f
- Buffered LTM now mixin · b103038c
  Fabian Tërnava authored 3 years ago
  
  b103038c
- consollidate removed instances to ltm (still WIP) · 810eb237
  Fabian Tërnava authored 3 years ago
  
  810eb237
- updated aron visitors (no key anymore, use path instead) · b7b31fb3
  Fabian Tërnava authored 3 years ago
  
  b7b31fb3
- fixed error with rsm · 1e52d679
  Fabian Tërnava authored 3 years ago
  
  1e52d679
- use correct setName function · a917be86
  Fabian Tërnava authored 3 years ago
  
  a917be86
Nov 09, 2021
- Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into armem/dev · 29173216
  Fabian Tërnava authored 3 years ago
  
  29173216
- fixed few issues with disk ltm · 3fec5178
  Fabian Tërnava authored 3 years ago
  
  3fec5178
- Fix aron primitives casting to 1 · 1911cb6f
  Rainer Kartmann authored 3 years ago
  
  1911cb6f
Nov 08, 2021
- Merge branch 'robotstatememory/optional_robot_unit' of... · 451a1996
  Fabian Tërnava authored 3 years ago
  
  Merge branch 'robotstatememory/optional_robot_unit' of https://gitlab.com/ArmarX/RobotAPI into armem/dev
  451a1996
- Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into armem/dev · 6d2f87ee
  Fabian Tërnava authored 3 years ago
  
  # Conflicts: # source/RobotAPI/libraries/armem/test/ArMemLTMBenchmark.cpp
  6d2f87ee
- added info output if buffered memory is empty and user wants to store · ee89b620
  Fabian Tërnava authored 3 years ago
  
  ee89b620
- changed default value of frequency filter · 8fab1b03
  Fabian Tërnava authored 3 years ago
  
  8fab1b03
- moved benchmark to fixture function · 754c5775
  Fabian Tërnava authored 3 years ago
  
  754c5775
- removed useless component · c75c4925
  armar-user authored 3 years ago
  
  c75c4925
- added legacy components to connect old kinematicunit to rsm · 63a7152d
  armar-user authored 3 years ago
  
  63a7152d
- made the robot unit optional to robotstatememory · f6373adb
  armar-user authored 3 years ago
  
  f6373adb
- Add and use initialize method instead of reconstruction to avoid deleting callbacks · b9abb53a
  Rainer Kartmann authored 3 years ago
  
  b9abb53a
- Add virtual destructors · dbbb8b77
  Rainer Kartmann authored 3 years ago
  
  dbbb8b77
Nov 05, 2021

Merge branch 'master' into refactor/new_arch · 4d02ca6b
Rainer Kartmann authored 3 years ago

4d02ca6b
Add virtual destructors · ee063d86
Rainer Kartmann authored 3 years ago

ee063d86
Fix differing signedness · 8ca0bb3e
Rainer Kartmann authored 3 years ago

8ca0bb3e

Allow passing server memory to disk ltm · 780dea3f

Rainer Kartmann authored 3 years ago

# Conflicts:
#	source/RobotAPI/libraries/armem/server/ltm/disk/CoreSegment.cpp
#	source/RobotAPI/libraries/armem/server/ltm/disk/CoreSegment.h
#	source/RobotAPI/libraries/armem/server/ltm/disk/Entity.cpp
#	source/RobotAPI/libraries/armem/server/ltm/disk/Entity.h
#	source/RobotAPI/libraries/armem/server/ltm/disk/Memory.cpp
#	source/RobotAPI/libraries/armem/server/ltm/disk/Memory.h
#	source/RobotAPI/libraries/armem/server/ltm/disk/ProviderSegment.cpp
#	source/RobotAPI/libraries/armem/server/ltm/disk/ProviderSegment.h

780dea3f

Merge branch 'master' into armem/dev · df14a47e
Rainer Kartmann authored 3 years ago

df14a47e

Nov 02, 2021
- Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into armem/dev · 2cf6d599
  Fabian Tërnava authored 3 years ago
  
  2cf6d599