Commits · 2c59d291183feb628db92cbc1e29c47a4085aab0 · Florian Leander Singer / RobotAPI

May 05, 2017

Merge branch 'master' into Armar6RT · 2c59d291

Simon Ottenhaus 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

2c59d291

Merge branch 'master' into MetaWearIMU · 7739ede9
Simon Ottenhaus authored 7 years ago

7739ede9

Apr 26, 2017
- Fix for non convex polygons · 485005aa
  Nikolaus Vahrenkamp authored 7 years ago
  
  485005aa
- Merge branch 'master' into Armar6RT · 8f9d921b
  Raphael authored 7 years ago
  
  8f9d921b
Apr 21, 2017
- edited the level 1 holonomic platform velocity pass through controller to be... · 80d43c41
  Markus Swarowsky authored 7 years ago
  
  edited the level 1 holonomic platform velocity pass through controller to be used with the real platform
  80d43c41
Apr 20, 2017
- made c99 comapatible · 48e4f302
  Eren Aksoy authored 7 years ago
  
  48e4f302
- Update Pose.h: added space for compatibility · 1ea82b31
  Mirko Wächter authored 7 years ago
  
  1ea82b31
Apr 19, 2017

apply autoformatting · 8e477923
Raphael authored 7 years ago
```
remove leftovers from a merge conflict (pushed .orig files)
```
8e477923

Merge branch 'master' into Armar6RT · bee4ba5c

Raphael authored 7 years ago

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

bee4ba5c

Apr 15, 2017
- made kinematicunit use less resources (limit update frequency) and slider joint compatible · 10e7939b
  Mirko Wächter authored 7 years ago
  
  10e7939b
- set cmake policy for newer versions · 6b0dcd5e
  Mirko Wächter authored 7 years ago
  
  6b0dcd5e
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · ff4c7588
  Mirko Wächter authored 7 years ago
  
  ff4c7588
- fixed include · 9c5f8b8b
  Mirko Wächter authored 7 years ago
  
  9c5f8b8b
- fixed shadowed function · 873b194b
  Mirko Wächter authored 7 years ago
  
  873b194b
- include optimization · 475aad43
  Mirko Wächter authored 7 years ago
  
  475aad43
- typo · 7c0f49c4
  Mirko Wächter authored 7 years ago
  
  7c0f49c4
- variant info file contains now the path the observerfactory to reduce includes · 557536c9
  Mirko Wächter authored 7 years ago
  
  557536c9
Apr 13, 2017
- added MetaWearIMU driver · cde797f5
  Lukas Kaul authored 7 years ago
  
  cde797f5
Apr 12, 2017
- Merge remote-tracking branch 'remotes/origin/Armar6RT' into Armar6RT_raphael_wip · f50310e0
  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
  f50310e0
- added MetaWear Interface · 4db73d5e
  Simon Ottenhaus authored 7 years ago
  
  4db73d5e
Apr 11, 2017
- version bump to v0.9.2 · 759179e8
  Mirko Wächter authored 7 years ago
  
  View commits for tag v0.9.2 v0.9.2
  
  759179e8
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · 17dd4aca
  armar4-user authored 7 years ago
  
  17dd4aca
- removed unused variable · 5b77386b
  Mirko Wächter authored 7 years ago
  
  5b77386b
- fixed cloning of remote robot · 4edaa536
  Mirko Wächter authored 7 years ago
  
  4edaa536
Apr 10, 2017
- ft obs: creating real local robot clone from file · e96d3060
  Mirko Wächter authored 7 years ago
  
  e96d3060
- deb package requires now a fixed simox version instead of a minimum version · 3242b0a0
  Mirko Wächter authored 7 years ago
  
  3242b0a0
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · fdf40f7c
  Mirko Wächter authored 7 years ago
  
  fdf40f7c
Apr 06, 2017

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

Markus Swarowsky 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

d3c690f2

Mar 29, 2017
- current state · 6ccc7e32
  Raphael authored 8 years ago
  
  6ccc7e32
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · 33076ba0
  armar4-user authored 8 years ago
  
  33076ba0
Mar 27, 2017
- Update CMakeLists.txt · 05096865
  Mirko Wächter authored 8 years ago
  
  05096865
- Revert "Revert "adjustment to simox fixes"" · 24474193
  Mirko Wächter authored 8 years ago
  
  This reverts commit 0e331d7e
  24474193
- adapted offset of OptoForce sensors of KIT-EXO-2 · fdd34497
  Isabel Ehrenberger authored 8 years ago
  
  fdd34497
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · 9f24089a
  Isabel Ehrenberger authored 8 years ago
  
  9f24089a
- added calibration for exo opto force sensors and mmm recording support · c10d9bb1
  Isabel Ehrenberger authored 8 years ago
  
  c10d9bb1
- Laser scanner GUI: fixed hanging GUI problem · 36d92db8
  Fabian Paus authored 8 years ago
  
  36d92db8
- Revert "Revert "adjustment to simox fixes"" · 9714d5f0
  Mirko Wächter authored 8 years ago
  
  This reverts commit 0e331d7e.
  9714d5f0
- Revert "adjustment to simox fixes" · 0e331d7e
  Mirko Wächter authored 8 years ago
  
  This reverts commit c0f68c9e.
  0e331d7e
Mar 26, 2017

Merge branch 'heatMap' into 'master' · b7321611

Mirko Wächter authored 8 years ago

Add possibility to draw the debug layer line set using heat map colors

See merge request !23

b7321611

Mar 24, 2017
- Add possibility to draw the debug layer line set using heat map colors · 74eb77b5
  Adrian Knobloch authored 8 years ago
  
  74eb77b5