Commits · 2c045281fa3e0fbfd94242c3687eb38bc234bb96 · Software / ArmarX / RobotAPI

Jan 19, 2018
- Merge branch 'ubuntu_17_10' into 'master' · 2c045281
  Raphael Grimm authored 7 years ago
  
  Make armarx build with ubuntu 17, qt5 and ice 3.6 See merge request ArmarX/RobotAPI!35
  2c045281
Jan 11, 2018
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · 2f1153ef
  Raphael Grimm authored 7 years ago
  
  2f1153ef
Jan 10, 2018
- TCPControlUnit: Make the differential IK parameter lambda configurable (needed... · 87b5f201
  Fabian Paus authored 7 years ago
  
  TCPControlUnit: Make the differential IK parameter lambda configurable (needed for Armar3 to restore old behavior)
  87b5f201
Jan 09, 2018
- Add a PropagateConst typedef to the macro TYPEDEF_PTRS_SHARED · 68983e7e
  Raphael Grimm authored 7 years ago
  
  68983e7e
- Make RobotUnit::getControlDevicesome const correct and add override keyword · 69a393e7
  Raphael Grimm authored 7 years ago
  
  69a393e7
- Add iterators to KeyValueVector · a10f3331
  Raphael Grimm authored 7 years ago
  
  a10f3331
Jan 08, 2018
- Merge branch 'master' into ubuntu_17_10 · 4ec49338
  Raphael Grimm authored 7 years ago
  
  4ec49338
Jan 06, 2018
- fixed variant info · 1010936e
  Mirko Wächter authored 7 years ago
  
  1010936e
Jan 05, 2018
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · 44a4db58
  armar6a-demo authored 7 years ago
  
  44a4db58
- added LinearizeAngularTrajectory · 63fbcb93
  armar6a-demo authored 7 years ago
  
  63fbcb93
- renamed trajectorycontroller · e2fb677b
  armar6a-demo authored 7 years ago
  
  e2fb677b
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · d7caacee
  Armar6Demo authored 7 years ago
  
  d7caacee
- relaxed RT logging performance check since it was spamming on the RT pc due to overload · 9501a710
  Armar6Demo authored 7 years ago
  
  9501a710
- re-fixed merge conflict · 389e8ce7
  Armar6Demo authored 7 years ago
  
  389e8ce7
- added support for limitless joints · a2411546
  armar6a-demo authored 7 years ago
  
  a2411546
Jan 04, 2018
- deactivated gauss filter in trajectory controller · e8235755
  Mirko Wächter authored 7 years ago
  
  e8235755
- work on rt trajectory controller · 2cd1ac28
  Mirko Wächter authored 7 years ago
  
  2cd1ac28
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · f5b5f90b
  Armar6Demo authored 7 years ago
  
  Conflicts: source/RobotAPI/components/units/RobotUnit/SensorValues/SensorValueIMU.h
  f5b5f90b
- Pass qt resources to armarx_gui_library · 52aeedd7
  Raphael Grimm authored 7 years ago
  
  52aeedd7
Jan 03, 2018
- increased min. simox version · 62e4386b
  Mirko Wächter authored 7 years ago
  
  62e4386b
- Fix a few error for ubuntu 17.10 · 1fd5ea2b
  Raphael Grimm authored 7 years ago
  
  1fd5ea2b
- Apply astyle formatting · 6b343646
  Raphael Grimm authored 7 years ago
  
  6b343646
- Fix widget plugins for qt5 · c136a291
  Raphael Grimm authored 7 years ago
  
  c136a291
- Fix includes for qt5 and ubuntu 17.10 · 17d77e04
  Raphael Grimm authored 7 years ago
  
  17d77e04
- Remove unnecessary package dependency · 8a542919
  Raphael Grimm authored 7 years ago
  
  8a542919
- Change cmake to use custom qt macros and remove unnecessary calls · ec3e5b97
  Raphael Grimm authored 7 years ago
  
  ec3e5b97
- Cleanup cmake · ce4a4409
  Raphael Grimm authored 7 years ago
  
  ce4a4409
- Add SYSTEM flag to include_directories to suppress warnings from external projects · a66cc50f
  Raphael Grimm authored 7 years ago
  
  a66cc50f
- Assert simox is using the same version of qt · c0b44513
  Raphael Grimm authored 7 years ago
  
  c0b44513
Jan 01, 2018
- added flags for tcp and trajectory control subunit · 2de6cc57
  Mirko Wächter authored 7 years ago
  
  2de6cc57
- RobotUnit: Unit properties did not show up in help screen · 454fe4d3
  Mirko Wächter authored 7 years ago
  
  454fe4d3
- commented debug output · 44b645f0
  Mirko Wächter authored 7 years ago
  
  44b645f0
- added missing destroy function to ice interface of robotstatecomponent · 476c2cb7
  Mirko Wächter authored 7 years ago
  
  476c2cb7
- fixed calculation of velocities in robotstateobserver · 94810eb8
  Mirko Wächter authored 7 years ago
  
  94810eb8
Dec 20, 2017

moved starting of self collision avoidance and rt logging to... · 64be9af0

moved starting of self collision avoidance and rt logging to "finishUnitInitialization" since it takes to long to do it the in the initRThread() function

64be9af0

Dec 19, 2017
- Add check for nan to PositionThroughVelocityControllerWithAccelerationBounds::validParameters · 27279d4a
  Raphael Grimm authored 7 years ago
  
  27279d4a
- Apply astyle formatting to RobotUnit/BasicControllers.cpp · 1803bfce
  Raphael Grimm authored 7 years ago
  
  1803bfce
Dec 18, 2017
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · 384b1b15
  Raphael Grimm authored 7 years ago
  
  384b1b15
- Make some variables in RobotUnit private · 94f1a641
  Raphael Grimm authored 7 years ago
  
  94f1a641
- Fix logging macros for namespaces other than armarx · d88acb2e
  Raphael Grimm authored 7 years ago
  
  d88acb2e