From 7920e235006da73c7e2450aceabab34a18302bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Genesio=20=28=E4=BA=8C=E3=82=B3=E3=82=B2?= =?UTF-8?q?=E3=83=8D=29?= Date: Thu, 27 Jun 2024 17:25:47 +0200 Subject: [PATCH] Remove all the embObjPSC and embObjMultiEnc references (#662) --- R1SN001/CER.xml | 6 - R1SN001/CER_noPSC.xml | 106 ------------------ R1SN001/CMakeLists.txt | 11 -- R1SN001/hardware/MAIS/left_hand-multi_enc.xml | 15 --- .../hardware/MAIS/right_hand-multi_enc.xml | 15 --- R1SN001/hardware/PSC/left_hand-psc.xml | 52 --------- R1SN001/hardware/PSC/right_hand-psc.xml | 52 --------- .../wrappers/MAIS/left_hand-mais_wrapper.xml | 24 ---- .../wrappers/MAIS/right_hand-mais_wrapper.xml | 24 ---- .../wrappers/PSC/cer_left_arm-PSC_wrapper.xml | 17 --- .../PSC/cer_right_arm-PSC_wrapper.xml | 17 --- R1SN001/yarprobotinterface.ini | 2 +- R1SN002/CER.xml | 6 - R1SN002/hardware/MAIS/left_hand-multi_enc.xml | 15 --- .../hardware/MAIS/right_hand-multi_enc.xml | 15 --- R1SN002/hardware/PSC/left_hand-psc.xml | 52 --------- R1SN002/hardware/PSC/right_hand-psc.xml | 52 --------- .../wrappers/MAIS/left_hand-mais_wrapper.xml | 24 ---- .../wrappers/MAIS/right_hand-mais_wrapper.xml | 24 ---- .../wrappers/PSC/cer_left_arm-PSC_wrapper.xml | 17 --- .../PSC/cer_right_arm-PSC_wrapper.xml | 17 --- R1SN003/CER.xml | 12 +- R1SN003/hardware/MAIS/left_hand-multi_enc.xml | 15 --- .../hardware/MAIS/right_hand-multi_enc.xml | 15 --- R1SN003/hardware/PSC/left_hand-psc.xml | 52 --------- R1SN003/hardware/PSC/right_hand-psc.xml | 52 --------- .../wrappers/MAIS/left_hand-mais_wrapper.xml | 24 ---- .../wrappers/MAIS/right_hand-mais_wrapper.xml | 24 ---- .../wrappers/PSC/cer_left_arm-PSC_wrapper.xml | 17 --- .../PSC/cer_right_arm-PSC_wrapper.xml | 17 --- .../hardware/MAIS/left_hand-multi_enc.xml | 15 --- .../hardware/MAIS/right_hand-multi_enc.xml | 15 --- .../wrappers/MAIS/left_hand-mais_wrapper.xml | 24 ---- .../wrappers/MAIS/right_hand-mais_wrapper.xml | 24 ---- .../multipleEncoders/left_hand-multi_enc.xml | 17 --- .../multipleEncoders/left_hand-multi_enc2.xml | 17 --- experimentalSetups/arm-v3/icub_all.xml | 24 ++-- experimentalSetups/arm-v3/icub_only_24.xml | 22 ++-- experimentalSetups/arm-v3/main.xml | 22 ++-- .../IMU_new_forearm-no_hand.xml | 20 ++-- .../multienc/wrist-eb2-j0_2-multienc.xml | 13 --- .../wristMK2.1_SN002F/new_forearm-no_hand.xml | 20 ++-- .../wrist2_1-encoder_read.xml | 20 ++-- tests/dockerfiles/Dockerfile | 3 +- 44 files changed, 57 insertions(+), 990 deletions(-) delete mode 100644 R1SN001/CER_noPSC.xml delete mode 100644 R1SN001/CMakeLists.txt delete mode 100644 R1SN001/hardware/MAIS/left_hand-multi_enc.xml delete mode 100644 R1SN001/hardware/MAIS/right_hand-multi_enc.xml delete mode 100644 R1SN001/hardware/PSC/left_hand-psc.xml delete mode 100644 R1SN001/hardware/PSC/right_hand-psc.xml delete mode 100644 R1SN001/wrappers/MAIS/left_hand-mais_wrapper.xml delete mode 100644 R1SN001/wrappers/MAIS/right_hand-mais_wrapper.xml delete mode 100644 R1SN001/wrappers/PSC/cer_left_arm-PSC_wrapper.xml delete mode 100644 R1SN001/wrappers/PSC/cer_right_arm-PSC_wrapper.xml delete mode 100644 R1SN002/hardware/MAIS/left_hand-multi_enc.xml delete mode 100644 R1SN002/hardware/MAIS/right_hand-multi_enc.xml delete mode 100644 R1SN002/hardware/PSC/left_hand-psc.xml delete mode 100644 R1SN002/hardware/PSC/right_hand-psc.xml delete mode 100644 R1SN002/wrappers/MAIS/left_hand-mais_wrapper.xml delete mode 100644 R1SN002/wrappers/MAIS/right_hand-mais_wrapper.xml delete mode 100644 R1SN002/wrappers/PSC/cer_left_arm-PSC_wrapper.xml delete mode 100644 R1SN002/wrappers/PSC/cer_right_arm-PSC_wrapper.xml delete mode 100644 R1SN003/hardware/MAIS/left_hand-multi_enc.xml delete mode 100644 R1SN003/hardware/MAIS/right_hand-multi_enc.xml delete mode 100644 R1SN003/hardware/PSC/left_hand-psc.xml delete mode 100644 R1SN003/hardware/PSC/right_hand-psc.xml delete mode 100644 R1SN003/wrappers/MAIS/left_hand-mais_wrapper.xml delete mode 100644 R1SN003/wrappers/MAIS/right_hand-mais_wrapper.xml delete mode 100644 R1SN003/wrappers/PSC/cer_left_arm-PSC_wrapper.xml delete mode 100644 R1SN003/wrappers/PSC/cer_right_arm-PSC_wrapper.xml delete mode 100644 experimentalSetups/R1hands070218/hardware/MAIS/left_hand-multi_enc.xml delete mode 100644 experimentalSetups/R1hands070218/hardware/MAIS/right_hand-multi_enc.xml delete mode 100644 experimentalSetups/R1hands070218/wrappers/MAIS/left_hand-mais_wrapper.xml delete mode 100644 experimentalSetups/R1hands070218/wrappers/MAIS/right_hand-mais_wrapper.xml delete mode 100644 experimentalSetups/arm-v3/hardware/multipleEncoders/left_hand-multi_enc.xml delete mode 100644 experimentalSetups/arm-v3/hardware/multipleEncoders/left_hand-multi_enc2.xml delete mode 100644 experimentalSetups/wristMK2.1_SN002F/hardware/multienc/wrist-eb2-j0_2-multienc.xml diff --git a/R1SN001/CER.xml b/R1SN001/CER.xml index 8da5836718..ec118e7429 100644 --- a/R1SN001/CER.xml +++ b/R1SN001/CER.xml @@ -84,12 +84,6 @@ --> - - - - - - diff --git a/R1SN001/CER_noPSC.xml b/R1SN001/CER_noPSC.xml deleted file mode 100644 index 7b14dd1221..0000000000 --- a/R1SN001/CER_noPSC.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/R1SN001/CMakeLists.txt b/R1SN001/CMakeLists.txt deleted file mode 100644 index 873972422a..0000000000 --- a/R1SN001/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -set(appname R1SN001) - -set(scripts CER.xml CER_noPSC.xml yarprobotinterface.ini general.xml yarpmotorgui.ini firmwareupdater.ini) - -yarp_install(FILES ${scripts} DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname}) -yarp_install(DIRECTORY calibrators DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname}) -yarp_install(DIRECTORY wrappers DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname}) -yarp_install(DIRECTORY hardware DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname}) -yarp_install(DIRECTORY sensors DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname}) -yarp_install(DIRECTORY camera DESTINATION ${ICUBCONTRIB_ROBOTS_INSTALL_DIR}/${appname}) - diff --git a/R1SN001/hardware/MAIS/left_hand-multi_enc.xml b/R1SN001/hardware/MAIS/left_hand-multi_enc.xml deleted file mode 100644 index 6015e1ec56..0000000000 --- a/R1SN001/hardware/MAIS/left_hand-multi_enc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - 0 1 - -182.044 182.044 1.0 -182.044 182.044 1.0 - - - - - diff --git a/R1SN001/hardware/MAIS/right_hand-multi_enc.xml b/R1SN001/hardware/MAIS/right_hand-multi_enc.xml deleted file mode 100644 index 4c00193c10..0000000000 --- a/R1SN001/hardware/MAIS/right_hand-multi_enc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - 0 1 - -182.044 182.044 1.0 -182.044 182.044 1.0 - - - - - diff --git a/R1SN001/hardware/PSC/left_hand-psc.xml b/R1SN001/hardware/PSC/left_hand-psc.xml deleted file mode 100644 index 57e27174f8..0000000000 --- a/R1SN001/hardware/PSC/left_hand-psc.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - eomn_serv_AS_psc - - - - - eobrd_psc - - - 2 - 0 - - - 0 - 0 - 0 - - - - - id_left_hand1 id_left_hand2 id_left_hand3 - eoas_psc_angle eoas_psc_angle eoas_psc_angle - CAN1:1 CAN1:2 CAN1:3 - - - - - - 50 - id_left_hand1 id_left_hand2 id_left_hand3 - - - - - - - - - - - diff --git a/R1SN001/hardware/PSC/right_hand-psc.xml b/R1SN001/hardware/PSC/right_hand-psc.xml deleted file mode 100644 index 05e27fb852..0000000000 --- a/R1SN001/hardware/PSC/right_hand-psc.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - eomn_serv_AS_psc - - - - - eobrd_psc - - - 2 - 0 - - - 0 - 0 - 0 - - - - - id_right_hand1 id_right_hand2 id_right_hand3 - eoas_psc_angle eoas_psc_angle eoas_psc_angle - CAN1:1 CAN1:2 CAN1:3 - - - - - - 50 - id_right_hand1 id_right_hand2 id_right_hand3 - - - - - - - - - - - diff --git a/R1SN001/wrappers/MAIS/left_hand-mais_wrapper.xml b/R1SN001/wrappers/MAIS/left_hand-mais_wrapper.xml deleted file mode 100644 index 5d527bba0c..0000000000 --- a/R1SN001/wrappers/MAIS/left_hand-mais_wrapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - 10 - /cer/left_hand/MAIS - - - - left_hand_multienc - - - - - true - /cer-left_hand_MAIS - /joint_states - sensor_msgs/JointState - l_hand_paddle_distal_joint l_hand_paddle_proximal_joint l_dummy_1 l_hand_thumb_proximal_joint l_hand_thumb_distal_joint l_dummy_2 - - - - - diff --git a/R1SN001/wrappers/MAIS/right_hand-mais_wrapper.xml b/R1SN001/wrappers/MAIS/right_hand-mais_wrapper.xml deleted file mode 100644 index de5c54d92a..0000000000 --- a/R1SN001/wrappers/MAIS/right_hand-mais_wrapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - 10 - /cer/right_hand/MAIS - - - - right_hand_multienc - - - - - true - /cer-right_hand_MAIS - /joint_states - sensor_msgs/JointState - r_hand_paddle_distal_joint r_hand_paddle_proximal_joint r_dummy_1 r_hand_thumb_distal_joint r_hand_thumb_proximal_joint r_dummy_2 - - - - - diff --git a/R1SN001/wrappers/PSC/cer_left_arm-PSC_wrapper.xml b/R1SN001/wrappers/PSC/cer_left_arm-PSC_wrapper.xml deleted file mode 100644 index 7836399993..0000000000 --- a/R1SN001/wrappers/PSC/cer_left_arm-PSC_wrapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - 10 - /cer/left_hand/PSC:o - - - - - left_hand-psc - - - - - - diff --git a/R1SN001/wrappers/PSC/cer_right_arm-PSC_wrapper.xml b/R1SN001/wrappers/PSC/cer_right_arm-PSC_wrapper.xml deleted file mode 100644 index fa923e9a67..0000000000 --- a/R1SN001/wrappers/PSC/cer_right_arm-PSC_wrapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - 10 - /cer/right_hand/PSC:o - - - - - right_hand-psc - - - - - - diff --git a/R1SN001/yarprobotinterface.ini b/R1SN001/yarprobotinterface.ini index d0f1d7e8a8..5857263426 100644 --- a/R1SN001/yarprobotinterface.ini +++ b/R1SN001/yarprobotinterface.ini @@ -1,3 +1,3 @@ -config ./CER_noPSC.xml +config ./CER.xml enable_tags (enable_ros2) disable_tags () diff --git a/R1SN002/CER.xml b/R1SN002/CER.xml index 812702cfa0..3423acfc78 100644 --- a/R1SN002/CER.xml +++ b/R1SN002/CER.xml @@ -86,12 +86,6 @@ --> - - - - - - diff --git a/R1SN002/hardware/MAIS/left_hand-multi_enc.xml b/R1SN002/hardware/MAIS/left_hand-multi_enc.xml deleted file mode 100644 index 6015e1ec56..0000000000 --- a/R1SN002/hardware/MAIS/left_hand-multi_enc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - 0 1 - -182.044 182.044 1.0 -182.044 182.044 1.0 - - - - - diff --git a/R1SN002/hardware/MAIS/right_hand-multi_enc.xml b/R1SN002/hardware/MAIS/right_hand-multi_enc.xml deleted file mode 100644 index a03bd1bb4f..0000000000 --- a/R1SN002/hardware/MAIS/right_hand-multi_enc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - 0 1 - -182.044 182.044 1.0 -182.044 182.044 1.0 - - - - - diff --git a/R1SN002/hardware/PSC/left_hand-psc.xml b/R1SN002/hardware/PSC/left_hand-psc.xml deleted file mode 100644 index 57e27174f8..0000000000 --- a/R1SN002/hardware/PSC/left_hand-psc.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - eomn_serv_AS_psc - - - - - eobrd_psc - - - 2 - 0 - - - 0 - 0 - 0 - - - - - id_left_hand1 id_left_hand2 id_left_hand3 - eoas_psc_angle eoas_psc_angle eoas_psc_angle - CAN1:1 CAN1:2 CAN1:3 - - - - - - 50 - id_left_hand1 id_left_hand2 id_left_hand3 - - - - - - - - - - - diff --git a/R1SN002/hardware/PSC/right_hand-psc.xml b/R1SN002/hardware/PSC/right_hand-psc.xml deleted file mode 100644 index 05e27fb852..0000000000 --- a/R1SN002/hardware/PSC/right_hand-psc.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - eomn_serv_AS_psc - - - - - eobrd_psc - - - 2 - 0 - - - 0 - 0 - 0 - - - - - id_right_hand1 id_right_hand2 id_right_hand3 - eoas_psc_angle eoas_psc_angle eoas_psc_angle - CAN1:1 CAN1:2 CAN1:3 - - - - - - 50 - id_right_hand1 id_right_hand2 id_right_hand3 - - - - - - - - - - - diff --git a/R1SN002/wrappers/MAIS/left_hand-mais_wrapper.xml b/R1SN002/wrappers/MAIS/left_hand-mais_wrapper.xml deleted file mode 100644 index 5d527bba0c..0000000000 --- a/R1SN002/wrappers/MAIS/left_hand-mais_wrapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - 10 - /cer/left_hand/MAIS - - - - left_hand_multienc - - - - - true - /cer-left_hand_MAIS - /joint_states - sensor_msgs/JointState - l_hand_paddle_distal_joint l_hand_paddle_proximal_joint l_dummy_1 l_hand_thumb_proximal_joint l_hand_thumb_distal_joint l_dummy_2 - - - - - diff --git a/R1SN002/wrappers/MAIS/right_hand-mais_wrapper.xml b/R1SN002/wrappers/MAIS/right_hand-mais_wrapper.xml deleted file mode 100644 index de5c54d92a..0000000000 --- a/R1SN002/wrappers/MAIS/right_hand-mais_wrapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - 10 - /cer/right_hand/MAIS - - - - right_hand_multienc - - - - - true - /cer-right_hand_MAIS - /joint_states - sensor_msgs/JointState - r_hand_paddle_distal_joint r_hand_paddle_proximal_joint r_dummy_1 r_hand_thumb_distal_joint r_hand_thumb_proximal_joint r_dummy_2 - - - - - diff --git a/R1SN002/wrappers/PSC/cer_left_arm-PSC_wrapper.xml b/R1SN002/wrappers/PSC/cer_left_arm-PSC_wrapper.xml deleted file mode 100644 index 7836399993..0000000000 --- a/R1SN002/wrappers/PSC/cer_left_arm-PSC_wrapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - 10 - /cer/left_hand/PSC:o - - - - - left_hand-psc - - - - - - diff --git a/R1SN002/wrappers/PSC/cer_right_arm-PSC_wrapper.xml b/R1SN002/wrappers/PSC/cer_right_arm-PSC_wrapper.xml deleted file mode 100644 index fa923e9a67..0000000000 --- a/R1SN002/wrappers/PSC/cer_right_arm-PSC_wrapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - 10 - /cer/right_hand/PSC:o - - - - - right_hand-psc - - - - - - diff --git a/R1SN003/CER.xml b/R1SN003/CER.xml index a0402aafc6..4b0f2d0326 100644 --- a/R1SN003/CER.xml +++ b/R1SN003/CER.xml @@ -84,12 +84,6 @@ --> - - - - - - @@ -100,11 +94,11 @@ - + - + - + diff --git a/R1SN003/hardware/MAIS/left_hand-multi_enc.xml b/R1SN003/hardware/MAIS/left_hand-multi_enc.xml deleted file mode 100644 index 6015e1ec56..0000000000 --- a/R1SN003/hardware/MAIS/left_hand-multi_enc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - 0 1 - -182.044 182.044 1.0 -182.044 182.044 1.0 - - - - - diff --git a/R1SN003/hardware/MAIS/right_hand-multi_enc.xml b/R1SN003/hardware/MAIS/right_hand-multi_enc.xml deleted file mode 100644 index a03bd1bb4f..0000000000 --- a/R1SN003/hardware/MAIS/right_hand-multi_enc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - 0 1 - -182.044 182.044 1.0 -182.044 182.044 1.0 - - - - - diff --git a/R1SN003/hardware/PSC/left_hand-psc.xml b/R1SN003/hardware/PSC/left_hand-psc.xml deleted file mode 100644 index 57e27174f8..0000000000 --- a/R1SN003/hardware/PSC/left_hand-psc.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - eomn_serv_AS_psc - - - - - eobrd_psc - - - 2 - 0 - - - 0 - 0 - 0 - - - - - id_left_hand1 id_left_hand2 id_left_hand3 - eoas_psc_angle eoas_psc_angle eoas_psc_angle - CAN1:1 CAN1:2 CAN1:3 - - - - - - 50 - id_left_hand1 id_left_hand2 id_left_hand3 - - - - - - - - - - - diff --git a/R1SN003/hardware/PSC/right_hand-psc.xml b/R1SN003/hardware/PSC/right_hand-psc.xml deleted file mode 100644 index 05e27fb852..0000000000 --- a/R1SN003/hardware/PSC/right_hand-psc.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - eomn_serv_AS_psc - - - - - eobrd_psc - - - 2 - 0 - - - 0 - 0 - 0 - - - - - id_right_hand1 id_right_hand2 id_right_hand3 - eoas_psc_angle eoas_psc_angle eoas_psc_angle - CAN1:1 CAN1:2 CAN1:3 - - - - - - 50 - id_right_hand1 id_right_hand2 id_right_hand3 - - - - - - - - - - - diff --git a/R1SN003/wrappers/MAIS/left_hand-mais_wrapper.xml b/R1SN003/wrappers/MAIS/left_hand-mais_wrapper.xml deleted file mode 100644 index 5d527bba0c..0000000000 --- a/R1SN003/wrappers/MAIS/left_hand-mais_wrapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - 10 - /cer/left_hand/MAIS - - - - left_hand_multienc - - - - - true - /cer-left_hand_MAIS - /joint_states - sensor_msgs/JointState - l_hand_paddle_distal_joint l_hand_paddle_proximal_joint l_dummy_1 l_hand_thumb_proximal_joint l_hand_thumb_distal_joint l_dummy_2 - - - - - diff --git a/R1SN003/wrappers/MAIS/right_hand-mais_wrapper.xml b/R1SN003/wrappers/MAIS/right_hand-mais_wrapper.xml deleted file mode 100644 index de5c54d92a..0000000000 --- a/R1SN003/wrappers/MAIS/right_hand-mais_wrapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - 10 - /cer/right_hand/MAIS - - - - right_hand_multienc - - - - - true - /cer-right_hand_MAIS - /joint_states - sensor_msgs/JointState - r_hand_paddle_distal_joint r_hand_paddle_proximal_joint r_dummy_1 r_hand_thumb_distal_joint r_hand_thumb_proximal_joint r_dummy_2 - - - - - diff --git a/R1SN003/wrappers/PSC/cer_left_arm-PSC_wrapper.xml b/R1SN003/wrappers/PSC/cer_left_arm-PSC_wrapper.xml deleted file mode 100644 index 7836399993..0000000000 --- a/R1SN003/wrappers/PSC/cer_left_arm-PSC_wrapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - 10 - /cer/left_hand/PSC:o - - - - - left_hand-psc - - - - - - diff --git a/R1SN003/wrappers/PSC/cer_right_arm-PSC_wrapper.xml b/R1SN003/wrappers/PSC/cer_right_arm-PSC_wrapper.xml deleted file mode 100644 index fa923e9a67..0000000000 --- a/R1SN003/wrappers/PSC/cer_right_arm-PSC_wrapper.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - 10 - /cer/right_hand/PSC:o - - - - - right_hand-psc - - - - - - diff --git a/experimentalSetups/R1hands070218/hardware/MAIS/left_hand-multi_enc.xml b/experimentalSetups/R1hands070218/hardware/MAIS/left_hand-multi_enc.xml deleted file mode 100644 index 142b8676d9..0000000000 --- a/experimentalSetups/R1hands070218/hardware/MAIS/left_hand-multi_enc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - 0 1 - -182.044 182.044 1.0 -182.044 182.044 1.0 - - - - - diff --git a/experimentalSetups/R1hands070218/hardware/MAIS/right_hand-multi_enc.xml b/experimentalSetups/R1hands070218/hardware/MAIS/right_hand-multi_enc.xml deleted file mode 100644 index b66e17aa69..0000000000 --- a/experimentalSetups/R1hands070218/hardware/MAIS/right_hand-multi_enc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - 0 1 - -182.044 182.044 1.0 -182.044 182.044 1.0 - - - - - diff --git a/experimentalSetups/R1hands070218/wrappers/MAIS/left_hand-mais_wrapper.xml b/experimentalSetups/R1hands070218/wrappers/MAIS/left_hand-mais_wrapper.xml deleted file mode 100644 index 5d527bba0c..0000000000 --- a/experimentalSetups/R1hands070218/wrappers/MAIS/left_hand-mais_wrapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - 10 - /cer/left_hand/MAIS - - - - left_hand_multienc - - - - - true - /cer-left_hand_MAIS - /joint_states - sensor_msgs/JointState - l_hand_paddle_distal_joint l_hand_paddle_proximal_joint l_dummy_1 l_hand_thumb_proximal_joint l_hand_thumb_distal_joint l_dummy_2 - - - - - diff --git a/experimentalSetups/R1hands070218/wrappers/MAIS/right_hand-mais_wrapper.xml b/experimentalSetups/R1hands070218/wrappers/MAIS/right_hand-mais_wrapper.xml deleted file mode 100644 index de5c54d92a..0000000000 --- a/experimentalSetups/R1hands070218/wrappers/MAIS/right_hand-mais_wrapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - 10 - /cer/right_hand/MAIS - - - - right_hand_multienc - - - - - true - /cer-right_hand_MAIS - /joint_states - sensor_msgs/JointState - r_hand_paddle_distal_joint r_hand_paddle_proximal_joint r_dummy_1 r_hand_thumb_distal_joint r_hand_thumb_proximal_joint r_dummy_2 - - - - - diff --git a/experimentalSetups/arm-v3/hardware/multipleEncoders/left_hand-multi_enc.xml b/experimentalSetups/arm-v3/hardware/multipleEncoders/left_hand-multi_enc.xml deleted file mode 100644 index 908ce516d5..0000000000 --- a/experimentalSetups/arm-v3/hardware/multipleEncoders/left_hand-multi_enc.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - 0 1 2 3 - - - - - diff --git a/experimentalSetups/arm-v3/hardware/multipleEncoders/left_hand-multi_enc2.xml b/experimentalSetups/arm-v3/hardware/multipleEncoders/left_hand-multi_enc2.xml deleted file mode 100644 index 639fe4bd32..0000000000 --- a/experimentalSetups/arm-v3/hardware/multipleEncoders/left_hand-multi_enc2.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - 0 1 2 3 - - - - - diff --git a/experimentalSetups/arm-v3/icub_all.xml b/experimentalSetups/arm-v3/icub_all.xml index 6dcae969db..133573c66f 100644 --- a/experimentalSetups/arm-v3/icub_all.xml +++ b/experimentalSetups/arm-v3/icub_all.xml @@ -4,26 +4,22 @@ - - + + - + - + - - + + - - - + - - + + - + diff --git a/experimentalSetups/arm-v3/icub_only_24.xml b/experimentalSetups/arm-v3/icub_only_24.xml index 75c1e00bdd..c384bc3c62 100644 --- a/experimentalSetups/arm-v3/icub_only_24.xml +++ b/experimentalSetups/arm-v3/icub_only_24.xml @@ -4,26 +4,22 @@ - - + + - - + - - + + - - - + - + - + diff --git a/experimentalSetups/arm-v3/main.xml b/experimentalSetups/arm-v3/main.xml index 31eb18b206..f0c6219856 100644 --- a/experimentalSetups/arm-v3/main.xml +++ b/experimentalSetups/arm-v3/main.xml @@ -4,26 +4,22 @@ - - + + - + - + - - + + - - - + - + - + diff --git a/experimentalSetups/wristMK2.1_SN002F/IMU_new_forearm-no_hand.xml b/experimentalSetups/wristMK2.1_SN002F/IMU_new_forearm-no_hand.xml index 519e3ea379..c46ff5f56b 100644 --- a/experimentalSetups/wristMK2.1_SN002F/IMU_new_forearm-no_hand.xml +++ b/experimentalSetups/wristMK2.1_SN002F/IMU_new_forearm-no_hand.xml @@ -7,23 +7,19 @@ - + - - - - + + + + - - - + --> + diff --git a/experimentalSetups/wristMK2.1_SN002F/hardware/multienc/wrist-eb2-j0_2-multienc.xml b/experimentalSetups/wristMK2.1_SN002F/hardware/multienc/wrist-eb2-j0_2-multienc.xml deleted file mode 100644 index 25940790a2..0000000000 --- a/experimentalSetups/wristMK2.1_SN002F/hardware/multienc/wrist-eb2-j0_2-multienc.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - 0 1 2 - 1.0 1.0 1.0 - - - diff --git a/experimentalSetups/wristMK2.1_SN002F/new_forearm-no_hand.xml b/experimentalSetups/wristMK2.1_SN002F/new_forearm-no_hand.xml index e826e58f58..bc47b7b402 100644 --- a/experimentalSetups/wristMK2.1_SN002F/new_forearm-no_hand.xml +++ b/experimentalSetups/wristMK2.1_SN002F/new_forearm-no_hand.xml @@ -7,23 +7,19 @@ - + - - - - + + + + - - - - + + diff --git a/experimentalSetups/wristMK2.1_SN002F/wrist2_1-encoder_read.xml b/experimentalSetups/wristMK2.1_SN002F/wrist2_1-encoder_read.xml index 3d98d833b7..bc47b7b402 100644 --- a/experimentalSetups/wristMK2.1_SN002F/wrist2_1-encoder_read.xml +++ b/experimentalSetups/wristMK2.1_SN002F/wrist2_1-encoder_read.xml @@ -7,23 +7,19 @@ - + - - - - + + + + - - - - - + - - + + diff --git a/tests/dockerfiles/Dockerfile b/tests/dockerfiles/Dockerfile index e1bdc107a8..a87baba635 100644 --- a/tests/dockerfiles/Dockerfile +++ b/tests/dockerfiles/Dockerfile @@ -106,7 +106,6 @@ RUN cd ${DEPENDENCIES_DIR} && \ -DENABLE_icubmod_embObjSkin:BOOL=ON \ -DENABLE_icubmod_embObjMultipleFTsensors:BOOL=ON \ -DENABLE_icubmod_embObjPOS:BOOL=ON \ - -DENABLE_icubmod_embObjPSC:BOOL=ON \ -DENABLE_icubmod_embObjBattery:BOOL=ON \ -DENABLE_icubmod_canBusFtSensor:BOOL=ON \ -DENABLE_icubmod_xsensmtx:BOOL=ON \ @@ -145,7 +144,7 @@ RUN cd ${DEPENDENCIES_DIR} && \ cmake .. \ -DCMAKE_PREFIX_PATH=${DEPENDENCIES_DIR}/install \ -DCMAKE_INSTALL_PREFIX=${DEPENDENCIES_DIR}/install && \ - cmake --build . --target install + cmake --build . --target install # Create user gitpod RUN useradd -l -u 33333 -G sudo -md /home/gitpod -s /bin/bash -p gitpod gitpod && \