Commits · 47d9753f70f31de2943fe0687f2e43ab01894167 · Software / ArmarX / RobotAPI

Apr 18, 2018

Merge remote-tracking branch 'origin/master' into CustomVelocityMode · 47d9753f

Mirko Wächter authored 6 years ago

* origin/master:
  reverted cmake
  modified dmpcontroller
  Remove .orig files
  Fix dependency of RobotAPINjointControllers to MMM
  Use '#pragma once' instead of include guards
  modified dmpcontroller
  finished coding njointccdmpcontroller
  fixed building; added njointccdmpcontroller
  added njointtsdmpcontroller

47d9753f

Apr 17, 2018
- reverted cmake · 593ba3d5
  Armar6 authored 6 years ago
  
  593ba3d5
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · ada9cd8e
  You Zhou authored 6 years ago
  
  ada9cd8e
- modified dmpcontroller · 3ac0d8da
  You Zhou authored 6 years ago
  
  3ac0d8da
- Remove .orig files · a2843171
  Raphael Grimm authored 6 years ago
  
  a2843171
- Fix dependency of RobotAPINjointControllers to MMM · a86f9612
  Raphael Grimm authored 6 years ago
  
  a86f9612
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · f7c5f754
  Raphael Grimm authored 6 years ago
  
  f7c5f754
- Use '#pragma once' instead of include guards · 09cd7754
  Raphael Grimm authored 6 years ago
  
  09cd7754
- modified dmpcontroller · c5b20c58
  Armar6 authored 6 years ago
  
  c5b20c58
Apr 16, 2018
- finished coding njointccdmpcontroller · d3917c42
  You Zhou authored 6 years ago
  
  d3917c42
- fixed building; added njointccdmpcontroller · f1379d9c
  You Zhou authored 6 years ago
  
  f1379d9c
- added njointtsdmpcontroller · 0851ec83
  You Zhou authored 6 years ago
  
  0851ec83
Apr 12, 2018
- made velocity mode for kinematicunit configurable · 0e87721a
  Mirko Wächter authored 6 years ago
  
  0e87721a
Apr 11, 2018
- added a new jointdmpctrl with tripple-buffered control thread · 117dbb67
  You Zhou authored 6 years ago
  
  117dbb67
- modified njointtaskspacedmp · cff14f16
  Armar6 authored 6 years ago
  
  cff14f16
- modified the jsdmpctrl · 0d819c2b
  Armar6 authored 6 years ago
  
  0d819c2b
- put dmpcontroller to an another lib · 994451bf
  You Zhou authored 6 years ago
  
  994451bf
Apr 10, 2018
- modified jointspacedmp · 8a32cd17
  Armar6 authored 6 years ago
  
  8a32cd17
- fixed rtrun problem · 02dbc915
  Armar6 authored 6 years ago
  
  02dbc915
Apr 06, 2018
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · 461f1096
  You Zhou authored 7 years ago
  
  461f1096
- realized DMP realtime controller · 71570e65
  You Zhou authored 7 years ago
  
  71570e65
Apr 05, 2018
- removed debug output · 8b45065d
  armar6-user authored 7 years ago
  
  8b45065d
Apr 04, 2018
- added getPositionDiff and getOrientationDiff · 8eb05a3c
  armar6-user authored 7 years ago
  
  8eb05a3c
- added realtime dmp controller · 722cbc6f
  You Zhou authored 7 years ago
  
  722cbc6f
Mar 27, 2018
- added kp and kd for ActiveImpedanceControlTarget · 18e38b66
  Simon Ottenhaus authored 7 years ago
  
  18e38b66
Mar 17, 2018
- Merge branch 'code-cleanup' into 'master' · 8efbe782
  Raphael Grimm authored 7 years ago
  
  Code cleanup See merge request ArmarX/RobotAPI!37
  8efbe782
- Add redundant override to final since gcc -Wsuggest-override expects it · b26d1612
  Raphael Grimm authored 7 years ago
  
  b26d1612
- Add override to macro · 3aa3fb14
  Raphael Grimm authored 7 years ago
  
  3aa3fb14
Mar 16, 2018
- Add redundant override to final since gcc -Wsuggest-override expects it · 85e04601
  Raphael Grimm authored 7 years ago
  
  85e04601
- Add override to macros · 551a177e
  Raphael Grimm authored 7 years ago
  
  551a177e
- Add changes caused by calling clang-tidy in downstream projects · 936157e4
  Raphael Grimm authored 7 years ago
  
  936157e4
- Format code (astyle) · 480ff021
  Raphael Grimm authored 7 years ago
  
  480ff021
- Add override (clang-tidy modernize-use-override) · 4a686a39
  Raphael Grimm authored 7 years ago
  
  4a686a39
Mar 15, 2018
- added doc note · abef9ba4
  Armar6 authored 7 years ago
  
  abef9ba4
Mar 14, 2018
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · 4872fdde
  Armar6 authored 7 years ago
  
  4872fdde
- torquevelocity mode now inherits from torquecontrol · 895f1e33
  Armar6 authored 7 years ago
  
  895f1e33
Mar 07, 2018
- Merge branch 'ub18_robot_unit_gui_plugin' into 'master' · 9109c471
  Raphael Grimm authored 7 years ago
  
  Fix the RobotUnitGuiPlugin for Ubuntu 18 See merge request ArmarX/RobotAPI!36
  9109c471
- Fix the RobotUnitGuiPlugin for Ubuntu 18 · 23b21965
  Raphael Grimm authored 7 years ago
  
  23b21965
Mar 06, 2018
- Add includes · 7367ced3
  Raphael Grimm authored 7 years ago
  
  7367ced3
- Remove TYPEDEF_PTRS_SHARED from RobotUnit/util.h (it was moved to ManagedIceObject.h) · 76215e6a
  Raphael Grimm authored 7 years ago
  
  76215e6a