Skip to content

Commit 6a64eb0

Browse files
committed
Merge pull request #533 from gavanderhoorn/yaml_ctors_rosparam_joint_limits
description: spec limits in degrees.
2 parents 8e5cc30 + 50269d1 commit 6a64eb0

File tree

7 files changed

+126
-126
lines changed

7 files changed

+126
-126
lines changed

ur_description/config/ur10/joint_limits.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ joint_limits:
1515
has_position_limits: true
1616
has_velocity_limits: true
1717
max_effort: 330.0
18-
max_position: 6.28318530718
19-
max_velocity: 2.0943951
20-
min_position: -6.28318530718
18+
max_position: !degrees 360.0
19+
max_velocity: !degrees 120.0
20+
min_position: !degrees -360.0
2121
shoulder_lift:
2222
# acceleration limits are not publicly available
2323
has_acceleration_limits: false
2424
has_effort_limits: true
2525
has_position_limits: true
2626
has_velocity_limits: true
2727
max_effort: 330.0
28-
max_position: 6.28318530718
29-
max_velocity: 2.0943951
30-
min_position: -6.28318530718
28+
max_position: !degrees 360.0
29+
max_velocity: !degrees 120.0
30+
min_position: !degrees -360.0
3131
elbow_joint:
3232
# acceleration limits are not publicly available
3333
has_acceleration_limits: false
@@ -45,36 +45,36 @@ joint_limits:
4545
#
4646
# Refer to https://github.com/ros-industrial/universal_robot/issues/265 for
4747
# more information.
48-
max_position: 3.14159265359
49-
max_velocity: 3.14159265359
50-
min_position: -3.14159265359
48+
max_position: !degrees 180.0
49+
max_velocity: !degrees 180.0
50+
min_position: !degrees -180.0
5151
wrist_1:
5252
# acceleration limits are not publicly available
5353
has_acceleration_limits: false
5454
has_effort_limits: true
5555
has_position_limits: true
5656
has_velocity_limits: true
5757
max_effort: 56.0
58-
max_position: 6.28318530718
59-
max_velocity: 3.14159265359
60-
min_position: -6.28318530718
58+
max_position: !degrees 360.0
59+
max_velocity: !degrees 180.0
60+
min_position: !degrees -360.0
6161
wrist_2:
6262
# acceleration limits are not publicly available
6363
has_acceleration_limits: false
6464
has_effort_limits: true
6565
has_position_limits: true
6666
has_velocity_limits: true
6767
max_effort: 56.0
68-
max_position: 6.28318530718
69-
max_velocity: 3.14159265359
70-
min_position: -6.28318530718
68+
max_position: !degrees 360.0
69+
max_velocity: !degrees 180.0
70+
min_position: !degrees -360.0
7171
wrist_3:
7272
# acceleration limits are not publicly available
7373
has_acceleration_limits: false
7474
has_effort_limits: true
7575
has_position_limits: true
7676
has_velocity_limits: true
7777
max_effort: 56.0
78-
max_position: 6.28318530718
79-
max_velocity: 3.14159265359
80-
min_position: -6.28318530718
78+
max_position: !degrees 360.0
79+
max_velocity: !degrees 180.0
80+
min_position: !degrees -360.0

ur_description/config/ur10e/joint_limits.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ joint_limits:
1515
has_position_limits: true
1616
has_velocity_limits: true
1717
max_effort: 330.0
18-
max_position: 6.28318530718
19-
max_velocity: 2.0943951
20-
min_position: -6.28318530718
18+
max_position: !degrees 360.0
19+
max_velocity: !degrees 120.0
20+
min_position: !degrees -360.0
2121
shoulder_lift:
2222
# acceleration limits are not publicly available
2323
has_acceleration_limits: false
2424
has_effort_limits: true
2525
has_position_limits: true
2626
has_velocity_limits: true
2727
max_effort: 330.0
28-
max_position: 6.28318530718
29-
max_velocity: 2.0943951
30-
min_position: -6.28318530718
28+
max_position: !degrees 360.0
29+
max_velocity: !degrees 120.0
30+
min_position: !degrees -360.0
3131
elbow_joint:
3232
# acceleration limits are not publicly available
3333
has_acceleration_limits: false
@@ -45,36 +45,36 @@ joint_limits:
4545
#
4646
# Refer to https://github.com/ros-industrial/universal_robot/issues/265 for
4747
# more information.
48-
max_position: 3.14159265359
49-
max_velocity: 3.14159265359
50-
min_position: -3.14159265359
48+
max_position: !degrees 180.0
49+
max_velocity: !degrees 180.0
50+
min_position: !degrees -180.0
5151
wrist_1:
5252
# acceleration limits are not publicly available
5353
has_acceleration_limits: false
5454
has_effort_limits: true
5555
has_position_limits: true
5656
has_velocity_limits: true
5757
max_effort: 56.0
58-
max_position: 6.28318530718
59-
max_velocity: 3.14159265359
60-
min_position: -6.28318530718
58+
max_position: !degrees 360.0
59+
max_velocity: !degrees 180.0
60+
min_position: !degrees -360.0
6161
wrist_2:
6262
# acceleration limits are not publicly available
6363
has_acceleration_limits: false
6464
has_effort_limits: true
6565
has_position_limits: true
6666
has_velocity_limits: true
6767
max_effort: 56.0
68-
max_position: 6.28318530718
69-
max_velocity: 3.14159265359
70-
min_position: -6.28318530718
68+
max_position: !degrees 360.0
69+
max_velocity: !degrees 180.0
70+
min_position: !degrees -360.0
7171
wrist_3:
7272
# acceleration limits are not publicly available
7373
has_acceleration_limits: false
7474
has_effort_limits: true
7575
has_position_limits: true
7676
has_velocity_limits: true
7777
max_effort: 56.0
78-
max_position: 6.28318530718
79-
max_velocity: 3.14159265359
80-
min_position: -6.28318530718
78+
max_position: !degrees 360.0
79+
max_velocity: !degrees 180.0
80+
min_position: !degrees -360.0

