Commits · f50310e0ec1e398451b760734c2a06d05b483ac6 · Lennard Hofmann / RobotAPI

Apr 12, 2017

Merge remote-tracking branch 'remotes/origin/Armar6RT' into Armar6RT_raphael_wip · f50310e0

Conflicts:
	source/RobotAPI/applications/CMakeLists.txt
	source/RobotAPI/components/units/CMakeLists.txt
	source/RobotAPI/drivers/CMakeLists.txt
	source/RobotAPI/interface/CMakeLists.txt

f50310e0

Apr 06, 2017

Merge remote-tracking branch 'remotes/origin/Armar6RT' into GamepadDriver · d3c690f2

Markus Swarowsky authored 7 years ago

Conflicts:
	source/RobotAPI/applications/CMakeLists.txt
	source/RobotAPI/components/units/CMakeLists.txt
	source/RobotAPI/drivers/CMakeLists.txt
	source/RobotAPI/interface/CMakeLists.txt

d3c690f2

Mar 29, 2017
- current state · 6ccc7e32
  Raphael authored 7 years ago
  
  6ccc7e32
Mar 20, 2017
- config changes to run the gamepad · 09d2eb27
  Markus Swarowsky authored 7 years ago
  
  09d2eb27
Mar 14, 2017
- added a control mode + target for holonomic platforms in velocity control · c333719e
  Raphael authored 8 years ago
  
  c333719e
- merged the two libs dealing with our rt controllers into one lib (RTRobotUnit) · 30bd602f
  Raphael authored 8 years ago
  
  controllers now have their own subfolder in the lib
  30bd602f
Mar 13, 2017

Merge branch 'master' into Armar6RT · d0c021ae

Raphael authored 8 years ago

Conflicts:
	source/RobotAPI/applications/CMakeLists.txt
	source/RobotAPI/components/units/CMakeLists.txt
	source/RobotAPI/drivers/CMakeLists.txt
	source/RobotAPI/interface/CMakeLists.txt

d0c021ae

Mar 10, 2017
- fixed everything to use the Gamepad to control the ARMAR-6-SH Platform · 808b15d7
  Markus Swarowsky authored 8 years ago
  
  808b15d7
- Hokuyo: Changed name of GUI plugin · 79beda29
  Fabian Paus authored 8 years ago
  
  79beda29
- added gamepad control · 4361712b
  Pascal Weiner authored 8 years ago
  
  4361712b
- Hokuyo: Test with real sensor · 42913d22
  Fabian Paus authored 8 years ago
  
  42913d22
- Hokuyo: Fixed application (include needed) · 64572b7e
  Fabian Paus authored 8 years ago
  
  64572b7e
- Hokuyo: Fixed finding URG library · 11b4d018
  Fabian Paus authored 8 years ago
  
  11b4d018
- added GamepadControlUnit · 8a16b1f8
  Simon Ottenhaus authored 8 years ago
  
  8a16b1f8
- new gamepad driver and observer for the logitech f170 gamepad · ebf6aa41
  Pascal Weiner authored 8 years ago
  
  ebf6aa41
Mar 09, 2017
- Merge branch 'Armar6RT' into GamepadDriver · 83709e3a
  Pascal Weiner authored 8 years ago
  
  83709e3a
- added GamepadUnit · e54d6881
  Simon Ottenhaus authored 8 years ago
  
  e54d6881
- Hokuyo: Improved visualisation · 4c43f7c6
  Fabian Paus authored 8 years ago
  
  4c43f7c6
- Hokuyo: Added simple GUI plugin · 3f64986f
  Fabian Paus authored 8 years ago
  
  3f64986f
- Hokuyo: Add plausability checks for distance values · d865b5f2
  Fabian Paus authored 8 years ago
  
  d865b5f2
- Hokuyo: Added angle offset · b453cdc7
  Fabian Paus authored 8 years ago
  
  b453cdc7
- Hokuyo: Implemented using the URG driver (added dummy implementation) · c50a6037
  Fabian Paus authored 8 years ago
  
  c50a6037
- Hokuyo: Rename interface to LaserScannerUnit · 2507da1c
  Fabian Paus authored 8 years ago
  
  2507da1c
- HokuyoLaserUnit: Created unit · f71ac5a5
  Fabian Paus authored 8 years ago
  
  f71ac5a5
Mar 08, 2017
- fixed include path · c9e0b22f
  Simon Ottenhaus authored 8 years ago
  
  c9e0b22f
- Merge branch 'master' into SensorPackage · ba45b55b
  Simon Ottenhaus authored 8 years ago
  
  Conflicts: source/RobotAPI/applications/CMakeLists.txt source/RobotAPI/components/units/CMakeLists.txt source/RobotAPI/drivers/CMakeLists.txt source/RobotAPI/interface/CMakeLists.txt
  ba45b55b
- added OptoForce daq calibration · ddb45457
  Simon Ottenhaus authored 8 years ago
  
  ddb45457
- changed include · 98f6609a
  Simon Ottenhaus authored 8 years ago
  
  98f6609a
- Merge branch 'master' into OptoForceUnit · 3da48723
  Simon Ottenhaus authored 8 years ago
  
  3da48723
- fixed include guards · fdf4ce06
  Simon Ottenhaus authored 8 years ago
  
  fdf4ce06
- Level 1 Controller interface for the platfrom velocity controler · b2e45173
  Markus Swarowsky authored 8 years ago
  
  b2e45173
Mar 07, 2017
- Merge branch 'master' into SensorPackage · ffd751df
  andreeatulbure authored 8 years ago
  
  ffd751df
- added linear acceleration datafield · 060e6bbf
  andreeatulbure authored 8 years ago
  
  060e6bbf
Mar 06, 2017
- added OptoForceUnitObserver · 54f38514
  Simon Ottenhaus authored 8 years ago
  
  54f38514
- added linear acceleration · 57efdfd4
  andreeatulbure authored 8 years ago
  
  57efdfd4
Mar 03, 2017
- added OptoForce OMD driver · 2eadcae0
  Simon Ottenhaus authored 8 years ago
  
  2eadcae0
Mar 02, 2017
- target get set to 0 at activation of pass through controller · c05391ed
  Markus Swarowsky authored 8 years ago
  
  also added PlatformTarget
  c05391ed
- added angular acceleration and maxSamples as proprieties · d9426456
  andreeatulbure authored 8 years ago
  
  d9426456
- added pressureRate and proprieties for calibration · a1e38e9f
  andreeatulbure authored 8 years ago
  
  a1e38e9f
- extended trajectory test · 91c974d6
  Mirko Wächter authored 8 years ago
  
  91c974d6