Commits · 69b769ef1c6a349fdf608505c98681c6d310469f · Software / ArmarX / RobotAPI · GitLab

Snippets Groups Projects

Jul 31, 2019
- add NJointHolonomicPlatformGlobalPositionController · 69b769ef
  Markus Grotz authored 5 years ago
  
  69b769ef
Jul 25, 2019
- avoid potential undefined behaviour · b0320812
  You Zhou authored 5 years ago
  
  b0320812
Jul 22, 2019
- Merge branch 'Ice3.7' of https://gitlab.com/ArmarX/RobotAPI into Ice3.7 · db8443fc
  Mirko Wächter authored 5 years ago
  
  db8443fc
- extensions for multi robot setup · 0cefa8d9
  Mirko Wächter authored 5 years ago
  
  0cefa8d9
Jul 18, 2019
- Add config struct for CartesianWaypointController · 055c768d
  Raphael Grimm authored 5 years ago
  
  055c768d
- Use Eigen::Ref · db5e32e5
  Raphael Grimm authored 5 years ago
  
  db5e32e5
- Run astlye · 5e6100b2
  Raphael Grimm authored 5 years ago
  
  5e6100b2
- Move code to ArmarXCore · 7399b2ed
  Raphael Grimm authored 5 years ago
  
  7399b2ed
- Improve output · a3024bac
  Raphael Grimm authored 5 years ago
  
  a3024bac
- Change NJointController::useSynchronizedRtRobot to return the rtRobot · 4d17432a
  Raphael Grimm authored 5 years ago
  
  4d17432a
Jul 14, 2019
- Refactoring · 97048062
  Mirko Wächter authored 5 years ago
  
  97048062
Jul 13, 2019
- compile fix · 797bd950
  Mirko Wächter authored 5 years ago
  
  797bd950
- Merge remote-tracking branch 'origin/SecondHandsDemo' into Ice3.7 · f8e880ad
  Mirko Wächter authored 5 years ago
  
  # Conflicts: # source/RobotAPI/libraries/ArmarXEtherCAT/EtherCAT.cpp
  f8e880ad
Jul 12, 2019
- Merge branch 'SecondHandsDemo' of https://gitlab.com/ArmarX/RobotAPI into SecondHandsDemo · d7239998
  SecondHands Demo authored 5 years ago
  
  d7239998
- EtherCAT: Report error counter when bus is dieing · 5c1cc67c
  SecondHands Demo authored 5 years ago
  
  5c1cc67c
Jul 10, 2019
- Merge branch 'Ice3.7' of https://gitlab.com/ArmarX/RobotAPI into Ice3.7 · 801c2573
  Mirko Wächter authored 5 years ago
  
  # Conflicts: # source/RobotAPI/components/units/RobotUnit/test/BasicControllerTest.cpp
  801c2573
- SOEM include path is set to /include/soem/, so we need to include the files... · 71b6fc9a
  Fabian Paus authored 5 years ago
  
  SOEM include path is set to /include/soem/, so we need to include the files without the soem prefix otherwise we rely on the header files being in /usr/include
  71b6fc9a
Jul 09, 2019

Run astyle · e66d880f
Raphael Grimm authored 5 years ago

e66d880f
Fix signed unsigned compare · 75efa0c2
Raphael Grimm authored 5 years ago

75efa0c2

Merge remote-tracking branch 'origin/SecondHandsDemo' into Ice3.7 · d098a6e5

Kevin Hitzler authored 5 years ago

Conflicts:
source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTaskSpaceImpedanceController.h
source/RobotAPI/components/units/RobotUnit/test/BasicControllerTest.cpp
source/RobotAPI/libraries/ArmarXEtherCAT/EtherCATRTUnit.cpp
source/RobotAPI/libraries/DSControllers/CMakeLists.txt
source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointTaskSpaceImpedanceDMPController.h
source/RobotAPI/libraries/core/CMakeLists.txt

d098a6e5

Jul 08, 2019
- Merge branch 'Ice3.7' of https://gitlab.com/ArmarX/RobotAPI into Ice3.7 · 69e5f02b
  Mirko Wächter authored 5 years ago
  
  69e5f02b
Jul 04, 2019
- Add possibility to define the default layer visibility per layer · b808e447
  Adrian Knobloch authored 5 years ago
  
  b808e447
Jul 02, 2019
- Merge branch 'Ice3.7' of https://gitlab.com/ArmarX/RobotAPI into Ice3.7 · 925cedbb
  Mirko Wächter authored 5 years ago
  
  925cedbb
Jun 30, 2019
- GraspCandidateObserver: fixed objectType datafiled · 5d50d016
  Simon Ottenhaus authored 5 years ago
  
  5d50d016
Jun 29, 2019
- Robot State Component: getLocalRobot: added performInitialRobotSync = true,... · f1e30d6d
  Simon Ottenhaus authored 5 years ago
  
  Robot State Component: getLocalRobot: added performInitialRobotSync = true, that syncs the robot initially
  f1e30d6d
Jun 28, 2019
- GraspCandidate: added groupNr, providerName · fd98c390
  Simon Ottenhaus authored 5 years ago
  
  fd98c390
- GraspCandidateObserver: changed setSelectedCandidate -> setSelectedCandidates · ac465b1c
  Simon Ottenhaus authored 5 years ago
  
  ac465b1c
- DebugDrawerHelper: added option to use without robot for global frames · c68d8ca9
  Simon Ottenhaus authored 5 years ago
  
  c68d8ca9
Jun 27, 2019
- DebugDrawerHelper: fixed missing layerName · 61e8b1dc
  Simon Ottenhaus authored 5 years ago
  
  61e8b1dc
Jun 26, 2019
- added DebugDrawerHelper::Colors · a09241ed
  Simon Ottenhaus authored 5 years ago
  
  a09241ed
- added GraspCandidateObserver::setSelectedCandidate · f3efdf89
  Simon Ottenhaus authored 5 years ago
  
  f3efdf89
- GraspCandidates: added segmentationLabelID, graspTrajectoryName, robotPose · f893d627
  Simon Ottenhaus authored 5 years ago
  
  f893d627
- RobotNameHelper: added hand related functions · 18916380
  Simon Ottenhaus authored 5 years ago
  
  18916380
Jun 24, 2019
- added SimpleDiffIK::CalculateReachability · 83d0257a
  Simon Ottenhaus authored 5 years ago
  
  83d0257a
Jun 23, 2019
- Merge branch 'SecondHandsDemo' of https://gitlab.com/ArmarX/RobotAPI into SecondHandsDemo · e43a3027
  SecondHands Demo authored 5 years ago
  
  e43a3027
- DS controller fixes · 55f0bdf4
  SecondHands Demo authored 5 years ago
  
  55f0bdf4
- added check for bus errors · 44b53a69
  SecondHands Demo authored 5 years ago
  
  44b53a69
- kitgripper: slowly reduce pwm in emergency stop controller · 4efe1e23
  SecondHands Demo authored 5 years ago
  
  4efe1e23
- filtered position target pwm to reduce noise · dfd4a120
  SecondHands Demo authored 5 years ago
  
  dfd4a120
- kit gripper: dont set pwm to zero at activation of vel/pos controller · 27f63078
  SecondHands Demo authored 5 years ago
  
  27f63078