Commits · 9947325ef2f04bbc6eb76eed7e129f9432815230 · Software / ArmarX / RobotAPI

Dec 05, 2017
- adds possibility to show trajectory only as a preview to TrajectoryControllerSubUnit · 9947325e
  Stefan Reither authored 7 years ago
  
  9947325e
Nov 16, 2017
- add looping to TrajectoryControllerSubUnit · b6b84d0f
  Stefan Reither authored 7 years ago
  
  b6b84d0f
- handle the case that controller is running without trajectory set · f3c5643a
  Stefan Reither authored 7 years ago
  
  f3c5643a
- redesign to ensure a valid and correct TrajectoryNJointController at any · 8ed66421
  Stefan Reither authored 7 years ago
  
  given moment of object existence
  8ed66421
Nov 15, 2017

Merge branch 'TCPSubUnit' of https://gitlab.com/ArmarX/RobotAPI into TCPSubUnit · 3f32d65d
Stefan Reither authored 7 years ago
```
Conflicts:
	source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTCPController.h
```
3f32d65d

Merge branch 'master' into TCPSubUnit · b53cb2be

Stefan Reither authored 7 years ago

Conflicts:
	source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTCPController.cpp
	source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTCPController.h

b53cb2be

removed output · fc1cfa70
Mirko Wächter authored 7 years ago

fc1cfa70

Merge branch 'master' into TCPSubUnit · d6e6111e

Mirko Wächter authored 7 years ago

Conflicts:
	source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTCPController.cpp
	source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointTCPController.h

d6e6111e

Nov 14, 2017
- fix getting end time and current time of trajectoryControllerSubUnit · 92250590
  Stefan Reither authored 7 years ago
  
  92250590
- add locks · d65253d2
  Stefan Reither authored 7 years ago
  
  d65253d2
- correct predefined NJointTrajectoryControllerConfig values · da06b6de
  Stefan Reither authored 7 years ago
  
  da06b6de
Nov 10, 2017
- added angle mod function · 2b05557d
  Armar6Demo authored 7 years ago
  
  2b05557d
- added default value for platform orientation · 6cf3d9d3
  Armar6Demo authored 7 years ago
  
  6cf3d9d3
- fixed config of tcp controller · f1fae491
  Armar6Demo authored 7 years ago
  
  f1fae491
- fix missing assignment of locks to local variables · cda8b82f
  Stefan Reither authored 7 years ago
  
  cda8b82f
- remove request/release functionality in tcpcontrolsubunit since it has no purpose here · 053ebd31
  Stefan Reither authored 7 years ago
  
  053ebd31
- add functionality for request and release and allow for missing tcpName · 210f631c
  Stefan Reither authored 7 years ago
  
  210f631c
- fix seg fault · 38760e9c
  Stefan Reither authored 7 years ago
  
  38760e9c
- added hand state to info label in hand unit gut · ac8b88aa
  Armar6Demo authored 7 years ago
  
  ac8b88aa
- decreased default platform speed · f7d010e4
  Armar6Demo authored 7 years ago
  
  f7d010e4
- TCPControlSubUnit now allows for different modes · 4626664c
  Stefan Reither authored 7 years ago
  
  4626664c
- describe hand state · 3071d0a1
  Armar6Demo authored 7 years ago
  
  3071d0a1
Nov 09, 2017
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · fec8c814
  Armar6Demo authored 7 years ago
  
  fec8c814
- deactivate spam · f52a83b8
  Armar6Demo authored 7 years ago
  
  f52a83b8
Nov 08, 2017
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · fd884c62
  Mirko Wächter authored 7 years ago
  
  fd884c62
- set required simox version to 2.3.58 · 5ebe28da
  Mirko Wächter authored 7 years ago
  
  5ebe28da
Nov 07, 2017
- Remove files nor using moc from GUI_MOC_HDRS (to reduce warnings) · 7be3c8d7
  Raphael Grimm authored 7 years ago
  
  7be3c8d7
- Add doxygen for Robotunit/util.h · a048650f
  Raphael Grimm authored 7 years ago
  
  a048650f
Nov 06, 2017
- updated minimum simox version · a4af7f45
  Mirko Wächter authored 7 years ago
  
  a4af7f45
Nov 03, 2017
- several small fixes for TrajectoryControllerSubUnit · 1b9392fa
  Stefan Reither authored 7 years ago
  
  1b9392fa
- add change to positionControlMode in resetTrajectoryPlayer · 254a5602
  Stefan Reither authored 7 years ago
  
  254a5602
- add flag if threadSafe to MultiDimPID · 08ec0e45
  Stefan Reither authored 7 years ago
  
  08ec0e45
- move and rename TrajectoryPlayerInterface · 2d32b152
  Stefan Reither authored 7 years ago
  
  2d32b152
- add flag for trajectoryOptimization in trajectoryControllerSubUnit · 71fd4690
  Stefan Reither authored 7 years ago
  
  71fd4690
- Merge branch 'master' into TCPSubUnit · 04488889
  Stefan Reither authored 7 years ago
  
  04488889
Nov 01, 2017
- change locking to be able to be used in a rt-thread · b69b7f5d
  Stefan Reither authored 7 years ago
  
  b69b7f5d
- add TrajectoryControllerSubUnit to RobotUnit · 04bf5908
  Stefan Reither authored 7 years ago
  
  04bf5908
Oct 25, 2017
- Add TCPControllerSubUnit to RobotUnit · df634664
  Stefan Reither authored 7 years ago
  
  df634664
- Add component for easy robot-synchronization within robotUnit · 57926b7b
  Stefan Reither authored 7 years ago
  
  57926b7b
Oct 24, 2017
- Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI · 796ea9a1
  Mirko Wächter authored 7 years ago
  
  796ea9a1