diff --git a/tests/ergocub-model-test.cpp b/tests/ergocub-model-test.cpp
index faced671..15ad30fe 100644
--- a/tests/ergocub-model-test.cpp
+++ b/tests/ergocub-model-test.cpp
@@ -449,7 +449,7 @@ bool checkFTSensorsAreOddAndNotNull(iDynTree::ModelLoader & mdlLoader)
}
/**
- * All the ergoCub have a even and not null number of F/T sensors.
+ * All the iCub have a even and not null number of F/T sensors.
*/
bool checkFTSensorsAreEvenAndNotNull(iDynTree::ModelLoader & mdlLoader)
{
@@ -524,9 +524,9 @@ bool checkFTSensorsAreCorrectlyOriented(iDynTree::KinDynComputations & comp)
0.5, 0.866025, 0,
0, 0, -1);
- // bool ok = checkFrameIsCorrectlyOriented(comp, rootLink_R_sensorFrameLeftArmExpected, "l_arm_ft");
- // ok = checkFrameIsCorrectlyOriented(comp, rootLink_R_sensorFrameRightArmExpected, "r_arm_ft") && ok;
- bool ok = checkFrameIsCorrectlyOriented(comp, rootLink_L_sensorFrameExpectedLeg, "l_leg_ft");
+ bool ok = checkFrameIsCorrectlyOriented(comp, rootLink_R_sensorFrameLeftArmExpected, "l_arm_ft");
+ ok = checkFrameIsCorrectlyOriented(comp, rootLink_R_sensorFrameRightArmExpected, "r_arm_ft") && ok;
+ ok = checkFrameIsCorrectlyOriented(comp, rootLink_L_sensorFrameExpectedLeg, "l_leg_ft") && ok;
ok = checkFrameIsCorrectlyOriented(comp, rootLink_R_sensorFrameExpectedLeg, "r_leg_ft") && ok;
ok = checkFrameIsCorrectlyOriented(comp, rootLink_R_sensorFrameExpectedFoot, "l_foot_rear_ft") && ok;
ok = checkFrameIsCorrectlyOriented(comp, rootLink_R_sensorFrameExpectedFoot, "r_foot_rear_ft") && ok;
@@ -687,9 +687,9 @@ bool checkAllFTMeasurementFrameGivenBySensorTagsIsCoherentWithMeasurementFrameGi
iDynTree::SensorsList sensors = mdlLoader.sensors();
- // bool ok = checkFTMeasurementFrameGivenBySensorTagsIsCoherentWithMeasurementFrameGivenByFrame(modelPath, comp, sensors, "l_arm_ft");
- // ok = checkFTMeasurementFrameGivenBySensorTagsIsCoherentWithMeasurementFrameGivenByFrame(modelPath, comp, sensors, "r_arm_ft") && ok;
- bool ok = checkFTMeasurementFrameGivenBySensorTagsIsCoherentWithMeasurementFrameGivenByFrame(modelPath, comp, sensors, "l_leg_ft");
+ bool ok = checkFTMeasurementFrameGivenBySensorTagsIsCoherentWithMeasurementFrameGivenByFrame(modelPath, comp, sensors, "l_arm_ft");
+ ok = checkFTMeasurementFrameGivenBySensorTagsIsCoherentWithMeasurementFrameGivenByFrame(modelPath, comp, sensors, "r_arm_ft") && ok;
+ ok = checkFTMeasurementFrameGivenBySensorTagsIsCoherentWithMeasurementFrameGivenByFrame(modelPath, comp, sensors, "l_leg_ft") && ok;
ok = checkFTMeasurementFrameGivenBySensorTagsIsCoherentWithMeasurementFrameGivenByFrame(modelPath, comp, sensors, "r_leg_ft") && ok;
ok = checkFTMeasurementFrameGivenBySensorTagsIsCoherentWithMeasurementFrameGivenByFrame(modelPath, comp, sensors, "l_foot_rear_ft") && ok;
ok = checkFTMeasurementFrameGivenBySensorTagsIsCoherentWithMeasurementFrameGivenByFrame(modelPath, comp, sensors, "r_foot_rear_ft") && ok;
diff --git a/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options.yaml b/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options.yaml
index 7c14d124..077dcd35 100644
--- a/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options.yaml
+++ b/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options.yaml
@@ -702,30 +702,30 @@ exportedFrames:
# Sensors options
forceTorqueSensors:
- # - jointName: l_arm_ft_sensor
- # directionChildToParent: Yes
- # exportFrameInURDF: Yes
- # frame: sensor
- # frameName: SCSYS_L_SHOULDER_2_FT
- # linkName: l_shoulder_2
- # sensorName: l_arm_ft
- # sensorBlobs:
- # - |
- #
- # model://ergoCub/conf/FT/gazebo_ergocub_left_arm_ft.ini
- #
- # - jointName: r_arm_ft_sensor
- # directionChildToParent: Yes
- # exportFrameInURDF: Yes
- # frame: sensor
- # frameName: SCSYS_R_SHOULDER_2_FT
- # linkName: r_shoulder_2
- # sensorName: r_arm_ft
- # sensorBlobs:
- # - |
- #
- # model://ergoCub/conf/FT/gazebo_ergocub_right_arm_ft.ini
- #
+ - jointName: l_arm_ft_sensor
+ directionChildToParent: Yes
+ exportFrameInURDF: Yes
+ frame: sensor
+ frameName: SCSYS_L_SHOULDER_2_FT
+ linkName: l_shoulder_2
+ sensorName: l_arm_ft
+ sensorBlobs:
+ - |
+
+ model://ergoCub/conf/FT/gazebo_ergocub_left_arm_ft.ini
+
+ - jointName: r_arm_ft_sensor
+ directionChildToParent: Yes
+ exportFrameInURDF: Yes
+ frame: sensor
+ frameName: SCSYS_R_SHOULDER_2_FT
+ linkName: r_shoulder_2
+ sensorName: r_arm_ft
+ sensorBlobs:
+ - |
+
+ model://ergoCub/conf/FT/gazebo_ergocub_right_arm_ft.ini
+
# left leg
- jointName: l_leg_ft_sensor
directionChildToParent: Yes
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 682e8d3a..dd046544 100644
--- a/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options_gazebo.yaml
+++ b/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options_gazebo.yaml
@@ -919,30 +919,30 @@ assignedInertias:
# Sensors options
forceTorqueSensors:
- # - jointName: l_arm_ft_sensor
- # directionChildToParent: Yes
- # exportFrameInURDF: Yes
- # frame: sensor
- # frameName: SCSYS_L_SHOULDER_2_FT
- # linkName: l_shoulder_2
- # sensorName: l_arm_ft
- # sensorBlobs:
- # - |
- #
- # model://ergoCub/conf/FT/gazebo_ergocub_left_arm_ft.ini
- #
- # - jointName: r_arm_ft_sensor
- # directionChildToParent: Yes
- # exportFrameInURDF: Yes
- # frame: sensor
- # frameName: SCSYS_R_SHOULDER_2_FT
- # linkName: r_shoulder_2
- # sensorName: r_arm_ft
- # sensorBlobs:
- # - |
- #
- # model://ergoCub/conf/FT/gazebo_ergocub_right_arm_ft.ini
- #
+ - jointName: l_arm_ft_sensor
+ directionChildToParent: Yes
+ exportFrameInURDF: Yes
+ frame: sensor
+ frameName: SCSYS_L_SHOULDER_2_FT
+ linkName: l_shoulder_2
+ sensorName: l_arm_ft
+ sensorBlobs:
+ - |
+
+ model://ergoCub/conf/FT/gazebo_ergocub_left_arm_ft.ini
+
+ - jointName: r_arm_ft_sensor
+ directionChildToParent: Yes
+ exportFrameInURDF: Yes
+ frame: sensor
+ frameName: SCSYS_R_SHOULDER_2_FT
+ linkName: r_shoulder_2
+ sensorName: r_arm_ft
+ sensorBlobs:
+ - |
+
+ model://ergoCub/conf/FT/gazebo_ergocub_right_arm_ft.ini
+
# left leg
- jointName: l_leg_ft_sensor
directionChildToParent: Yes
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 a0698f82..e081828f 100644
--- a/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options_minContacts.yaml
+++ b/urdf/creo2urdf/data/ergocub1_1/ERGOCUB_all_options_minContacts.yaml
@@ -1032,30 +1032,30 @@ assignedCollisionGeometry:
# Sensors options
forceTorqueSensors:
- # - jointName: l_arm_ft_sensor
- # directionChildToParent: Yes
- # exportFrameInURDF: Yes
- # frame: sensor
- # frameName: SCSYS_L_SHOULDER_2_FT
- # linkName: l_shoulder_2
- # sensorName: l_arm_ft
- # sensorBlobs:
- # - |
- #
- # model://ergoCub/conf/FT/gazebo_ergocub_left_arm_ft.ini
- #
- # - jointName: r_arm_ft_sensor
- # directionChildToParent: Yes
- # exportFrameInURDF: Yes
- # frame: sensor
- # frameName: SCSYS_R_SHOULDER_2_FT
- # linkName: r_shoulder_2
- # sensorName: r_arm_ft
- # sensorBlobs:
- # - |
- #
- # model://ergoCub/conf/FT/gazebo_ergocub_right_arm_ft.ini
- #
+ - jointName: l_arm_ft_sensor
+ directionChildToParent: Yes
+ exportFrameInURDF: Yes
+ frame: sensor
+ frameName: SCSYS_L_SHOULDER_2_FT
+ linkName: l_shoulder_2
+ sensorName: l_arm_ft
+ sensorBlobs:
+ - |
+
+ model://ergoCub/conf/FT/gazebo_ergocub_left_arm_ft.ini
+
+ - jointName: r_arm_ft_sensor
+ directionChildToParent: Yes
+ exportFrameInURDF: Yes
+ frame: sensor
+ frameName: SCSYS_R_SHOULDER_2_FT
+ linkName: r_shoulder_2
+ sensorName: r_arm_ft
+ sensorBlobs:
+ - |
+
+ model://ergoCub/conf/FT/gazebo_ergocub_right_arm_ft.ini
+
# left leg
- jointName: l_leg_ft_sensor
directionChildToParent: Yes
diff --git a/urdf/ergoCub/conf/ergocub.xml b/urdf/ergoCub/conf/ergocub.xml
index 877f43b8..44643c8b 100644
--- a/urdf/ergoCub/conf/ergocub.xml
+++ b/urdf/ergoCub/conf/ergocub.xml
@@ -24,8 +24,8 @@
-
+
+
diff --git a/urdf/ergoCub/robots/ergoCubGazeboV1_1/model.urdf b/urdf/ergoCub/robots/ergoCubGazeboV1_1/model.urdf
index 64565ed3..09175cef 100644
--- a/urdf/ergoCub/robots/ergoCubGazeboV1_1/model.urdf
+++ b/urdf/ergoCub/robots/ergoCubGazeboV1_1/model.urdf
@@ -2146,6 +2146,12 @@
+
+
+
+
+
+
@@ -2164,6 +2170,12 @@
+
+
+
+
+
+
@@ -3247,6 +3259,28 @@
0.000000 0.000000 0.800000 0.000000 0.000000 0.000000
+
+
+ 1
+ 100
+
+ sensor
+ child_to_parent
+
+ -3.46945e-18 0 0 3.14159 1.94289e-16 -1.5708
+
+ model://ergoCub/conf/FT/gazebo_ergocub_left_arm_ft.ini
+
+
+
+
+
+
+ sensor
+ child_to_parent
+
+
+
1
@@ -3313,6 +3347,28 @@
+
+
+ 1
+ 100
+
+ sensor
+ child_to_parent
+
+ 0 0 0 -3.14159 -2.77556e-17 1.5708
+
+ model://ergoCub/conf/FT/gazebo_ergocub_right_arm_ft.ini
+
+
+
+
+
+
+ sensor
+ child_to_parent
+
+
+
1
diff --git a/urdf/ergoCub/robots/ergoCubGazeboV1_1_minContacts/model.urdf b/urdf/ergoCub/robots/ergoCubGazeboV1_1_minContacts/model.urdf
index bd2d6ebd..87088e73 100644
--- a/urdf/ergoCub/robots/ergoCubGazeboV1_1_minContacts/model.urdf
+++ b/urdf/ergoCub/robots/ergoCubGazeboV1_1_minContacts/model.urdf
@@ -1960,6 +1960,12 @@
+
+
+
+
+
+
@@ -1978,6 +1984,12 @@
+
+
+
+
+
+
@@ -3061,6 +3073,28 @@
0.000000 0.000000 0.800000 0.000000 0.000000 0.000000
+
+
+ 1
+ 100
+
+ sensor
+ child_to_parent
+
+ -3.46945e-18 0 0 3.14159 1.94289e-16 -1.5708
+
+ model://ergoCub/conf/FT/gazebo_ergocub_left_arm_ft.ini
+
+
+
+
+
+
+ sensor
+ child_to_parent
+
+
+
1
@@ -3127,6 +3161,28 @@
+
+
+ 1
+ 100
+
+ sensor
+ child_to_parent
+
+ 0 0 0 -3.14159 -2.77556e-17 1.5708
+
+ model://ergoCub/conf/FT/gazebo_ergocub_right_arm_ft.ini
+
+
+
+
+
+
+ sensor
+ child_to_parent
+
+
+
1
diff --git a/urdf/ergoCub/robots/ergoCubSN001/model.urdf b/urdf/ergoCub/robots/ergoCubSN001/model.urdf
index 0005ad87..74a25c8f 100644
--- a/urdf/ergoCub/robots/ergoCubSN001/model.urdf
+++ b/urdf/ergoCub/robots/ergoCubSN001/model.urdf
@@ -2146,6 +2146,12 @@
+
+
+
+
+
+
@@ -2164,6 +2170,12 @@
+
+
+
+
+
+
@@ -3247,6 +3259,28 @@
0.000000 0.000000 0.800000 0.000000 0.000000 0.000000
+
+
+ 1
+ 100
+
+ sensor
+ child_to_parent
+
+ -3.46945e-18 0 0 3.14159 1.94289e-16 -1.5708
+
+ model://ergoCub/conf/FT/gazebo_ergocub_left_arm_ft.ini
+
+
+
+
+
+
+ sensor
+ child_to_parent
+
+
+
1
@@ -3313,6 +3347,28 @@
+
+
+ 1
+ 100
+
+ sensor
+ child_to_parent
+
+ 0 0 0 -3.14159 -2.77556e-17 1.5708
+
+ model://ergoCub/conf/FT/gazebo_ergocub_right_arm_ft.ini
+
+
+
+
+
+
+ sensor
+ child_to_parent
+
+
+
1