Commits · f65cc9d072f82d51f35505fd9159a70d95b2d76c · Software / ArmarX / RobotAPI · GitLab

Snippets Groups Projects

May 03, 2018
- Apply changes from 0e87721a ("made velocity... · f65cc9d0
  Raphael Grimm authored 6 years ago
  
  Apply changes from 0e87721a ("made velocity mode for kinematicunit configurable")
  f65cc9d0
May 02, 2018
- Apply changes from 32fcd837 (Change collision check for zero pose) · 9e88325c
  Raphael Grimm authored 6 years ago
  
  9e88325c
- Merge branch 'master' into RobotUnit_v3 · 9aeaa2bc
  Raphael Grimm authored 6 years ago
  
  9aeaa2bc
- Merge branch 'RobotUnit_v3' of https://gitlab.com/ArmarX/RobotAPI into RobotUnit_v3 · 806a6049
  Raphael Grimm authored 6 years ago
  
  806a6049
- Remove unnecessary locks from... · 4b28d704
  Raphael Grimm authored 6 years ago
  
  Remove unnecessary locks from RobotUnitModule::Devices::getNumberOfControlDevices/getNumberOfSensorDevices
  4b28d704
- Cleanup RobotUnitModule::Publisher (split publish into functions) · b44ae056
  Raphael Grimm authored 6 years ago
  
  b44ae056
May 01, 2018
- test force control bimanual · f08f5d48
  You Zhou authored 6 years ago
  
  f08f5d48
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · f9d827b4
  Mirko Wächter authored 6 years ago
  
  * 'master' of https://gitlab.com/ArmarX/RobotAPI: implemented bimanualccdmp impedance control added torque-based bimanual changed collision check for zero joint added limited velocities
  f9d827b4
- refactored HSV color utils · cbd04604
  Mirko Wächter authored 6 years ago
  
  cbd04604
Apr 30, 2018
- implemented bimanualccdmp impedance control · 05823e4c
  Armar6 authored 6 years ago
  
  05823e4c
- added torque-based bimanual · 68373a39
  Armar6 authored 6 years ago
  
  68373a39
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · a97c2959
  Armar6 authored 6 years ago
  
  a97c2959
- changed collision check for zero joint · 32fcd837
  Armar6 authored 6 years ago
  
  32fcd837
- added limited velocities · b1969e2a
  You Zhou authored 6 years ago
  
  b1969e2a
Apr 29, 2018
- added bimanual ccdmp · 835831b0
  You Zhou authored 6 years ago
  
  835831b0
Apr 28, 2018
- finished refactory of TaskSpaceDMP; added more functions · 8078ae03
  You Zhou authored 6 years ago
  
  8078ae03
- refactorized dmpcontroller · 2fee0e11
  You Zhou authored 6 years ago
  
  2fee0e11
Apr 25, 2018
- Fix RobotUnitGui hanging when RobotUnit is running on a different pc · f63f7261
  Raphael Grimm authored 6 years ago
  
  f63f7261
Apr 24, 2018
- Add more doxygen · 5f121f8d
  Raphael Grimm authored 6 years ago
  
  5f121f8d
- Make error output more verbose · b298c554
  Raphael Grimm authored 6 years ago
  
  b298c554
- Fix uninitialized member of ControlDevice and SensorDevice · 632b8480
  Raphael Grimm authored 6 years ago
  
  632b8480
- Reorder members of NJointController · d553fe7d
  Raphael Grimm authored 6 years ago
  
  d553fe7d
- Add doxygen · 63ef488c
  Raphael Grimm authored 6 years ago
  
  63ef488c
- Fix an erroneous typedef of shared ptrs for RobotUnitModule::Devices · b44f852c
  Raphael Grimm authored 6 years ago
  
  b44f852c
- Add doxygen · 01f89f3d
  Raphael Grimm authored 6 years ago
  
  01f89f3d
- Remove guards from ModuleBase::onConnectComponent and ModuleBase::onDisconnectComponent · 37c10dca
  Raphael Grimm authored 6 years ago
  
  37c10dca
- Prevent calls to addJointController after the ControlDevice was added to a RobotUnit · d3343dd1
  Raphael Grimm authored 6 years ago
  
  d3343dd1
- Make Sensor- and ControlDevices aware of their owner · 3d1abfa0
  Raphael Grimm authored 6 years ago
  
  3d1abfa0
- fixed njointtsdmpcontroller · 27f8b3df
  You Zhou authored 6 years ago
  
  27f8b3df
- Fix swapped function names · 797baa19
  Raphael Grimm authored 6 years ago
  
  797baa19
- Change RobotUnitModule::Devices to use its own mutexes (also check the... · acf18a71
  Raphael Grimm authored 6 years ago
  
  Change RobotUnitModule::Devices to use its own mutexes (also check the RobotUnit's state more often)
  acf18a71
- Make error output more verbose · 10ad5470
  Raphael Grimm authored 6 years ago
  
  10ad5470
- Add doxygen · 4770396e
  Raphael Grimm authored 6 years ago
  
  4770396e
Apr 23, 2018
- Move loading the robot from RobotUnitModule::RobotData::_preOnInitRobotUnit to... · 26983422
  Raphael Grimm authored 6 years ago
  
  Move loading the robot from RobotUnitModule::RobotData::_preOnInitRobotUnit to RobotUnitModule::RobotData::_initVirtualRobot and call this function in RobotUnitModule::ModuleBase::onInitRobotUnit Change other components to load the robot earlier
  26983422
- Apply astyle formatting · 8f071fd9
  Raphael Grimm authored 6 years ago
  
  8f071fd9
- Add debug output · 573fa473
  Raphael Grimm authored 6 years ago
  
  573fa473
- Ignore temporary files when searching for RobotUnitModules · 303d8e29
  Raphael Grimm authored 6 years ago
  
  303d8e29
Apr 22, 2018
- Started cleanup for NJointController (added doxygen, grouped methods, moved inline code to ipp)0 · bbf0799f
  Raphael Grimm authored 6 years ago
  
  bbf0799f
- Remove commented out code · 8e7fb9c7
  Raphael Grimm authored 6 years ago
  
  8e7fb9c7
- Remove accidentally added parentheses · 43625c08
  Raphael Grimm authored 6 years ago
  
  43625c08