# Conflicts:
#	source/RobotAPI/components/units/RobotUnit/test/BasicControllerTest.cpp

(cherry picked from commit e136fb89)

* RampedAcceleration:
  added extra config for position controller and "finished" position and velocity control for head
  added passthrough pwm controller
  increased max velocity in kinematic unit gui
  constant jerk velocity control is now working
  updated basic controller tests
  fixed jump in minjerk controller
  finished basic controller for ramped acceleration velocity controller
  intermediate version of min jerk control
  added pd output filter to pwm velocity controller
  added optional filter to pid controller
  added accelration to kit gripper board
  min jerk controller returns now also the new position
  clean up
  control plots: use svg instead png
  added minJerkPositionController
  manual revert
  added minJerkPositionController
  testing
  ramped acceleration controller

Kevin Hitzler authored 5 years ago and Raphael Grimm committed 5 years ago

Move the call to onExitNJointController() before joining threads in NJointController::onExitComponent

# Conflicts:
#	source/RobotAPI/applications/CMakeLists.txt
#	source/RobotAPI/interface/CMakeLists.txt
#	source/RobotAPI/libraries/DSControllers/CMakeLists.txt

- Model for QTreeView
- Displays JSON objects in a tree view

Debug drawer topic

See merge request ArmarX/RobotAPI!46

# Conflicts:
#	source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.cpp
#	source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h