Merge branch 'master' into devel

robotology · Apr 19, 2023 · 56117b2 · 56117b2
2 parents fa70982 + 3899e31
commit 56117b2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/ergoCubSN000/ergocub_all.xml b/ergoCubSN000/ergocub_all.xml
@@ -75,17 +75,17 @@
     <xi:include href="hardware/FT/right_arm-eb1-j0_1-strain.xml" />
     <xi:include href="hardware/FT/left_leg-eb9-j4_5-strain.xml" />
     <xi:include href="hardware/FT/right_leg-eb7-j4_5-strain.xml" />
-    <!-- <xi:include href="hardware/FT/left_leg-eb8-j0_3-strain.xml" /> -->
-    <!-- <xi:include href="hardware/FT/right_leg-eb6-j0_3-strain.xml" /> -->
+    <xi:include href="hardware/FT/left_leg-eb8-j0_3-strain.xml" /> 
+    <xi:include href="hardware/FT/right_leg-eb6-j0_3-strain.xml" /> 
 
 
     <!-- FT SENSORS - MULTIPLE ANALOG SENSOR SERVERS -->
     <xi:include href="wrappers/FT/left_arm-FT_wrapper.xml" />
     <xi:include href="wrappers/FT/right_arm-FT_wrapper.xml" />
     <xi:include href="wrappers/FT/left_foot-FT_wrapper.xml" />
     <xi:include href="wrappers/FT/right_foot-FT_wrapper.xml" />
-    <!-- <xi:include href="wrappers/FT/left_leg-FT_wrapper_multipleSens.xml" /> -->
-    <!-- <xi:include href="wrappers/FT/right_leg-FT_wrapper_multipleSens.xml" /> -->
+    <xi:include href="wrappers/FT/left_leg-FT_wrapper_multipleSens.xml" /> 
+    <xi:include href="wrappers/FT/right_leg-FT_wrapper_multipleSens.xml" /> 
 
 
     <!-- INERTIAL SENSOR -->

diff --git a/ergoCubSN000/ergocub_all_ros2.xml b/ergoCubSN000/ergocub_all_ros2.xml
@@ -78,6 +78,12 @@
    <xi:include href="hardware/FT/left_arm-eb2-j0_1-strain.xml" />
    <xi:include href="hardware/FT/right_arm-eb1-j0_1-strain.xml" />
 
+   <xi:include href="wrappers/FT/left_leg-FT_wrapper_multipleSens.xml" /> 
+   <xi:include href="wrappers/FT/right_leg-FT_wrapper_multipleSens.xml" /> 
+
+   <xi:include href="hardware/FT/left_leg-eb8-j0_3-strain.xml" /> 
+   <xi:include href="hardware/FT/right_leg-eb6-j0_3-strain.xml" /> 
+
 
    <xi:include href="wrappers/FT/left_foot-FT_wrapper.xml" />
    <xi:include href="wrappers/FT/right_foot-FT_wrapper.xml" />

diff --git a/ergoCubSN000/ergocub_wbd.xml b/ergoCubSN000/ergocub_wbd.xml
@@ -75,16 +75,16 @@
     <xi:include href="hardware/FT/right_arm-eb1-j0_1-strain.xml" />
     <xi:include href="hardware/FT/left_leg-eb9-j4_5-strain.xml" />
     <xi:include href="hardware/FT/right_leg-eb7-j4_5-strain.xml" />
-    <!-- <xi:include href="hardware/FT/left_leg-eb8-j0_3-strain.xml" /> -->
-    <!-- <xi:include href="hardware/FT/right_leg-eb6-j0_3-strain.xml" /> -->
+    <xi:include href="hardware/FT/left_leg-eb8-j0_3-strain.xml" />
+    <xi:include href="hardware/FT/right_leg-eb6-j0_3-strain.xml" />
 
     <!-- FT SENSORS - MULTIPLE ANALOG SENSOR SERVERS -->
     <xi:include href="wrappers/FT/left_arm-FT_wrapper.xml" />
     <xi:include href="wrappers/FT/right_arm-FT_wrapper.xml" />
     <xi:include href="wrappers/FT/left_foot-FT_wrapper.xml" />
     <xi:include href="wrappers/FT/right_foot-FT_wrapper.xml" />
-    <!-- <xi:include href="wrappers/FT/left_leg-FT_wrapper_multipleSens.xml" /> -->
-    <!-- <xi:include href="wrappers/FT/right_leg-FT_wrapper_multipleSens.xml" /> -->
+    <xi:include href="wrappers/FT/left_leg-FT_wrapper_multipleSens.xml" />
+    <xi:include href="wrappers/FT/right_leg-FT_wrapper_multipleSens.xml" />
 
     <!-- INERTIAL SENSOR -->
     <xi:include href="wrappers/inertials/head-imuFilter_wrapper.xml" />

diff --git a/ergoCubSN000/ft.xml b/ergoCubSN000/ft.xml
@@ -18,7 +18,11 @@
    <xi:include href="hardware/FT/left_arm-eb2-j0_1-strain.xml" />
    <xi:include href="hardware/FT/right_arm-eb1-j0_1-strain.xml" /> 
 
+   <xi:include href="wrappers/FT/left_leg-FT_wrapper_multipleSens.xml" /> 
+   <xi:include href="wrappers/FT/right_leg-FT_wrapper_multipleSens.xml" /> 
 
+   <xi:include href="hardware/FT/left_leg-eb8-j0_3-strain.xml" /> 
+   <xi:include href="hardware/FT/right_leg-eb6-j0_3-strain.xml" /> 
 
    <xi:include href="wrappers/FT/left_foot-FT_wrapper.xml" />
    <xi:include href="wrappers/FT/right_foot-FT_wrapper.xml" />