ur_description/config/ur16e/joint_limits.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ joint_limits:
1515
has_position_limits: true
1616
has_velocity_limits: true
1717
max_effort: 330.0
18-
max_position: 6.28318530718
19-
max_velocity: 2.0943951
20-
min_position: -6.28318530718
18+
max_position: !degrees 360.0
19+
max_velocity: !degrees 120.0
20+
min_position: !degrees -360.0
2121
shoulder_lift:
2222
# acceleration limits are not publicly available
2323
has_acceleration_limits: false
2424
has_effort_limits: true
2525
has_position_limits: true
2626
has_velocity_limits: true
2727
max_effort: 330.0
28-
max_position: 6.28318530718
29-
max_velocity: 2.0943951
30-
min_position: -6.28318530718
28+
max_position: !degrees 360.0
29+
max_velocity: !degrees 120.0
30+
min_position: !degrees -360.0
3131
elbow_joint:
3232
# acceleration limits are not publicly available
3333
has_acceleration_limits: false
@@ -45,36 +45,36 @@ joint_limits:
4545
#
4646
# Refer to https://github.com/ros-industrial/universal_robot/issues/265 for
4747
# more information.
48-
max_position: 3.14159265359
49-
max_velocity: 3.14159265359
50-
min_position: -3.14159265359
48+
max_position: !degrees 180.0
49+
max_velocity: !degrees 180.0
50+
min_position: !degrees -180.0
5151
wrist_1:
5252
# acceleration limits are not publicly available
5353
has_acceleration_limits: false
5454
has_effort_limits: true
5555
has_position_limits: true
5656
has_velocity_limits: true
5757
max_effort: 56.0
58-
max_position: 6.28318530718
59-
max_velocity: 3.14159265359
60-
min_position: -6.28318530718
58+
max_position: !degrees 360.0
59+
max_velocity: !degrees 180.0
60+
min_position: !degrees -360.0
6161
wrist_2:
6262
# acceleration limits are not publicly available
6363
has_acceleration_limits: false
6464
has_effort_limits: true
6565
has_position_limits: true
6666
has_velocity_limits: true
6767
max_effort: 56.0
68-
max_position: 6.28318530718
69-
max_velocity: 3.14159265359
70-
min_position: -6.28318530718
68+
max_position: !degrees 360.0
69+
max_velocity: !degrees 180.0
70+
min_position: !degrees -360.0
7171
wrist_3:
7272
# acceleration limits are not publicly available
7373
has_acceleration_limits: false
7474
has_effort_limits: true
7575
has_position_limits: true
7676
has_velocity_limits: true
7777
max_effort: 56.0
78-
max_position: 6.28318530718
79-
max_velocity: 3.14159265359
80-
min_position: -6.28318530718
78+
max_position: !degrees 360.0
79+
max_velocity: !degrees 180.0
80+
min_position: !degrees -360.0

