Commits · 00ee4e44ad9ad5b8c7a8e5b9346347edfcb95455 · Software / ArmarX / RobotAPI

Feb 20, 2023
- Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into... · 00ee4e44
  Fabian Tërnava authored 2 years ago
  
  Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into test/merge-branch-skills-to-master
  00ee4e44
Feb 17, 2023
- readd connection flag to prevent exceptions · d857c966
  Fabian Tërnava authored 2 years ago
  
  d857c966
- Improve behavior of skill manager gui · 09197456
  Fabian Tërnava authored 2 years ago
  
  # Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
  09197456
- Merge branch 'fix/robot-state-memory-memory-leak' into 'master' · a15a7c10
  Christoph Pohl authored 2 years ago
  
  Fix/robot state memory memory leak See merge request !319
  a15a7c10
- Add visualization of collision meshes to CollisionModelHelper · 2f1d4f7c
  Christoph Pohl authored 2 years ago
  
  2f1d4f7c
- Merge branch 'test/merge-branch-skills-to-master' of... · 3b8a6b64
  Fabian Tërnava authored 2 years ago
  
  Merge branch 'test/merge-branch-skills-to-master' of git.h2t.iar.kit.edu:sw/armarx/robot-api into test/merge-branch-skills-to-master # Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp
  3b8a6b64
- Merge branch 'master' of git.h2t.iar.kit.edu:sw/armarx/robot-api into... · 719aeca5
  Fabian Tërnava authored 2 years ago
  
  Merge branch 'master' of git.h2t.iar.kit.edu:sw/armarx/robot-api into test/merge-branch-skills-to-master # Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp
  719aeca5
- Merge remote-tracking branch 'origin/master' into fix/robot-state-memory-memory-leak · 9611622d
  Christoph Pohl authored 2 years ago
  
  9611622d
- improved ui file of skill manager · 7562215a
  Fabian Tërnava authored 2 years ago
  
  7562215a
- added armarx traces. Fixed fullfills type method · 74e2fad2
  Fabian Tërnava authored 2 years ago
  
  74e2fad2
- Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into... · 13b23ffb
  Fabian Tërnava authored 2 years ago
  
  Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into test/merge-branch-skills-to-master # Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp
  13b23ffb
- Add obstacle_avoidance library · 12361909
  Christoph Pohl authored 2 years ago
  
  12361909
Feb 16, 2023
- Merge branch 'master' into fix/robot-state-memory-memory-leak · 933ff173
  Christoph Pohl authored 2 years ago
  
  933ff173
- Fix null-node error for loading grasp trajectories for armar6 · 7d3d9cfb
  Christoph Pohl authored 2 years ago
  
  7d3d9cfb
- Merge branch 'master' into fix/robot-state-memory-memory-leak · 2163f4bd
  Christoph Pohl authored 2 years ago
  
  2163f4bd
- handle optional subtypes in fullfillsType · d295559e
  Christoph Pohl authored 2 years ago
  
  d295559e
- Add Improved exception message handling · f1cf8d33
  Christoph Pohl authored 2 years ago
  
  f1cf8d33
- Add visitor for list type · b74f1abc
  Christoph Pohl authored 2 years ago
  
  b74f1abc
- handle optional subtypes in fullfillsType · 6ba9c04f
  Christoph Pohl authored 2 years ago
  
  6ba9c04f
- Add Improved exception message handling · c71b526d
  Christoph Pohl authored 2 years ago
  
  c71b526d
- Add visitor for list type · 1bf381e9
  Christoph Pohl authored 2 years ago
  
  1bf381e9
- switch double metronome to a locking queue for RobotStateWriter and Reader · aedd7b06
  Christoph Pohl authored 2 years ago
  
  aedd7b06
- Merge branch 'fix/robot-state-memory-memory-leak' into 'master' · 1b29d063
  Fabian Reister authored 2 years ago
  
  Fix: Robot State Memory: memory leak See merge request !318
  1b29d063
Feb 15, 2023
- Revert "Many fixes & refactoring & add Quaternions" · 51ec0c30
  Fabian Tërnava authored 2 years ago
  
  This reverts commit d7f046dd.
  51ec0c30
- Revert "Many fixes & refactoring & add Quaternions" · 706df624
  Fabian Tërnava authored 2 years ago
  
  This reverts commit d7f046dd. # Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
  706df624
- Revert "publish TODO also" · 941c4990
  Fabian Tërnava authored 2 years ago
  
  This reverts commit 72653b3a.
  941c4990
- Merge branch 'feature/skills-manager-edit-arguments' of... · e13b1b75
  Fabian Tërnava authored 2 years ago
  
  Merge branch 'feature/skills-manager-edit-arguments' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into test/merge-branch-skills-to-master # Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
  e13b1b75
- Merge branch 'armem/ltm/dev' of... · 0274b066
  Fabian Tërnava authored 2 years ago
  
  Merge branch 'armem/ltm/dev' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into test/merge-branch-skills-to-master
  0274b066
- update codeowners to new gitlab usernames · 7e335efe
  Fabian Tërnava authored 2 years ago
  
  7e335efe
Feb 13, 2023
- replacing triple buffer by boost lock free queue · bccaa7eb
  armar-user authored 2 years ago
  
  bccaa7eb
- Fix doubling of namespaces in component config · e77ace69
  Christoph Pohl authored 2 years ago
  
  e77ace69
- Fix missing namespacing for component properties · bc991080
  Christoph Pohl authored 2 years ago
  
  bc991080
- add comment for isAvaliable method · 2a9bc91f
  Fabian Tërnava authored 2 years ago
  
  2a9bc91f
- Merge remote-tracking branch 'origin/master' into armem/ltm/dev · 7a471ccc
  Fabian Tërnava authored 2 years ago
  
  7a471ccc
Feb 10, 2023
- Merge branch 'feature/laser-scans-memory_fix-robot-synchronization' into 'master' · 4aa23429
  Fabian Reister authored 2 years ago
  
  Laser scans memory: Synchronize robot in regular intervals See merge request !316
  4aa23429
- Synchronize robot in regular intervals · 00484236
  Tobias Gröger authored 2 years ago
  
  00484236
- fix: Armar6Converter: checking type in forceTorque extra (issue on ARMAR-DE) · 72f06da8
  Your Name authored 2 years ago
  
  72f06da8
- Merge branch 'master' of git.h2t.iar.kit.edu:sw/armarx/robot-api · fff6bfd7
  Your Name authored 2 years ago
  
  fff6bfd7
- laser scanner test scenario update · 37bed3b2
  Your Name authored 2 years ago
  
  37bed3b2
- SimpleVirtualRobot component: can now specify global pose · 833fed30
  Your Name authored 2 years ago
  
  833fed30