Commits · 39eeae2f86218113c9b2a33a0bb301d77b22fb4b · Software / ArmarX / RobotAPI · GitLab

Snippets Groups Projects

Apr 20, 2022
- Unify use of RobotUnit* instead of RobotUnitPtr · 39eeae2f
  Fabian Paus authored 2 years ago
  
  39eeae2f
- Split NJointController.h into Base, Registry and WithTripleBuffer · 6b9d7b9d
  Fabian Paus authored 2 years ago
  
  This reduces the amount of headers that are necessary for different use cases
  6b9d7b9d
Apr 19, 2022
- hotfix: cmake qt5_add_resources: build failed on lab pcs · d9f5a648
  Gruppe9 authored 2 years ago
  
  d9f5a648
Apr 14, 2022
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · c94ff055
  armar-user authored 2 years ago
  
  c94ff055
- chore: Push uncommitted changes from somebody... (CD). · 67cba968
  armar-user authored 2 years ago
  
  67cba968
Apr 13, 2022
- move GazeConrollerInterface back to armarx_control · 895ac007
  Johann Mantel authored 2 years ago
  
  895ac007
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · 277c268a
  Fabian Reister authored 2 years ago
  
  277c268a
- robot reader: query odom pose · 83c6312a
  Fabian Reister authored 2 years ago
  
  83c6312a
Apr 08, 2022
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · 56ed1e8a
  armar-user authored 2 years ago
  
  56ed1e8a
Apr 07, 2022
- use less opencv links for aron converter lib · 5cfe7755
  armar-user authored 2 years ago
  
  5cfe7755
Apr 01, 2022
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · 29f757be
  armar-user authored 2 years ago
  
  29f757be
Mar 31, 2022
- Merge branch 'aron-types' into 'master' · e99f4b6b
  Rainer Kartmann authored 2 years ago
  
  Add common ARON types See merge request ArmarX/RobotAPI!231
  e99f4b6b
- Merge branch 'master' into aron-types · 2184589e
  Rainer Kartmann authored 2 years ago
  
  2184589e
Mar 30, 2022
- s/RobotAPIInterfaces.speechObserver/ArmarXCoreInterfaces.speechObserver/ · cec653e7
  Markus Grotz authored 2 years ago
  
  cec653e7
- update VariantInfo-RobotAPI.xml · 9242a9d5
  Markus Grotz authored 2 years ago
  
  - fix include paths - move observer to ArmarXCore
  9242a9d5
- Merge branch 'memoryviewer_tabs' into 'master' · 4bd773da
  Rainer Kartmann authored 2 years ago
  
  Restructure MemoryViewer tab widgets See merge request ArmarX/RobotAPI!230
  4bd773da
- Update default scenario config · b7ecf4db
  Rainer Kartmann authored 2 years ago
  
  b7ecf4db
- Update default scenario config · be652bb0
  Rainer Kartmann authored 2 years ago
  
  be652bb0
- Disable remote gui for example memory by default · cc8c27dd
  Rainer Kartmann authored 2 years ago
  
  cc8c27dd
Mar 29, 2022
- Restructure MemoryViewer tab widgets · 09677728
  Philip Scherer authored 2 years ago
  
  Also use fancy "specialValueText" for recursion depth spinner.
  09677728
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · 1750a232
  Fabian Tërnava authored 2 years ago
  
  1750a232
Mar 28, 2022
- Add json conversions · f3541a68
  Rainer Kartmann authored 2 years ago
  
  f3541a68
- Add armarx:arondto::Names · a1feb16b
  Rainer Kartmann authored 2 years ago
  
  a1feb16b
Mar 25, 2022
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · d7cc4d40
  armar-user authored 2 years ago
  
  d7cc4d40
Mar 24, 2022
- Add ARON DTO for simox::Color · 607a01fb
  Rainer Kartmann authored 2 years ago
  
  607a01fb
- Merge branch '61-implement-resolution-of-memory-links-in-aron-data-during-query' into 'master' · 417ee748
  Rainer Kartmann authored 2 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 2 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 2 years ago
  
  507ea228
- Add missing include · 7a61ab6f
  Rainer Kartmann authored 2 years ago
  
  7a61ab6f
- Merge branch '84-use-armarx-time-as-armem-time-instead-of-iceutil-time' into 'master' · 752a720b
  Rainer Kartmann authored 2 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 2 years ago
  
  4338cfb1
- Fix micro/milli seconds mismatch · d57bd657
  Rainer Kartmann authored 2 years ago
  
  d57bd657
- Re use code · 41bf1c0b
  Rainer Kartmann authored 2 years ago
  
  41bf1c0b
- Fix wrongly using int version · ec54f08d
  Rainer Kartmann authored 2 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 2 years ago
  
  af774512
- update NJointCartesianWaypointController · f9c4d545
  Markus Grotz authored 2 years ago
  
  - add setWaypointAx to access the controller from python
  f9c4d545
- Fix BOSubObjectFinder templates, clean up Reader · 75a7e199
  Philip Scherer authored 2 years ago
  
  75a7e199
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · 99397fd0
  armar-user authored 2 years ago
  
  99397fd0
Mar 22, 2022
- Merge branch 'master' into 61-implement-resolution-of-memory-links-in-aron-data-during-query · c74ba6c2
  Philip Scherer authored 2 years ago
  
  c74ba6c2
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · b4a35097
  Fabian Tërnava authored 2 years ago
  
  b4a35097