Skip to content
Snippets Groups Projects
Commit 48f02e2a authored by Christoph Jaehne's avatar Christoph Jaehne
Browse files

Merge pull request #112 in SWDEV/franka_ros from...

Merge pull request #112 in SWDEV/franka_ros from feature/SRR-538-refactor-combinable-hw-to-inherit to multi_panda_beta

* commit '4ac8f60b': (31 commits)
  getCollisionThresholds -> static, linter fix for string concatenation
  added more detail to explanation why only torque
  added missing doc for method, added missing const
  collision behavior as parameters, optional combinable_control_node.yaml
  has_error -> franka_state to detect error
  linterfix for default value in control 2
  linterfix for default value in control
  added comment on torque control only
  switched robot naming right/left -> 1/2
  fixed comment for joint limits in config
  added documentation to services.h, default ros_callback in combinable_hw, minor fixes
  removed redundant intialization
  removed deprecated comment
  linter fix for unused variables
  formatted files
  reverts nodehandle in test main
  fixed indentation in test launch
  fixed some comments
  fixed unit tests, added doc for protected methods
  removed combinable and combinbed packages
  ...
parents 6f1ae567 4ac8f60b
No related branches found
No related tags found
No related merge requests found
Showing
with 0 additions and 1723 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment