Skip to content

Commit

Permalink
Deprecate specific hand.urdf.xacro files
Browse files Browse the repository at this point in the history
  • Loading branch information
rhaschke committed Oct 3, 2021
1 parent 8bbc7e4 commit 1b0d1b9
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 0 deletions.
2 changes: 2 additions & 0 deletions sr_description/hand/xacro/ff_biotac_hand.urdf.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<!-- prefix can be anything but usually is "r_" or "l_" for right and left hands distinction -->
<xacro:macro name="shadowhand"
params="muscletrans muscle bio bt_sp ubi eli reflect prefix">
${xacro.warning("The file ff_biotac_hand.urdf.xacro is deprecated")}
${xacro.warning("Use full_hand.urdf.xacro instead with tip_sensors=dict(ff='bio')")}
<!-- Ensure tip_sensors is defined before usage below -->
<xacro:property name="tip_sensors" default="${5 * ['std']}" />
<!-- translate old parameters to new ones, eventually updating tip_sensors -->
Expand Down
2 changes: 2 additions & 0 deletions sr_description/hand/xacro/hand_E_no_mf_rf.urdf.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<!-- lf is true if we want a little finger, false otherwise -->
<xacro:macro name="shadowhand"
params="muscletrans muscle bio bt_sp ubi eli reflect prefix lf">
${xacro.warning("The file hand_E_no_mf_rf.urdf.xacro is deprecated")}
${xacro.warning("Use full_hand.urdf.xacro instead with fingers='th ff lf'")}
<!-- forward to generic macro -->
<xacro:include filename="$(find sr_description)/hand/xacro/full_hand.urdf.xacro" />
<xacro:shadowhand fingers="${[1, 1, 0, 0, 1 if lf else 0]}" reflect="${reflect}" prefix="${prefix}" />
Expand Down
2 changes: 2 additions & 0 deletions sr_description/hand/xacro/th_ff_rf_ellipsoid_hand.urdf.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<!-- prefix can be anything but usually is "r_" or "l_" for right and left hands distinction -->
<xacro:macro name="shadowhand"
params="muscletrans muscle bio bt_sp ubi eli reflect prefix">
${xacro.warning("The file th_ff_rf_ellipsoid_hand.urdf.xacro is deprecated")}
${xacro.warning("Use full_hand.urdf.xacro instead with tip_sensors=dict([(f, 'eli') for f in 'th ff rf'.split()])")}
<!-- Ensure tip_sensors is defined before usage below -->
<xacro:property name="tip_sensors" default="${5 * ['std']}" />
<!-- translate old parameters to new ones, eventually updating tip_sensors -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<!-- prefix can be anything but usually is "r_" or "l_" for right and left hands distinction -->
<xacro:macro name="shadowhand"
params="muscletrans muscle bio bt_sp ubi eli reflect prefix">
${xacro.warning("The file three_biotac_fingers_hand.urdf.xacro is deprecated")}
${xacro.warning("Use full_hand.urdf.xacro instead with tip_sensors=dict([(f, 'bio') for f in 'th ff mf'.split()])")}
<!-- forward to generic macro -->
<xacro:include filename="$(find sr_description)/hand/xacro/full_hand.urdf.xacro" />
<!-- BioTacs on First and Middle Finger as well as Thumb -->
Expand Down
2 changes: 2 additions & 0 deletions sr_description/hand/xacro/three_fingers_hand.urdf.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<!-- prefix can be anything but usually is "r_" or "l_" for right and left hands distinction -->
<xacro:macro name="shadowhand"
params="muscletrans muscle bio bt_sp ubi eli reflect prefix">
${xacro.warning("The file three_fingers_hand.urdf.xacro is deprecated")}
${xacro.warning("Use full_hand.urdf.xacro instead with fingers='th ff mf'")}
<!-- forward to generic macro -->
<xacro:include filename="$(find sr_description)/hand/xacro/full_hand.urdf.xacro" />
<xacro:shadowhand fingers="${[1,1,1,0,0]}" reflect="${reflect}" prefix="${prefix}" />
Expand Down
2 changes: 2 additions & 0 deletions sr_description/hand/xacro/three_fingers_hand_RF.urdf.xacro
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<!-- prefix can be anything but usually is "r_" or "l_" for right and left hands distinction -->
<xacro:macro name="shadowhand"
params="muscletrans muscle bio bt_sp ubi eli reflect prefix">
${xacro.warning("The file three_fingers_hand_RF.urdf.xacro is deprecated")}
${xacro.warning("Use full_hand.urdf.xacro instead with fingers='th ff rf'")}
<!-- forward to generic macro -->
<xacro:include filename="$(find sr_description)/hand/xacro/full_hand.urdf.xacro" />
<xacro:shadowhand fingers="${[1, 1, 0, 1, 0]}" reflect="${reflect}" prefix="${prefix}" />
Expand Down

0 comments on commit 1b0d1b9

Please sign in to comment.