Commits · 417ee7486856b75d3f81fd31ff5fa0a13395aee1 · Software / ArmarX / RobotAPI · GitLab

Snippets Groups Projects

Mar 24, 2022
- Merge branch '61-implement-resolution-of-memory-links-in-aron-data-during-query' into 'master' · 417ee748
  Rainer Kartmann authored 3 years ago
  
  Resolve "Implement Resolution of Memory Links in ARON Data during Query" Closes #61 See merge request ArmarX/RobotAPI!213
  417ee748
- Merge branch 'master' into 61-implement-resolution-of-memory-links-in-aron-data-during-query · 065e65ec
  Rainer Kartmann authored 3 years ago
  
  # Conflicts: # source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp # source/RobotAPI/libraries/armem/server/ltm/disk/detail/util/filesystem_util.h
  065e65ec
- Remove unused attribute · 507ea228
  Rainer Kartmann authored 3 years ago
  
  507ea228
- Add missing include · 7a61ab6f
  Rainer Kartmann authored 3 years ago
  
  7a61ab6f
- Merge branch '84-use-armarx-time-as-armem-time-instead-of-iceutil-time' into 'master' · 752a720b
  Rainer Kartmann authored 3 years ago
  
  Resolve "Use armarx::Time as armem::Time instead of IceUtil::Time" Closes #84 See merge request ArmarX/RobotAPI!228
  752a720b
- Use Clock::WaitFor() · 4338cfb1
  Rainer Kartmann authored 3 years ago
  
  4338cfb1
- Fix micro/milli seconds mismatch · d57bd657
  Rainer Kartmann authored 3 years ago
  
  d57bd657
- Re use code · 41bf1c0b
  Rainer Kartmann authored 3 years ago
  
  41bf1c0b
- Fix wrongly using int version · ec54f08d
  Rainer Kartmann authored 3 years ago
  
  ec54f08d
Mar 23, 2022
- Merge branch 'master' into 84-use-armarx-time-as-armem-time-instead-of-iceutil-time · af774512
  Rainer Kartmann authored 3 years ago
  
  af774512
- update NJointCartesianWaypointController · f9c4d545
  Markus Grotz authored 3 years ago
  
  - add setWaypointAx to access the controller from python
  f9c4d545
- Fix BOSubObjectFinder templates, clean up Reader · 75a7e199
  Philip Scherer authored 3 years ago
  
  75a7e199
Mar 22, 2022
- Merge branch 'master' into 61-implement-resolution-of-memory-links-in-aron-data-during-query · c74ba6c2
  Philip Scherer authored 3 years ago
  
  c74ba6c2
- Merge branch 'feature/skills' · 082d819f
  Fabian Reister authored 3 years ago
  
  082d819f
- Fix bugs uncovered by unit tests · 432fb1ee
  Rainer Kartmann authored 3 years ago
  
  432fb1ee
- RobotStatechartHelpers/RobotNameHelper: additional method to get force torque sensor frame · 7731a5be
  Fabian Reister authored 3 years ago
  
  7731a5be
- Update usages, add missing includes · 082913f6
  Rainer Kartmann authored 3 years ago
  
  082913f6
- fixed bug with AnyObject types · 2a9d66b1
  Fabian Tërnava authored 3 years ago
  
  2a9d66b1
- Fixed bug in skills.Manager gui plugin · 731d804f
  Fabian Tërnava authored 3 years ago
  
  731d804f
- Use armarx time in queries · f0b9b0ae
  Rainer Kartmann authored 3 years ago
  
  f0b9b0ae
- Update more usages of Time · 3041c154
  Rainer Kartmann authored 3 years ago
  
  3041c154
- Update usage of time in armem_objects · 6e3f0731
  Rainer Kartmann authored 3 years ago
  
  6e3f0731
- Use armarx::core::time::dto::DateTime in ObjectPose types · e4db2618
  Rainer Kartmann authored 3 years ago
  
  e4db2618
- Update usage of time in armem_skills · f2a063f8
  Rainer Kartmann authored 3 years ago
  
  f2a063f8
- Update usage of time in armem_system_state · 3b6a2067
  Rainer Kartmann authored 3 years ago
  
  3b6a2067
- Update usage of time in armem_vision · 77537fa4
  Rainer Kartmann authored 3 years ago
  
  77537fa4
- Update usage of time in armem_robot_state · fd603121
  Rainer Kartmann authored 3 years ago
  
  fd603121
- Update usage of time in armem_robot · 1472f430
  Rainer Kartmann authored 3 years ago
  
  1472f430
- Update usage of time in armem_gui · 414f1ac2
  Rainer Kartmann authored 3 years ago
  
  414f1ac2
- Update usage of time in armem tests · 3a28a586
  Rainer Kartmann authored 3 years ago
  
  3a28a586
- Update usage of time in armem/server · dd508dac
  Rainer Kartmann authored 3 years ago
  
  dd508dac
- Update usage of time in armem/mns · be8a6ac2
  Rainer Kartmann authored 3 years ago
  
  be8a6ac2
- Update usage of time in armem/core · 634efb74
  Rainer Kartmann authored 3 years ago
  
  634efb74
- Use armarx::core::time::dto::DateTime in ice types · 0ed7bb59
  Rainer Kartmann authored 3 years ago
  
  0ed7bb59
- Use armarx::{DateTime, Duration} as armem::{Time, Duration} · 86445bac
  Rainer Kartmann authored 3 years ago
  
  86445bac
- Add to/fromAron() for IceUtil::Time and move to correct namespace · 01506819
  Rainer Kartmann authored 3 years ago
  
  01506819
- Add docs to new Reader query, catch exception · 8b802d21
  Philip Scherer authored 3 years ago
  
  8b802d21
- fix: _execute -> execute · 0ff4f3e4
  Fabian Reister authored 3 years ago
  
  0ff4f3e4
- fix: cmake lib · 9f04c4aa
  Fabian Reister authored 3 years ago
  
  9f04c4aa
- Merge branch 'armem/ltm/dev' into 'master' · c5d987c7
  Fabian Peller authored 3 years ago
  
  armem/ltm/dev See merge request ArmarX/RobotAPI!226
  c5d987c7