Merge branch 'moveit-plugin-devel' into ur10_moveit
Conflicts: ur_description/urdf/ur10.urdf.xacro
Showing
- ur10_moveit_config/.setup_assistant 1 addition, 1 deletionur10_moveit_config/.setup_assistant
- ur10_moveit_config/config/fake_controllers.yaml 1 addition, 1 deletionur10_moveit_config/config/fake_controllers.yaml
- ur10_moveit_config/config/kinematics.yaml 2 additions, 2 deletionsur10_moveit_config/config/kinematics.yaml
- ur10_moveit_config/package.xml 1 addition, 1 deletionur10_moveit_config/package.xml
- ur5_moveit_config/.setup_assistant 1 addition, 1 deletionur5_moveit_config/.setup_assistant
- ur5_moveit_config/config/kinematics.yaml 2 additions, 2 deletionsur5_moveit_config/config/kinematics.yaml
- ur5_moveit_config/config/ur5.srdf 1 addition, 1 deletionur5_moveit_config/config/ur5.srdf
- ur5_moveit_config/package.xml 1 addition, 1 deletionur5_moveit_config/package.xml
- ur_description/urdf/ur10.urdf.xacro 11 additions, 2 deletionsur_description/urdf/ur10.urdf.xacro
- ur_description/urdf/ur10_joint_limited.urdf.xacro 10 additions, 1 deletionur_description/urdf/ur10_joint_limited.urdf.xacro
- ur_description/urdf/ur5.urdf.xacro 10 additions, 1 deletionur_description/urdf/ur5.urdf.xacro
- ur_description/urdf/ur5_joint_limited.urdf.xacro 10 additions, 1 deletionur_description/urdf/ur5_joint_limited.urdf.xacro
- ur_kinematics/CMakeLists.txt 27 additions, 9 deletionsur_kinematics/CMakeLists.txt
- ur_kinematics/include/ur_kinematics/ur_kin.h 5 additions, 0 deletionsur_kinematics/include/ur_kinematics/ur_kin.h
- ur_kinematics/include/ur_kinematics/ur_moveit_plugin.h 283 additions, 0 deletionsur_kinematics/include/ur_kinematics/ur_moveit_plugin.h
- ur_kinematics/package.xml 17 additions, 5 deletionsur_kinematics/package.xml
- ur_kinematics/src/ur_kin.cpp 126 additions, 0 deletionsur_kinematics/src/ur_kin.cpp
- ur_kinematics/src/ur_moveit_plugin.cpp 783 additions, 0 deletionsur_kinematics/src/ur_moveit_plugin.cpp
- ur_kinematics/ur_moveit_plugins.xml 19 additions, 0 deletionsur_kinematics/ur_moveit_plugins.xml
Please register or sign in to comment