diff --git a/CMakeLists.txt b/CMakeLists.txt index ff17c91..65e9e5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.8...3.16) project(icub-models - VERSION 2.7.0) + VERSION 2.8.0) include(GNUInstallDirs) diff --git a/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/gazebo_icub_left_hand_mais.ini b/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/gazebo_icub_left_hand_mais.ini index e5157a0..1478ea0 100644 --- a/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/gazebo_icub_left_hand_mais.ini +++ b/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/gazebo_icub_left_hand_mais.ini @@ -1,8 +1,4 @@ -[WRAPPER] -name /icubSim/left_hand/analog:o -period 10 -networks (left_mais) -device analogServer - -[left_mais] +disableImplicitNetworkWrapper +yarpDeviceName icub_left_hand_mais_hardware_device +sensorName l_hand_mais jointNames l_hand_thumb_1_joint l_hand_thumb_2_joint l_hand_thumb_3_joint l_hand_index_1_joint l_hand_index_2_joint l_hand_index_3_joint l_hand_middle_1_joint l_hand_middle_2_joint l_hand_middle_3_joint l_hand_ring_1_joint l_hand_ring_2_joint l_hand_ring_3_joint l_hand_little_1_joint l_hand_little_2_joint l_hand_little_3_joint diff --git a/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/gazebo_icub_right_hand_mais.ini b/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/gazebo_icub_right_hand_mais.ini index fe5bae0..d6321d6 100644 --- a/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/gazebo_icub_right_hand_mais.ini +++ b/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/gazebo_icub_right_hand_mais.ini @@ -1,8 +1,4 @@ -[WRAPPER] -name /icubSim/right_hand/analog:o -period 10 -networks (right_mais) -device analogServer - -[right_mais] +disableImplicitNetworkWrapper +yarpDeviceName icub_right_hand_mais_hardware_device +sensorName r_hand_mais jointNames r_hand_thumb_1_joint r_hand_thumb_2_joint r_hand_thumb_3_joint r_hand_index_1_joint r_hand_index_2_joint r_hand_index_3_joint r_hand_middle_1_joint r_hand_middle_2_joint r_hand_middle_3_joint r_hand_ring_1_joint r_hand_ring_2_joint r_hand_ring_3_joint r_hand_little_1_joint r_hand_little_2_joint r_hand_little_3_joint diff --git a/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/icub.xml b/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/icub.xml index 13d29d5..e62f576 100644 --- a/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/icub.xml +++ b/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/icub.xml @@ -1,7 +1,7 @@ - + @@ -35,5 +35,13 @@ + + + + + + + + diff --git a/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/icub_ros2.xml b/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/icub_ros2.xml index 6c06d0b..ca530ee 100644 --- a/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/icub_ros2.xml +++ b/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/icub_ros2.xml @@ -1,7 +1,7 @@ - + @@ -35,6 +35,13 @@ + + + + + + + diff --git a/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/wrappers/MAIS/left_arm-mais_wrapper.xml b/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/wrappers/MAIS/left_arm-mais_wrapper.xml new file mode 100644 index 0000000..f3a9764 --- /dev/null +++ b/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/wrappers/MAIS/left_arm-mais_wrapper.xml @@ -0,0 +1,16 @@ + + + + + 10 + /icubSim/left_hand/MAIS + + + + + icub_left_hand_mais_hardware_device + + + + + diff --git a/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/wrappers/MAIS/right_arm-mais_wrapper.xml b/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/wrappers/MAIS/right_arm-mais_wrapper.xml new file mode 100644 index 0000000..ff706dd --- /dev/null +++ b/iCub_manual/conf_manual/iCubGazeboV2_5_visuomanip/wrappers/MAIS/right_arm-mais_wrapper.xml @@ -0,0 +1,16 @@ + + + + + 10 + /icubSim/right_hand/MAIS + + + + + icub_right_hand_mais_hardware_device + + + + + diff --git a/iCub_manual/package.xml b/iCub_manual/package.xml index 11c326f..3f7b013 100644 --- a/iCub_manual/package.xml +++ b/iCub_manual/package.xml @@ -1,6 +1,6 @@ iCub - 2.7.0 + 2.8.0 This is not an actual package, but rather a placeholder to make sure that the share/iCub directory is found as the