Commits · 14ddfc915152156368f865e6102ed29754c1f6d4 · Lennard Hofmann / RobotAPI

Apr 20, 2020
- WIP: StatechartExecution · 14ddfc91
  Stefan Reither authored 4 years ago
  
  14ddfc91
Mar 17, 2020
- readds libraries DMPController and DSController · f95ddf5f
  ArmarX User authored 5 years ago
  
  f95ddf5f
Mar 10, 2020
- removes unused library KITGripperEtherCAT and removes deprecated GripperControllers · 6f1b6f92
  Stefan Reither authored 5 years ago
  
  6f1b6f92
Mar 05, 2020
- Merge branch 'master' into kitgripper · f692b273
  Stefan Reither authored 5 years ago
  
  f692b273
Mar 04, 2020
- Merge branch 'update-json-includes' into 'master' · 37790297
  Rainer Kartmann authored 5 years ago
  
  Update includes to SimoxUtility/json See merge request ArmarX/RobotAPI!59
  37790297
Mar 03, 2020
- Merge branch 'master' into update-json-includes · 2117c0ce
  Rainer Kartmann authored 5 years ago
  
  2117c0ce
- Use upstream facilities for blob to object and object to blob · 2031e980
  Raphael Grimm authored 5 years ago
  
  2031e980
- Update references to SimoxUtility/json · 1f764ed8
  Rainer Kartmann authored 5 years ago
  
  1f764ed8
Mar 02, 2020
- Adapt to upstream changes · bf65b3b2
  Raphael Grimm authored 5 years ago
  
  bf65b3b2
Feb 21, 2020
- added missing include for Eigen-Std-vectors · e432d80e
  Simon Ottenhaus authored 5 years ago
  
  (cherry picked from commit 1d59b3af)
  e432d80e
- Update README.md, source/RobotAPI/components/units/RobotUnit/README.md files · f46b9d8d
  Simon Ottenhaus authored 5 years ago
  
  f46b9d8d
Feb 19, 2020
- modified the bimanual controller · 7476cae3
  You Zhou authored 5 years ago
  
  7476cae3
Feb 18, 2020
- finished debugging bimanual force controller · ab66ec13
  You Zhou authored 5 years ago
  
  ab66ec13
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · b0635624
  You Zhou authored 5 years ago
  
  b0635624
- added bimanual force control into API · 688a65f4
  You Zhou authored 5 years ago
  
  688a65f4
- some code cleanup in NJointTSDMPController · b6e953fd
  ArmarX User authored 5 years ago
  
  b6e953fd
- deactivates NJointJSDMPControllers in CMakeLists.txt · 1f6dcd8e
  ArmarX User authored 5 years ago
  
  1f6dcd8e
- adds property for clearing error counters after bus startup and improves... · 41d46792
  ArmarX User authored 5 years ago
  
  adds property for clearing error counters after bus startup and improves overall error-message-quality
  41d46792
Feb 17, 2020
- Fix code for non unity build · 3cf77439
  Raphael Grimm authored 5 years ago
  
  3cf77439
- Merge remote-tracking branch 'origin/master' · 26e7fe0f
  Raphael Grimm authored 5 years ago
  
  # Conflicts: # source/RobotAPI/libraries/core/CartesianVelocityController.cpp
  26e7fe0f
- Remove using namespace on global scope and format code · db8948f8
  Raphael Grimm authored 5 years ago
  
  db8948f8
Feb 16, 2020
- Add new cmake cache files to .gitignore · 8a1a249d
  Raphael Grimm authored 5 years ago
  
  8a1a249d
Feb 13, 2020
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · a0c9534c
  Fabian Paus authored 5 years ago
  
  a0c9534c
- Fix bug in CartesianVelocityController · a6e5c400
  Fabian Paus authored 5 years ago
  
  a6e5c400
Feb 07, 2020
- added change of the position and orientation functions · fcff6f97
  You Zhou authored 5 years ago
  
  fcff6f97
Feb 06, 2020
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · 2fd28919
  You Zhou authored 5 years ago
  
  2fd28919
Feb 05, 2020
- add guardGravity into DSJointCarryController · b251c3fc
  You Zhou authored 5 years ago
  
  b251c3fc
- Add missing return · 7f8acb36
  Rainer Kartmann authored 5 years ago
  
  7f8acb36
- Merge branch 'arviz' · d6fa1eee
  Rainer Kartmann authored 5 years ago
  
  d6fa1eee
- Add plane() to viz::Polygon · d1e19b59
  Rainer Kartmann authored 5 years ago
  
  d1e19b59
- Merge branch 'arviz' into 'master' · 319ed1af
  Rainer Kartmann authored 5 years ago
  
  Add point cloud setters to viz::PointCloud See merge request ArmarX/RobotAPI!58
  319ed1af
- Fix call · 21393395
  Rainer Kartmann authored 5 years ago
  
  21393395
- Use macro from SimoxUtility · 96e173c0
  Rainer Kartmann authored 5 years ago
  
  96e173c0
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · f4d63dbf
  You Zhou authored 5 years ago
  
  f4d63dbf
- Add addPoint() and pointCloud() to PointCloud · 1437a3ca
  Rainer Kartmann authored 5 years ago
  
  1437a3ca
- continue working on DSJointCarryController · cf61f531
  You Zhou authored 5 years ago
  
  cf61f531
- Add point cloud type traits with static test · 50a2808a
  Rainer Kartmann authored 5 years ago
  
  50a2808a
- Move Color and ElementOps to own files · dace9e7c
  Rainer Kartmann authored 5 years ago
  
  dace9e7c
- Move element PointCloud to own file · 6dc885c0
  Rainer Kartmann authored 5 years ago
  
  6dc885c0
- Merge branch 'arviz' · dd67463f
  Rainer Kartmann authored 5 years ago
  
  dd67463f