armem/dev => master (!157) · Merge requests · Software / ArmarX / RobotAPI

Merged Fabian Reister requested to merge armem/dev into master 3 years ago

May 27, 2021
- Merge branch 'feature/armem_robot_state_update' into 'armem/dev' · 78db88ee
  Fabian Reister authored 3 years ago
  
  armem_robot_state: updates See merge request ArmarX/RobotAPI!154
  78db88ee
- ScopedClient: fixing virtual d'tor issue; need additional c'tor · 8abf480f
  Fabian Reister authored 3 years ago
  
  8abf480f
- deleting files · b492a8e8
  Fabian Reister authored 3 years ago
  
  b492a8e8
- RobotNameHelper with additional functionality to load RobotInfoNode from xml file · a4d58fc7
  Fabian Reister authored 3 years ago
  
  a4d58fc7
- fixing typo · f9f16c90
  Fabian Reister authored 3 years ago
  
  f9f16c90
- Merge remote-tracking branch 'origin/master' into feature/armem_robot_state_update · e067cf90
  Fabian Reister authored 3 years ago
  
  e067cf90
- distinguishing between getRobot and getSynchronizedRobot · a9559e49
  Fabian Reister authored 3 years ago
  
  a9559e49
- Merge branch 'armem/dev' into feature/armem_robot_state_update · 4fb829bf
  Fabian Reister authored 3 years ago
  
  4fb829bf
- Merge remote-tracking branch 'origin/armem/dev' into armem/dev · 7a661313
  Fabian Reister authored 3 years ago
  
  7a661313
- VirtualRobotReader: synchronizing robot when new robot is requested · 0b0fbb28
  Fabian Reister authored 3 years ago
  
  0b0fbb28
- new class VirtualRobotHelper that provides additional information e.g... · eaf0bbd5
  Fabian Reister authored 3 years ago
  
  new class VirtualRobotHelper that provides additional information e.g RobotInfoNode that is not part of the VirtualRobot::Robot data structure
  eaf0bbd5
- RobotReader: implemented getRobotJointState() · d56da92b
  Fabian Reister authored 3 years ago
  
  d56da92b
May 26, 2021
- 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
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
- 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
- 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
- Move state type conversion maps · 9854d119
  Patrick Hegemann authored 3 years ago
  
  9854d119
- SkillsMemory Review · e1549595
  Patrick Hegemann authored 3 years ago
  
  e1549595
- Merge remote-tracking branch 'origin/armem/dev' into statechart_memory_3 · 5fdce554
  Patrick Hegemann authored 3 years ago
  
  5fdce554
- Clean up SkillsMemory CMake · 483c697a
  Patrick Hegemann authored 3 years ago
  
  483c697a
- Fix SkillsMemory CMake · ba793aca
  Patrick Hegemann authored 3 years ago
  
  ba793aca
- Create SkillsMemory Library and aron conversions · 604085fa
  Patrick Hegemann authored 3 years ago
  
  604085fa
May 17, 2021
- Merge remote-tracking branch 'origin/armem/dev' into statechart_memory_3 · bbdf537a
  Patrick Hegemann authored 3 years ago
  
  bbdf537a
May 14, 2021
- using latest() for snapshot query atm · 3fb1cf12
  Fabian Reister authored 3 years ago
  
  3fb1cf12
- Merge branch '45-follow-up-from-feature-armem-object-memory-articulated-objects' into 'armem/dev' · 1bf6d82e
  Fabian Reister authored 3 years ago
  
  Resolve "Follow-up from "Feature/armem object memory articulated objects"" See merge request ArmarX/RobotAPI!149
  1bf6d82e
- articulated object visu: periodic task · c0e2ea46
  Fabian Reister authored 3 years ago
  
  c0e2ea46
- cmake cleanup · 1d4cab18
  Fabian Reister authored 3 years ago
  
  1d4cab18
- ArticulatedObjctLocalizerExample: periodic task · f801557f
  Fabian Reister authored 3 years ago
  
  f801557f
- cleanup · 4320b7c1
  Fabian Reister authored 3 years ago
  
  4320b7c1
- fixing test · d999c3fd
  Fabian Reister authored 3 years ago
  
  d999c3fd
- query beforeOrAt: tests + fix · b9285ca7
  Fabian Reister authored 3 years ago
  
  b9285ca7
- Merge branch 'feature/armem-articulated-object-localizer' into 'armem/dev' · cf27e023
  Fabian Reister authored 3 years ago
  
  ArMem: articulated object localizer related stuff See merge request ArmarX/RobotAPI!148
  cf27e023
- Merge branch 'armem/dev' · 4313d831
  Fabian Reister authored 3 years ago
  
  Conflicts: source/RobotAPI/libraries/armem_robot_state/client/localization/TransformReader.cpp
  4313d831
- more tests · eb877c52
  Fabian Reister authored 3 years ago
  
  eb877c52
- TimeApprox test + fix · cbe9ccd1
  Fabian Reister authored 3 years ago
  
  cbe9ccd1
- beforeTime query: fix + test · 0f226b06
  Fabian Reister authored 3 years ago
  
  0f226b06
- Merge branch 'feature/armem-virtual-robot' into 'armem/dev' · 8c2d7c47
  Fabian Reister authored 3 years ago
  
  Feature/armem virtual robot: Replacement for RobotStateComponent See merge request ArmarX/RobotAPI!146
  8c2d7c47