ur_description/config/ur3/joint_limits.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ joint_limits:
1515
has_position_limits: true
1616
has_velocity_limits: true
1717
max_effort: 56.0
18-
max_position: 6.28318530718
19-
max_velocity: 3.14159265359
20-
min_position: -6.28318530718
18+
max_position: !degrees 360.0
19+
max_velocity: !degrees 180.0
20+
min_position: !degrees -360.0
2121
shoulder_lift:
2222
# acceleration limits are not publicly available
2323
has_acceleration_limits: false
2424
has_effort_limits: true
2525
has_position_limits: true
2626
has_velocity_limits: true
2727
max_effort: 56.0
28-
max_position: 6.28318530718
29-
max_velocity: 3.14159265359
30-
min_position: -6.28318530718
28+
max_position: !degrees 360.0
29+
max_velocity: !degrees 180.0
30+
min_position: !degrees -360.0
3131
elbow_joint:
3232
# acceleration limits are not publicly available
3333
has_acceleration_limits: false
@@ -45,36 +45,36 @@ joint_limits:
4545
#
4646
# Refer to https://github.com/ros-industrial/universal_robot/issues/265 for
4747
# more information.
48-
max_position: 3.14159265359
49-
max_velocity: 3.14159265359
50-
min_position: -3.14159265359
48+
max_position: !degrees 180.0
49+
max_velocity: !degrees 180.0
50+
min_position: !degrees -180.0
5151
wrist_1:
5252
# acceleration limits are not publicly available
5353
has_acceleration_limits: false
5454
has_effort_limits: true
5555
has_position_limits: true
5656
has_velocity_limits: true
5757
max_effort: 12.0
58-
max_position: 6.28318530718
59-
max_velocity: 6.28318530718
60-
min_position: -6.28318530718
58+
max_position: !degrees 360.0
59+
max_velocity: !degrees 360.0
60+
min_position: !degrees -360.0
6161
wrist_2:
6262
# acceleration limits are not publicly available
6363
has_acceleration_limits: false
6464
has_effort_limits: true
6565
has_position_limits: true
6666
has_velocity_limits: true
6767
max_effort: 12.0
68-
max_position: 6.28318530718
69-
max_velocity: 6.28318530718
70-
min_position: -6.28318530718
68+
max_position: !degrees 360.0
69+
max_velocity: !degrees 360.0
70+
min_position: !degrees -360.0
7171
wrist_3:
7272
# acceleration limits are not publicly available
7373
has_acceleration_limits: false
7474
has_effort_limits: true
7575
has_position_limits: true
7676
has_velocity_limits: true
7777
max_effort: 12.0
78-
max_position: 6.28318530718
79-
max_velocity: 6.28318530718
80-
min_position: -6.28318530718
78+
max_position: !degrees 360.0
79+
max_velocity: !degrees 360.0
80+
min_position: !degrees -360.0

ur_description/config/ur3e/joint_limits.yaml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ joint_limits:
1515
has_position_limits: true
1616
has_velocity_limits: true
1717
max_effort: 56.0
18-
max_position: 6.28318530718
19-
max_velocity: 3.14159265359
20-
min_position: -6.28318530718
18+
max_position: !degrees 360.0
19+
max_velocity: !degrees 180.0
20+
min_position: !degrees -360.0
2121
shoulder_lift:
2222
# acceleration limits are not publicly available
2323
has_acceleration_limits: false
2424
has_effort_limits: true
2525
has_position_limits: true
2626
has_velocity_limits: true
2727
max_effort: 56.0
28-
max_position: 6.28318530718
29-
max_velocity: 3.14159265359
30-
min_position: -6.28318530718
28+
max_position: !degrees 360.0
29+
max_velocity: !degrees 180.0
30+
min_position: !degrees -360.0
3131
elbow_joint:
3232
# acceleration limits are not publicly available
3333
has_acceleration_limits: false
@@ -45,36 +45,36 @@ joint_limits:
4545
#
4646
# Refer to https://github.com/ros-industrial/universal_robot/issues/265 for
4747
# more information.
48-
max_position: 3.14159265359
49-
max_velocity: 3.14159265359
50-
min_position: -3.14159265359
48+
max_position: !degrees 180.0
49+
max_velocity: !degrees 180.0
50+
min_position: !degrees -180.0
5151
wrist_1:
5252
# acceleration limits are not publicly available
5353
has_acceleration_limits: false
5454
has_effort_limits: true
5555
has_position_limits: true
5656
has_velocity_limits: true
5757
max_effort: 12.0
58-
max_position: 6.28318530718
59-
max_velocity: 6.28318530718
60-
min_position: -6.28318530718
58+
max_position: !degrees 360.0
59+
max_velocity: !degrees 360.0
60+
min_position: !degrees -360.0
6161
wrist_2:
6262
# acceleration limits are not publicly available
6363
has_acceleration_limits: false
6464
has_effort_limits: true
6565
has_position_limits: true
6666
has_velocity_limits: true
6767
max_effort: 12.0
68-
max_position: 6.28318530718
69-
max_velocity: 6.28318530718
70-
min_position: -6.28318530718
68+
max_position: !degrees 360.0
69+
max_velocity: !degrees 360.0
70+
min_position: !degrees -360.0
7171
wrist_3:
7272
# acceleration limits are not publicly available
7373
has_acceleration_limits: false
7474
has_effort_limits: true
7575
has_position_limits: true
7676
has_velocity_limits: true
7777
max_effort: 12.0
78-
max_position: 6.28318530718
79-
max_velocity: 6.28318530718
80-
min_position: -6.28318530718
78+
max_position: !degrees 360.0
79+
max_velocity: !degrees 360.0
80+
min_position: !degrees -360.0

0 commit comments

Comments
 (0)