diff --git a/cob_bringup/robots/raw3-1.xml b/cob_bringup/robots/raw3-1.xml index 0dff1556a..3fc8a598b 100644 --- a/cob_bringup/robots/raw3-1.xml +++ b/cob_bringup/robots/raw3-1.xml @@ -67,6 +67,8 @@ + + diff --git a/cob_hardware_config/robots/raw3-1/urdf/calibration_default.urdf.xacro b/cob_hardware_config/robots/raw3-1/urdf/calibration_default.urdf.xacro index 8ddffadc7..d618d04a9 100644 --- a/cob_hardware_config/robots/raw3-1/urdf/calibration_default.urdf.xacro +++ b/cob_hardware_config/robots/raw3-1/urdf/calibration_default.urdf.xacro @@ -98,4 +98,12 @@ + + + + + + + + diff --git a/cob_hardware_config/robots/raw3-1/urdf/properties.urdf.xacro b/cob_hardware_config/robots/raw3-1/urdf/properties.urdf.xacro index 96173c827..d84a6167f 100644 --- a/cob_hardware_config/robots/raw3-1/urdf/properties.urdf.xacro +++ b/cob_hardware_config/robots/raw3-1/urdf/properties.urdf.xacro @@ -100,4 +100,13 @@ + + + + + + + + + diff --git a/cob_hardware_config/robots/raw3-1/urdf/raw3-1.urdf.xacro b/cob_hardware_config/robots/raw3-1/urdf/raw3-1.urdf.xacro index 2362e469a..3a6fc05f6 100644 --- a/cob_hardware_config/robots/raw3-1/urdf/raw3-1.urdf.xacro +++ b/cob_hardware_config/robots/raw3-1/urdf/raw3-1.urdf.xacro @@ -20,8 +20,11 @@ - - + + + + + @@ -54,4 +57,9 @@ + + + + + diff --git a/cob_moveit_config/robots/raw3-1/moveit/config/joint_limits.yaml b/cob_moveit_config/robots/raw3-1/moveit/config/joint_limits.yaml index eb39c9728..a196e3c98 100644 --- a/cob_moveit_config/robots/raw3-1/moveit/config/joint_limits.yaml +++ b/cob_moveit_config/robots/raw3-1/moveit/config/joint_limits.yaml @@ -4,41 +4,31 @@ joint_limits: arm_elbow_joint: has_velocity_limits: true - max_velocity: 1.0 - has_acceleration_limits: true - max_acceleration: 1.0 + max_velocity: 2 + has_acceleration_limits: false + max_acceleration: 0 arm_shoulder_lift_joint: has_velocity_limits: true - max_velocity: 1.0 - has_acceleration_limits: true - max_acceleration: 1.0 + max_velocity: 2 + has_acceleration_limits: false + max_acceleration: 0 arm_shoulder_pan_joint: has_velocity_limits: true - max_velocity: 1.0 - has_acceleration_limits: true - max_acceleration: 1.0 + max_velocity: 2 + has_acceleration_limits: false + max_acceleration: 0 arm_wrist_1_joint: has_velocity_limits: true - max_velocity: 1.0 - has_acceleration_limits: true - max_acceleration: 1.0 + max_velocity: 2 + has_acceleration_limits: false + max_acceleration: 0 arm_wrist_2_joint: has_velocity_limits: true - max_velocity: 1.0 - has_acceleration_limits: true - max_acceleration: 1.0 + max_velocity: 2 + has_acceleration_limits: false + max_acceleration: 0 arm_wrist_3_joint: has_velocity_limits: true - max_velocity: 1.0 - has_acceleration_limits: true - max_acceleration: 1.0 - torso_pan_joint: - has_velocity_limits: true - max_velocity: 1.0 - has_acceleration_limits: true - max_acceleration: 1.0 - torso_tilt_joint: - has_velocity_limits: true - max_velocity: 1.0 - has_acceleration_limits: true - max_acceleration: 1.0 + max_velocity: 2 + has_acceleration_limits: false + max_acceleration: 0 \ No newline at end of file diff --git a/cob_moveit_config/robots/raw3-1/moveit/config/ompl_planning.yaml b/cob_moveit_config/robots/raw3-1/moveit/config/ompl_planning.yaml index 126020c0d..49b1199c4 100644 --- a/cob_moveit_config/robots/raw3-1/moveit/config/ompl_planning.yaml +++ b/cob_moveit_config/robots/raw3-1/moveit/config/ompl_planning.yaml @@ -26,7 +26,7 @@ planner_configs: min_valid_path_fraction: 0.5 # Accept partially valid moves above fraction. default: 0.5 RRTkConfigDefault: type: geometric::RRT - range: 0.1 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup() + range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup() goal_bias: 0.05 # When close to goal select goal, with this probability? default: 0.05 RRTConnectkConfigDefault: type: geometric::RRTConnect @@ -64,4 +64,4 @@ arm: - RRTstarkConfigDefault - TRRTkConfigDefault - PRMkConfigDefault - - PRMstarkConfigDefault + - PRMstarkConfigDefault \ No newline at end of file diff --git a/cob_moveit_config/robots/raw3-1/moveit/config/raw3-1.srdf b/cob_moveit_config/robots/raw3-1/moveit/config/raw3-1.srdf index a042b50e9..b92d5e763 100644 --- a/cob_moveit_config/robots/raw3-1/moveit/config/raw3-1.srdf +++ b/cob_moveit_config/robots/raw3-1/moveit/config/raw3-1.srdf @@ -10,15 +10,23 @@ - + + + + + + + - - - - - - - + + + + + + + + + @@ -36,29 +44,60 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + + + + + @@ -75,36 +114,55 @@ - - - - - + + + + + + + - + + - + + + + + + + - + + + + + - + + + - + + + + + @@ -117,12 +175,9 @@ - - - - - + + @@ -135,12 +190,9 @@ - - - - - + + @@ -152,12 +204,9 @@ - - - - - + + @@ -168,12 +217,9 @@ - - - - - + + @@ -183,12 +229,9 @@ - - - - - + + @@ -197,12 +240,10 @@ - - - + - - + + @@ -211,96 +252,73 @@ - - - - - + + - - - - - + + - - - - - - + + - - - + + + - - + + - - - + + - - + + - - - - - + + - - - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +