Commits · a7e4664af4cf7897d964e52cdc0a2f6a924825a4 · Software / ArmarX / RobotAPI

Jun 03, 2019
- Merge branch 'InverseDynamicsIce3.7' into Ice3.7 · a7e4664a
  Mirko Wächter authored 5 years ago
  
  a7e4664a
- made rbdl gravity torque calculation call memory allocation free · d7661e8d
  Mirko Wächter authored 5 years ago
  
  d7661e8d
May 28, 2019
- Merge remote-tracking branch 'origin/armar6demo' into Ice3.7 · 03193501
  Raphael Grimm authored 5 years ago
  
  03193501
- Add missing slice files · 1ef5ecf2
  Raphael Grimm authored 5 years ago
  
  1ef5ecf2
May 23, 2019

Merge remote-tracking branch 'origin/master' into Ice3.7 · fc62da1e

Raphael Grimm authored 5 years ago

# Conflicts:
#	source/RobotAPI/applications/CMakeLists.txt
#	source/RobotAPI/interface/CMakeLists.txt
#	source/RobotAPI/libraries/DSControllers/CMakeLists.txt

fc62da1e

May 21, 2019
- disabled DSControllers lib · a137741e
  SecondHands Demo authored 5 years ago
  
  a137741e
May 20, 2019
- Add JSONTreeModel · b2513dfd
  Fabian Paus authored 5 years ago
  
  - Model for QTreeView - Displays JSON objects in a tree view
  b2513dfd
May 13, 2019
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · 3986fef1
  Kevin Hitzler authored 5 years ago
  
  3986fef1
- Disable library correctly if dependency was not found · ebee575f
  Kevin Hitzler authored 5 years ago
  
  ebee575f
- Merge remote-tracking branch 'remotes/origin/armar6demo' · b3f59aae
  Kevin Hitzler authored 5 years ago
  
  b3f59aae
May 10, 2019
- added side to grasp candidate · dd74a205
  Simon Ottenhaus authored 5 years ago
  
  dd74a205
May 09, 2019
- added Grasp Candidate Observer to VariantInfo · b7a1a2cd
  Simon Ottenhaus authored 5 years ago
  
  b7a1a2cd
- Fix deactivation on missing library · bd6a121f
  Raphael Grimm authored 5 years ago
  
  bd6a121f
May 08, 2019
- adapted include · 470fe67d
  Mirko Wächter authored 5 years ago
  
  470fe67d
- Merge remote-tracking branch 'origin/armar6demo' into Ice3.7 · 34cdbb53
  Raphael Grimm authored 5 years ago
  
  34cdbb53
- Merge remote-tracking branch 'origin/master' into Ice3.7 · 23f7ff4f
  Raphael Grimm authored 5 years ago
  
  23f7ff4f
- Autoformat code · ad54eced
  Raphael Grimm authored 5 years ago
  
  ad54eced
- added separate inertia torque for testing · daf6e3bf
  Mirko Wächter authored 5 years ago
  
  daf6e3bf
May 07, 2019
- added filtering of velocity and acceleration to inverse dynamics calculation · 9ef620d6
  Mirko Wächter authored 5 years ago
  
  9ef620d6
May 06, 2019
- Merge remote-tracking branch 'origin/Ice3.7' into InverseDynamicsIce3.7 · 6f03a677
  Mirko Wächter authored 5 years ago
  
  6f03a677
- working version of inverse dynamics in RT loop · 3bb89298
  Mirko Wächter authored 5 years ago
  
  3bb89298
May 03, 2019
- added inverse dynamics to EtherCAT RT Control Thread · 27f4e239
  Mirko Wächter authored 5 years ago
  
  27f4e239
Apr 30, 2019
- added GraspCandidateObserver · 3b88fba9
  Simon Ottenhaus authored 5 years ago
  
  3b88fba9
- fixed typo · fab38f7d
  Simon Ottenhaus authored 5 years ago
  
  fab38f7d
- added interfaces for grasp candidate providers and observer · 197978e7
  Simon Ottenhaus authored 5 years ago
  
  197978e7
Apr 25, 2019
- changed debug output verbosity · 703047dc
  Simon Ottenhaus authored 6 years ago
  
  703047dc
Apr 24, 2019
- Merge branch 'DebugDrawerTopic' into 'Ice3.7' · b9f5d081
  Rainer Kartmann authored 6 years ago
  
  Debug drawer topic See merge request ArmarX/RobotAPI!46
  b9f5d081
- Merge branch 'Ice3.7' into DebugDrawerTopic · 81a91ee2
  Rainer Kartmann authored 6 years ago
  
  81a91ee2
- Fix issue with trailing slash · 3fa5bdc4
  Raphael Grimm authored 6 years ago
  
  3fa5bdc4
- Fix/add doc · 0ac2ef1a
  Rainer Kartmann authored 6 years ago
  
  0ac2ef1a
Apr 23, 2019
- Merge remote-tracking branch 'origin/master' into Ice3.7 · 88f102f8
  Raphael Grimm authored 6 years ago
  
  # Conflicts: # source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.cpp # source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h
  88f102f8
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · 8c734203
  Simon Ottenhaus authored 6 years ago
  
  8c734203
- added functions in DebugDrawerHelper · cb1e45fe
  Simon Ottenhaus authored 6 years ago
  
  cb1e45fe
- Add visu count to layer entry · e9df96a0
  Rainer Kartmann authored 6 years ago
  
  e9df96a0
- Merge branch 'Ice3.7' into DebugDrawerTopic · 29316d22
  Rainer Kartmann authored 6 years ago
  
  29316d22
Apr 19, 2019
- Use std::filesystem · 81829a48
  Raphael Grimm authored 6 years ago
  
  81829a48
Apr 12, 2019
- added point cloud and global enable in DebugDrawerHelper · c49a9674
  Simon Ottenhaus authored 6 years ago
  
  c49a9674
- fixed clearLayer for ColoredPointCloud · a9b7eba7
  Simon Ottenhaus authored 6 years ago
  
  a9b7eba7
Apr 09, 2019
- added DSController to RobotAPI · 0ede5fd2
  JeffGao authored 6 years ago
  
  0ede5fd2
Apr 08, 2019
- Ensure alignment · 6e4d6e38
  Raphael Grimm authored 6 years ago
  
  6e4d6e38