- Merge remote-tracking branch 'origin/armem/dev' into feature/armem-articulated-object-localizer · 81b6b19a
  Fabian Reister authored 3 years ago
  
  81b6b19a
- fix · b686cd43
  Fabian Reister authored 3 years ago
  
  b686cd43
- query: beforeTime with default: nElements=1 · e404472d
  Fabian Reister authored 3 years ago
  
  e404472d
- periodic task instead of runnnig task · a5015bf1
  Fabian Reister authored 3 years ago
  
  a5015bf1
- cleanup · b079e4ae
  Fabian Reister authored 3 years ago
  
  b079e4ae
- Merge remote-tracking branch 'origin/armem/dev' into feature/armem-virtual-robot · ee133f51
  Fabian Reister authored 3 years ago
  
  ee133f51
- Merge branch 'feature/armem-robot-state-memory-update' into 'armem/dev' · d919ba26
  Fabian Reister authored 3 years ago
  
  robot state memory update See merge request ArmarX/RobotAPI!144
  d919ba26
- armem::timestamp instead of long · 5bbc8f14
  Fabian Reister authored 3 years ago
  
  5bbc8f14
May 12, 2021
- Merge branch 'armem/dev' into feature/armem-robot-state-memory-update · d635e4e2
  Fabian Reister authored 3 years ago
  
  d635e4e2
- SnapshotSelector queries · 69207540
  Fabian Reister authored 3 years ago
  
  69207540
- Merge branch 'armem/dev' into feature/armem-robot-state-memory-update · 63279b6a
  Fabian Reister authored 3 years ago
  
  63279b6a
- Merge branch 'feature/armem-new-queries' into 'armem/dev' · b33339ad
  Fabian Reister authored 3 years ago
  
  new queries for snapshots: TimeApprox and BeforeTime See merge request ArmarX/RobotAPI!147
  b33339ad
- query: maxEntries fix · 76ea15da
  Fabian Reister authored 3 years ago
  
  76ea15da
- warning and exceptions; new queries · 95eb3ffe
  Fabian Reister authored 3 years ago
  
  95eb3ffe
- workign draft: TransformHelper (need new queries ...) · 86a6af0c
  Fabian Reister authored 3 years ago
  
  86a6af0c
- -verbose · 2c0aaac2
  Fabian Reister authored 3 years ago
  
  2c0aaac2
- Merge remote-tracking branch 'origin/armem/dev' into feature/armem-robot-state-memory-update · 5ec526e4
  Fabian Reister authored 3 years ago
  
  5ec526e4
- deleting files · 3b04ab9e
  Fabian Reister authored 3 years ago
  
  3b04ab9e
- fixing logging names · 1f95165e
  Fabian Reister authored 3 years ago
  
  1f95165e
- no warning if odom is missing · 2411d0c3
  Fabian Reister authored 3 years ago
  
  2411d0c3
- renaming commit: c -> proprioceptionCommit · b7a7d2bb
  Fabian Reister authored 3 years ago
  
  b7a7d2bb
- sensor value prefix · 3d0d3959
  Fabian Reister authored 3 years ago
  
  3d0d3959
- config update · a12d2f3c
  Fabian Reister authored 3 years ago
  
  a12d2f3c
- properly setting memory id in class segment · db900c4b
  Fabian Reister authored 3 years ago
  
  db900c4b
- removing hard coded paths · 2b0dfc28
  Fabian Reister authored 3 years ago
  
  2b0dfc28
- Merge branch 'feature/armem-object-memory-articulated-objects' into 'armem/dev' · 51ce19a1
  Fabian Reister authored 3 years ago
  
  Feature/armem object memory articulated objects See merge request ArmarX/RobotAPI!141
  51ce19a1
- ArticulatedObjectLocalizer now working properly · 3abd69b6
  Fabian Reister authored 3 years ago
  
  3abd69b6
- ERROR -> WARNING · 74c60d19
  Fabian Reister authored 3 years ago
  
  74c60d19
- removing code duplication (review) · 64545832
  Fabian Reister authored 3 years ago
  
  64545832
- articulated object class segment: provider id: dataset/name · f20ec095
  Fabian Reister authored 3 years ago
  
  f20ec095
- ObjectFinder: + findAllArticulatedObjectsByDataset · 51964784
  Fabian Reister authored 3 years ago
  
  51964784
- cleanup · 79d0383a
  Fabian Reister authored 3 years ago
  
  79d0383a
- fixing typo · 1ffb8651
  Fabian Reister authored 3 years ago
  
  1ffb8651
- articulated object class segment: loading objects via ObjectFinder on startup (if desired) · 72bc5144
  Fabian Reister authored 3 years ago
  
  72bc5144
- object finder: can now find articulated objects · 5f478c42
  Fabian Reister authored 3 years ago
  
  5f478c42
- ObjectFinder: Make sure, the data path is to the package is registered · 6bac24a1
  Fabian Reister authored 3 years ago
  
  6bac24a1
- ArticulatedObject visu: reduced verbosity · dad57637
  Fabian Reister authored 3 years ago
  
  dad57637
- Merge remote-tracking branch 'origin/armem/dev' into statechart_memory_3 · 8b9c9107
  Patrick Hegemann authored 3 years ago
  
  8b9c9107
- moving ArticulatedObjectLocalizerExample to new directory · 2a88bd6e
  Fabian Reister authored 3 years ago
  
  2a88bd6e

armem/dev => master

Merge request reports

Activity