Commits · 6801dbb29aef3c5485982a73de0e4c62df330a9b · Software / ArmarX / RobotAPI · GitLab

Snippets Groups Projects

May 21, 2024
- Merge branch 'fluxio/dev-refactor-plugin-executor' into 'fluxio/dev' · 6801dbb2
  Moritz Gleissner authored 11 months ago
  
  Fluxio/dev refactor plugin executor See merge request !457
  6801dbb2
May 15, 2024
- replaced plugin calls with lambda functions · 0f088699
  Julian Tusch authored 11 months ago
  
  0f088699
- Draft: moved files · 57bf63c4
  Julian Tusch authored 11 months ago
  
  57bf63c4
- Merge branch 'fluxio/dev-control-token-special-nodes' into 'fluxio/dev' · 073caa3e
  Julian Tusch authored 11 months ago
  
  Fluxio/dev control token special nodes See merge request !456
  073caa3e
- Merge branch 'fluxio/dev' into fluxio/dev-control-token-special-nodes · 5c7609fe
  Moritz Gleissner authored 11 months ago
  
  5c7609fe
- Merge branch 'master' into fluxio/dev · 8bc14313
  Moritz Gleissner authored 11 months ago
  
  8bc14313
- changed contolType to enum · 36c454fa
  Moritz Gleissner authored 11 months ago
  
  36c454fa
May 14, 2024
- Merge branch 'feature/improve-armar7-platform-movement' into 'master' · 79b8b7f2
  Fabian Reister authored 11 months ago
  
  Improve armar7 platform movement See merge request !451
  79b8b7f2
- Merge remote-tracking branch 'origin/master' into feature/improve-armar7-platform-movement · 0231bec3
  Christoph Pohl authored 11 months ago
  
  0231bec3
May 13, 2024
- draft: merger works (sometimes) · 31087f42
  Julian Tusch authored 11 months ago
  
  31087f42
- draft: fixed splitter logic · 3aa79517
  Julian Tusch authored 11 months ago
  
  3aa79517
May 11, 2024
- small fix, actually call the run method now · 95f8033f
  Julian Tusch authored 11 months ago
  
  95f8033f
- fixed after fork no parallel run · d3e1ee39
  Moritz Gleissner authored 11 months ago
  
  d3e1ee39
- draft: merger logic · aff12d8d
  Julian Tusch authored 11 months ago
  
  aff12d8d
- Merge branch 'fluxio/dev' into fluxio/dev-control-token-special-nodes · e3f73701
  Moritz Gleissner authored 11 months ago
  
  e3f73701
- fixed nativ skillId mapping in exec · c85ea79b
  Moritz Gleissner authored 11 months ago
  
  c85ea79b
- Merge branch 'fluxio/dev' into fluxio/dev-control-token-special-nodes · 489cea3d
  Moritz Gleissner authored 11 months ago
  
  489cea3d
- Merge branch 'master' into fluxio/dev · 3983b3d5
  Moritz Gleissner authored 11 months ago
  
  3983b3d5
May 07, 2024
- Merge branch 'fluxio/dev-idempotent-uuids-for-native-skills' into 'fluxio/dev' · 9f797353
  Julian Tusch authored 11 months ago
  
  Fluxio/dev idempotent uuids for native skills See merge request !455
  9f797353
- removed test logs · 09e7377e
  Julian Tusch authored 11 months ago
  
  09e7377e
- moved seeded uuid generation to helper method · 494eaa39
  Julian Tusch authored 11 months ago
  
  494eaa39
- draft: addFluxioProvider · 702ad595
  Moritz Gleissner authored 11 months ago
  
  702ad595
- Merge branch 'qol/skillMemoryGui' into 'master' · bad9c1a1
  Christian Dreher authored 11 months ago
  
  QOL Changes in Skill GUI See merge request !453
  bad9c1a1
May 06, 2024
- draft: added idempotent ids to nativ · a971e48a
  Moritz Gleissner authored 11 months ago
  
  a971e48a
- replaced magic strings with enums · bc6b5544
  Julian Tusch authored 11 months ago
  
  bc6b5544
- Make skill description and parameter widgets size adjustable · 533144f0
  Peter Albrecht authored 11 months ago
  
  533144f0
- Change search-on-submit to search-on-update · 3ac5fd95
  Peter Albrecht authored 11 months ago
  
  3ac5fd95
May 02, 2024
- Fix set current velocity in controller pre activate · ad68bd49
  Tobias Gröger authored 11 months ago
  
  ad68bd49
- Merge branch 'fix/aron-conversions-template-ambiguities' into 'master' · e26f091c
  Christian Dreher authored 11 months ago
  
  Fix template ambiguities in aron_conversions See merge request !439
  e26f091c
Apr 30, 2024
- Merge branch 'fluxio/dev' into fluxio/dev-control-token-special-nodes · 0b1f3e59
  Moritz Gleissner authored 11 months ago
  
  0b1f3e59
Apr 29, 2024
- Implement separate 2dim CartesianVelocityRamp · 256e8b12
  Tobias Gröger authored 11 months ago
  
  256e8b12
- draft: splitter basic implementation · 08c55fcc
  Julian Tusch authored 11 months ago
  
  08c55fcc
- Fix movement after emergency stop · 4e612111
  Tobias Gröger authored 11 months ago
  
  4e612111
- Implement properties to choose controller · d4bc11c2
  Tobias Gröger authored 11 months ago
  
  Add a common base class for both HolonomicPlatformVelocity controllers and add a property with which to choose one. Make the acceleration limits also configurable via properties.
  d4bc11c2
- Merge branch 'master' into fluxio/dev · 6c183a0d
  uyqhv_engel authored 11 months ago
  
  6c183a0d
- Merge branch 'master' into fluxio/dev-control-token-special-nodes · 2ada7b51
  Julian Tusch authored 11 months ago
  
  2ada7b51
- draft: add control node · 70c55912
  Julian Tusch authored 11 months ago
  
  70c55912
- updated ice node struct · f5204cd2
  Julian Tusch authored 11 months ago
  
  f5204cd2
Apr 28, 2024
- Use new NJointHolonomicPlatformVelocityControllerWithRamp in RobotUnit · f9f1fdef
  Tobias Gröger authored 11 months ago
  
  f9f1fdef
- Implement controller · bafa5e1c
  Tobias Gröger authored 11 months ago
  
  bafa5e1c