Commits · 4617e18a2d8effe75982f1475c5e08d82fdf5c31 · Software / ArmarX / RobotAPI · GitLab

Snippets Groups Projects

Feb 05, 2019
- Merge remote-tracking branch 'origin/IMAGINERefactoring' into ImagineTest · 4617e18a
  ArmarX User authored 6 years ago
  
  4617e18a
- moved code from ImagineRT to RobotAPI to support new ARMAR-6 Head · 691e0e39
  Mirko Wächter authored 6 years ago
  
  691e0e39
- added zerotorque mode · a00d18db
  ArmarX User authored 6 years ago and Mirko Wächter committed 6 years ago
  
  a00d18db
- added zerotorque mode · 60f8fb6a
  ArmarX User authored 6 years ago
  
  60f8fb6a
Feb 04, 2019
- EtherCATRTUnit: Fixes for KIT Gripper · 91531ba7
  armarx-user authored 6 years ago and Mirko Wächter committed 6 years ago
  
  91531ba7
- Merge branch 'master' into IMAGINERefactoring · aee965ed
  Mirko Wächter authored 6 years ago
  
  aee965ed
- fixed basiccontroller test plotting · 5800a61e
  Mirko Wächter authored 6 years ago
  
  5800a61e
- EtherCATRTUnit: Fixes for KIT Gripper · b96ed98f
  armarx-user authored 6 years ago
  
  b96ed98f
Jan 18, 2019
- Merge branch 'Ice3.7' of https://gitlab.com/ArmarX/RobotAPI into Ice3.7 · badc3001
  armarx-user authored 6 years ago
  
  badc3001
Jan 15, 2019
- Merge branch 'cherry-pick-7648c4e0 ' into 'master' · 9bc9bf42
  Mirko Wächter authored 6 years ago
  
  Fix ControlThreadOutputBuffer copy ctor to also copy values Closes #12 See merge request ArmarX/RobotAPI!45
  9bc9bf42
- Fix ControlThreadOutputBuffer copy ctor to also copy values · 7ce76fd8
  Raphael Grimm authored 6 years ago and Mirko Wächter committed 6 years ago
  
  (cherry picked from commit 7648c4e0)
  7ce76fd8
Jan 14, 2019
- Fix ControlThreadOutputBuffer copy ctor to also copy values · 7648c4e0
  Raphael Grimm authored 6 years ago
  
  7648c4e0
- Modernize code and add comments · 0d8e3677
  Raphael Grimm authored 6 years ago
  
  0d8e3677
- Only print statistics about lost messages when at least one message was logged · 45657994
  Raphael Grimm authored 6 years ago
  
  45657994
- Merge remote-tracking branch 'origin/master' into Ice3.7 · 885939e0
  Raphael Grimm authored 6 years ago
  
  885939e0
Jan 11, 2019
- Fixed Logging::startRtLoggingWithAliasNames null pointer issue · e11f3792
  Kevin Hitzler authored 6 years ago
  
  e11f3792
Jan 07, 2019
- Update GuiPlugins.dox · 98267a21
  Mirko Wächter authored 6 years ago
  
  98267a21
Dec 18, 2018
- Revert "SpeechObserver observers now also all recognized text" · f59bf5fe
  armar6-user authored 6 years ago
  
  This reverts commit 2a8ffa53.
  f59bf5fe
- Merge remote-tracking branch 'origin/master' into Ice3.7 · 29fb276c
  Raphael Grimm authored 6 years ago
  
  # Conflicts: # source/RobotAPI/components/RobotHealth/RobotHealth.cpp # source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleControlThread.cpp
  29fb276c
- fixed typo · dd773cb1
  Simon Ottenhaus authored 6 years ago
  
  dd773cb1
Dec 17, 2018
- Regex: switch to boost... · 90b53e52
  Fabian Paus authored 6 years ago
  
  90b53e52
- RobotHealth: Fix regex · 80f8e665
  Fabian Paus authored 6 years ago
  
  80f8e665
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · 5beccd92
  Fabian Paus authored 6 years ago
  
  5beccd92
- RobotHealth: Clean up names for speech output · 08810b63
  Fabian Paus authored 6 years ago
  
  08810b63
- initial delay · f5c41d93
  Simon Ottenhaus authored 6 years ago
  
  f5c41d93
- minimum report interval · 06fc4f52
  Simon Ottenhaus authored 6 years ago
  
  06fc4f52
- speech output is configurable · b6dc3412
  Simon Ottenhaus authored 6 years ago
  
  b6dc3412
- speech debug output · 167f7fe7
  Simon Ottenhaus authored 6 years ago
  
  167f7fe7
- added RobotHealthHeartbeatArgs · a43a133f
  Simon Ottenhaus authored 6 years ago
  
  a43a133f
- added setMaximumCycleTime · c29929c0
  Simon Ottenhaus authored 6 years ago
  
  c29929c0
- heartbeat: Fix topic name · 042103f8
  armar6-user@kit.edu authored 6 years ago
  
  042103f8
- added reconnect for HokuyoLaserUnit · 8047c50d
  Simon Ottenhaus authored 6 years ago
  
  8047c50d
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · fbd674e3
  Simon Ottenhaus authored 6 years ago
  
  fbd674e3
- added heartbeat · 8365277a
  Simon Ottenhaus authored 6 years ago
  
  8365277a
- NJointTaskSpaceImpedanceDMPController · fa5c1ff5
  Armar6 authored 6 years ago
  
  fa5c1ff5
- Merge branch 'master' of gitlab.com:ArmarX/RobotAPI · cf6324ef
  Armar6 authored 6 years ago
  
  Conflicts: source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.cpp
  cf6324ef
Dec 16, 2018
- Merge remote-tracking branch 'origin/IMAGINERefactoring' into Ice3.7 · 62f7b2da
  armarx-user authored 6 years ago
  
  62f7b2da
- PIDController: added conditional integral based on error value · 90d80e0b
  Mirko Wächter authored 6 years ago and Mirko Wächter committed 6 years ago
  
  (cherry picked from commit 1d185911)
  90d80e0b
- PIDController: added conditional integral based on error value · 1d185911
  Mirko Wächter authored 6 years ago
  
  1d185911
Dec 15, 2018
- Added access to owner class for JointControllers · d1e7bfed
  armarx-user authored 6 years ago and Mirko Wächter committed 6 years ago
  
  d1e7bfed