diff --git a/CHANGELOG.md b/CHANGELOG.md index ed791b95..01ed9cf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +- ergoCubV1: fixed the names r/l_upperarm with r/l_upper_arm(https://github.com/icub-tech-iit/ergocub-software/issues/197) - Fixed HF when resetting the world when using DART as PE(https://github.com/icub-tech-iit/ergocub-software/issues/190) ## [0.6.0] - 2023-11-15 diff --git a/urdf/creo2urdf/data/ergocub1_0/ERGOCUB_all_options.yaml b/urdf/creo2urdf/data/ergocub1_0/ERGOCUB_all_options.yaml index 799822c6..481430c7 100644 --- a/urdf/creo2urdf/data/ergocub1_0/ERGOCUB_all_options.yaml +++ b/urdf/creo2urdf/data/ergocub1_0/ERGOCUB_all_options.yaml @@ -86,7 +86,7 @@ rename: SIM_ECUB_1-0_HEAD_NECK_3--SIM_ECUB_1-0_HEAD: neck_yaw SIM_ECUB_1-0_HEAD--SIM_ECUB_1-0_REALSENSE: camera_tilt # left forearm - SIM_ECUB_1-0_L_UPPERARM: l_upperarm + SIM_ECUB_1-0_L_UPPERARM: l_upper_arm SIM_ECUB_1-0_L_FOREARM: l_forearm SIM_ECUB_1-0_L_WRIST_1: l_wrist_1 SIM_ECUB_1-0_L_WRIST_2: l_wrist_2 @@ -120,7 +120,7 @@ rename: SIM_ECUB_1-0_L_HAND_PALM--SIM_ECUB_1-0_L_HAND_PINKIE_1: l_pinkie_prox SIM_ECUB_1-0_L_HAND_PINKIE_1--SIM_ECUB_1-0_L_HAND_PINKIE_2: l_pinkie_dist # right forearm - SIM_ECUB_1-0_R_UPPERARM: r_upperarm + SIM_ECUB_1-0_R_UPPERARM: r_upper_arm SIM_ECUB_1-0_R_FOREARM: r_forearm SIM_ECUB_1-0_R_WRIST_1: r_wrist_1 SIM_ECUB_1-0_R_WRIST_2: r_wrist_2 @@ -235,7 +235,7 @@ linkFrames: - linkName: realsense frameName: SCSYS_REALSENSE # left forearm - - linkName: l_upperarm + - linkName: l_upper_arm frameName: SCSYS_L_UPPERARM - linkName: l_forearm frameName: SCSYS_L_FOREARM @@ -270,7 +270,7 @@ linkFrames: - linkName: l_hand_pinkie_2 frameName: SCSYS_L_HAND_PINKIE_DIST # WRONG NAME # right forearm - - linkName: r_upperarm + - linkName: r_upper_arm frameName: SCSYS_R_UPPERARM - linkName: r_forearm frameName: SCSYS_R_FOREARM diff --git a/urdf/creo2urdf/data/ergocub1_0/ERGOCUB_all_options_gazebo.yaml b/urdf/creo2urdf/data/ergocub1_0/ERGOCUB_all_options_gazebo.yaml index 2684c44e..874fab86 100644 --- a/urdf/creo2urdf/data/ergocub1_0/ERGOCUB_all_options_gazebo.yaml +++ b/urdf/creo2urdf/data/ergocub1_0/ERGOCUB_all_options_gazebo.yaml @@ -86,7 +86,7 @@ rename: SIM_ECUB_1-0_HEAD_NECK_3--SIM_ECUB_1-0_HEAD: neck_yaw SIM_ECUB_1-0_HEAD--SIM_ECUB_1-0_REALSENSE: camera_tilt # left forearm - SIM_ECUB_1-0_L_UPPERARM: l_upperarm + SIM_ECUB_1-0_L_UPPERARM: l_upper_arm SIM_ECUB_1-0_L_FOREARM: l_forearm SIM_ECUB_1-0_L_WRIST_1: l_wrist_1 SIM_ECUB_1-0_L_WRIST_2: l_wrist_2 @@ -120,7 +120,7 @@ rename: SIM_ECUB_1-0_L_HAND_PALM--SIM_ECUB_1-0_L_HAND_PINKIE_1: l_pinkie_prox SIM_ECUB_1-0_L_HAND_PINKIE_1--SIM_ECUB_1-0_L_HAND_PINKIE_2: l_pinkie_dist # right forearm - SIM_ECUB_1-0_R_UPPERARM: r_upperarm + SIM_ECUB_1-0_R_UPPERARM: r_upper_arm SIM_ECUB_1-0_R_FOREARM: r_forearm SIM_ECUB_1-0_R_WRIST_1: r_wrist_1 SIM_ECUB_1-0_R_WRIST_2: r_wrist_2 @@ -235,7 +235,7 @@ linkFrames: - linkName: realsense frameName: SCSYS_REALSENSE # left forearm - - linkName: l_upperarm + - linkName: l_upper_arm frameName: SCSYS_L_UPPERARM - linkName: l_forearm frameName: SCSYS_L_FOREARM @@ -270,7 +270,7 @@ linkFrames: - linkName: l_hand_pinkie_2 frameName: SCSYS_L_HAND_PINKIE_DIST # WRONG NAME # right forearm - - linkName: r_upperarm + - linkName: r_upper_arm frameName: SCSYS_R_UPPERARM - linkName: r_forearm frameName: SCSYS_R_FOREARM diff --git a/urdf/creo2urdf/data/ergocub1_0/ERGOCUB_all_options_minContacts.yaml b/urdf/creo2urdf/data/ergocub1_0/ERGOCUB_all_options_minContacts.yaml index 6e9b0ab9..ab484604 100644 --- a/urdf/creo2urdf/data/ergocub1_0/ERGOCUB_all_options_minContacts.yaml +++ b/urdf/creo2urdf/data/ergocub1_0/ERGOCUB_all_options_minContacts.yaml @@ -86,7 +86,7 @@ rename: SIM_ECUB_1-0_HEAD_NECK_3--SIM_ECUB_1-0_HEAD: neck_yaw SIM_ECUB_1-0_HEAD--SIM_ECUB_1-0_REALSENSE: camera_tilt # left forearm - SIM_ECUB_1-0_L_UPPERARM: l_upperarm + SIM_ECUB_1-0_L_UPPERARM: l_upper_arm SIM_ECUB_1-0_L_FOREARM: l_forearm SIM_ECUB_1-0_L_WRIST_1: l_wrist_1 SIM_ECUB_1-0_L_WRIST_2: l_wrist_2 @@ -120,7 +120,7 @@ rename: SIM_ECUB_1-0_L_HAND_PALM--SIM_ECUB_1-0_L_HAND_PINKIE_1: l_pinkie_prox SIM_ECUB_1-0_L_HAND_PINKIE_1--SIM_ECUB_1-0_L_HAND_PINKIE_2: l_pinkie_dist # right forearm - SIM_ECUB_1-0_R_UPPERARM: r_upperarm + SIM_ECUB_1-0_R_UPPERARM: r_upper_arm SIM_ECUB_1-0_R_FOREARM: r_forearm SIM_ECUB_1-0_R_WRIST_1: r_wrist_1 SIM_ECUB_1-0_R_WRIST_2: r_wrist_2 @@ -235,7 +235,7 @@ linkFrames: - linkName: realsense frameName: SCSYS_REALSENSE # left forearm - - linkName: l_upperarm + - linkName: l_upper_arm frameName: SCSYS_L_UPPERARM - linkName: l_forearm frameName: SCSYS_L_FOREARM @@ -270,7 +270,7 @@ linkFrames: - linkName: l_hand_pinkie_2 frameName: SCSYS_L_HAND_PINKIE_DIST # WRONG NAME # right forearm - - linkName: r_upperarm + - linkName: r_upper_arm frameName: SCSYS_R_UPPERARM - linkName: r_forearm frameName: SCSYS_R_FOREARM @@ -1267,7 +1267,7 @@ assignedCollisionGeometry: shape: box size: [0.0,0.0,0.0] origin: [0.0,0.0,0.0,0.0,0.0,0.0] - - linkName: r_upperarm + - linkName: r_upper_arm geometricShape: shape: box size: [0.0,0.0,0.0] @@ -1367,7 +1367,7 @@ assignedCollisionGeometry: shape: box size: [0.0,0.0,0.0] origin: [0.0,0.0,0.0,0.0,0.0,0.0] - - linkName: l_upperarm + - linkName: l_upper_arm geometricShape: shape: box size: [0.0,0.0,0.0] diff --git a/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options.yaml b/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options.yaml index 9ee235b5..077dcd35 100644 --- a/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options.yaml +++ b/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options.yaml @@ -86,7 +86,7 @@ rename: SIM_ECUB_1-1_HEAD_NECK_3--SIM_ECUB_1-1_HEAD: neck_yaw SIM_ECUB_1-1_HEAD--SIM_ECUB_1-1_REALSENSE: camera_tilt # left forearm - SIM_ECUB_1-1_L_UPPERARM: l_upperarm + SIM_ECUB_1-1_L_UPPERARM: l_upper_arm SIM_ECUB_1-1_L_FOREARM: l_forearm SIM_ECUB_1-1_L_WRIST_1: l_wrist_1 SIM_ECUB_1-1_L_WRIST_2: l_wrist_2 @@ -120,7 +120,7 @@ rename: SIM_ECUB_1-1_L_HAND_PALM--SIM_ECUB_1-1_L_HAND_PINKIE_1: l_pinkie_prox SIM_ECUB_1-1_L_HAND_PINKIE_1--SIM_ECUB_1-1_L_HAND_PINKIE_2: l_pinkie_dist # right forearm - SIM_ECUB_1-1_R_UPPERARM: r_upperarm + SIM_ECUB_1-1_R_UPPERARM: r_upper_arm SIM_ECUB_1-1_R_FOREARM: r_forearm SIM_ECUB_1-1_R_WRIST_1: r_wrist_1 SIM_ECUB_1-1_R_WRIST_2: r_wrist_2 @@ -234,7 +234,7 @@ linkFrames: - linkName: realsense frameName: SCSYS_REALSENSE # left forearm - - linkName: l_upperarm + - linkName: l_upper_arm frameName: SCSYS_L_UPPERARM - linkName: l_forearm frameName: SCSYS_L_FOREARM @@ -269,7 +269,7 @@ linkFrames: - linkName: l_hand_pinkie_2 frameName: SCSYS_L_HAND_PINKIE_2 # right forearm - - linkName: r_upperarm + - linkName: r_upper_arm frameName: SCSYS_R_UPPERARM - linkName: r_forearm frameName: SCSYS_R_FOREARM diff --git a/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options_gazebo.yaml b/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options_gazebo.yaml index 5a6cfd9b..dd046544 100644 --- a/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options_gazebo.yaml +++ b/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options_gazebo.yaml @@ -86,7 +86,7 @@ rename: SIM_ECUB_1-1_HEAD_NECK_3--SIM_ECUB_1-1_HEAD: neck_yaw SIM_ECUB_1-1_HEAD--SIM_ECUB_1-1_REALSENSE: camera_tilt # left forearm - SIM_ECUB_1-1_L_UPPERARM: l_upperarm + SIM_ECUB_1-1_L_UPPERARM: l_upper_arm SIM_ECUB_1-1_L_FOREARM: l_forearm SIM_ECUB_1-1_L_WRIST_1: l_wrist_1 SIM_ECUB_1-1_L_WRIST_2: l_wrist_2 @@ -120,7 +120,7 @@ rename: SIM_ECUB_1-1_L_HAND_PALM--SIM_ECUB_1-1_L_HAND_PINKIE_1: l_pinkie_prox SIM_ECUB_1-1_L_HAND_PINKIE_1--SIM_ECUB_1-1_L_HAND_PINKIE_2: l_pinkie_dist # right forearm - SIM_ECUB_1-1_R_UPPERARM: r_upperarm + SIM_ECUB_1-1_R_UPPERARM: r_upper_arm SIM_ECUB_1-1_R_FOREARM: r_forearm SIM_ECUB_1-1_R_WRIST_1: r_wrist_1 SIM_ECUB_1-1_R_WRIST_2: r_wrist_2 @@ -234,7 +234,7 @@ linkFrames: - linkName: realsense frameName: SCSYS_REALSENSE # left forearm - - linkName: l_upperarm + - linkName: l_upper_arm frameName: SCSYS_L_UPPERARM - linkName: l_forearm frameName: SCSYS_L_FOREARM @@ -269,7 +269,7 @@ linkFrames: - linkName: l_hand_pinkie_2 frameName: SCSYS_L_HAND_PINKIE_2 # right forearm - - linkName: r_upperarm + - linkName: r_upper_arm frameName: SCSYS_R_UPPERARM - linkName: r_forearm frameName: SCSYS_R_FOREARM diff --git a/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options_minContacts.yaml b/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options_minContacts.yaml index ccab496d..e081828f 100644 --- a/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options_minContacts.yaml +++ b/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options_minContacts.yaml @@ -86,7 +86,7 @@ rename: SIM_ECUB_1-1_HEAD_NECK_3--SIM_ECUB_1-1_HEAD: neck_yaw SIM_ECUB_1-1_HEAD--SIM_ECUB_1-1_REALSENSE: camera_tilt # left forearm - SIM_ECUB_1-1_L_UPPERARM: l_upperarm + SIM_ECUB_1-1_L_UPPERARM: l_upper_arm SIM_ECUB_1-1_L_FOREARM: l_forearm SIM_ECUB_1-1_L_WRIST_1: l_wrist_1 SIM_ECUB_1-1_L_WRIST_2: l_wrist_2 @@ -120,7 +120,7 @@ rename: SIM_ECUB_1-1_L_HAND_PALM--SIM_ECUB_1-1_L_HAND_PINKIE_1: l_pinkie_prox SIM_ECUB_1-1_L_HAND_PINKIE_1--SIM_ECUB_1-1_L_HAND_PINKIE_2: l_pinkie_dist # right forearm - SIM_ECUB_1-1_R_UPPERARM: r_upperarm + SIM_ECUB_1-1_R_UPPERARM: r_upper_arm SIM_ECUB_1-1_R_FOREARM: r_forearm SIM_ECUB_1-1_R_WRIST_1: r_wrist_1 SIM_ECUB_1-1_R_WRIST_2: r_wrist_2 @@ -234,7 +234,7 @@ linkFrames: - linkName: realsense frameName: SCSYS_REALSENSE # left forearm - - linkName: l_upperarm + - linkName: l_upper_arm frameName: SCSYS_L_UPPERARM - linkName: l_forearm frameName: SCSYS_L_FOREARM @@ -269,7 +269,7 @@ linkFrames: - linkName: l_hand_pinkie_2 frameName: SCSYS_L_HAND_PINKIE_2 # right forearm - - linkName: r_upperarm + - linkName: r_upper_arm frameName: SCSYS_R_UPPERARM - linkName: r_forearm frameName: SCSYS_R_FOREARM @@ -834,7 +834,7 @@ assignedCollisionGeometry: shape: box size: [0.0,0.0,0.0] origin: [0.0,0.0,0.0,0.0,0.0,0.0] - - linkName: r_upperarm + - linkName: r_upper_arm geometricShape: shape: box size: [0.0,0.0,0.0] @@ -934,7 +934,7 @@ assignedCollisionGeometry: shape: box size: [0.0,0.0,0.0] origin: [0.0,0.0,0.0,0.0,0.0,0.0] - - linkName: l_upperarm + - linkName: l_upper_arm geometricShape: shape: box size: [0.0,0.0,0.0] diff --git a/urdf/ergoCub/robots/ergoCubGazeboV1/model.urdf b/urdf/ergoCub/robots/ergoCubGazeboV1/model.urdf index 630f1acd..3a2e6f09 100644 --- a/urdf/ergoCub/robots/ergoCubGazeboV1/model.urdf +++ b/urdf/ergoCub/robots/ergoCubGazeboV1/model.urdf @@ -938,7 +938,7 @@ - + @@ -964,7 +964,7 @@ - + @@ -993,7 +993,7 @@ - + @@ -1963,7 +1963,7 @@ - + @@ -1989,7 +1989,7 @@ - + @@ -2018,7 +2018,7 @@ - + diff --git a/urdf/ergoCub/robots/ergoCubGazeboV1_minContacts/model.urdf b/urdf/ergoCub/robots/ergoCubGazeboV1_minContacts/model.urdf index 416992c1..d654f7b5 100644 --- a/urdf/ergoCub/robots/ergoCubGazeboV1_minContacts/model.urdf +++ b/urdf/ergoCub/robots/ergoCubGazeboV1_minContacts/model.urdf @@ -938,7 +938,7 @@ - + @@ -964,7 +964,7 @@ - + @@ -993,7 +993,7 @@ - + @@ -1963,7 +1963,7 @@ - + @@ -1989,7 +1989,7 @@ - + @@ -2018,7 +2018,7 @@ - + diff --git a/urdf/ergoCub/robots/ergoCubSN000/model.urdf b/urdf/ergoCub/robots/ergoCubSN000/model.urdf index 12a8843c..cbf786d5 100644 --- a/urdf/ergoCub/robots/ergoCubSN000/model.urdf +++ b/urdf/ergoCub/robots/ergoCubSN000/model.urdf @@ -938,7 +938,7 @@ - + @@ -964,7 +964,7 @@ - + @@ -993,7 +993,7 @@ - + @@ -1963,7 +1963,7 @@ - + @@ -1989,7 +1989,7 @@ - + @@ -2018,7 +2018,7 @@ - +