From ef3ce5273dde92afd80bc8724de62917bc3e2ac6 Mon Sep 17 00:00:00 2001 From: philippe Date: Sat, 9 Nov 2019 19:28:50 -0500 Subject: [PATCH 01/19] =?UTF-8?q?Ajoute=20la=20config=20compl=C3=A8te=20de?= =?UTF-8?q?=20sara?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/.rosinstall | 101 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/src/.rosinstall b/src/.rosinstall index 1802947..95f36e0 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -1,3 +1,104 @@ + +- git: + local-name: LED-Visage-Arduino + uri: https://github.com/WalkingMachine/LED-Visage-Arduino.git + version: nouvelle_emotion +- git: + local-name: darknet_ros + uri: https://github.com/WalkingMachine/darknet_ros.git + version: feature/compression +- git: + local-name: dynamixel_control_hw + uri: https://github.com/WalkingMachine/dynamixel_control_hw.git + version: feature/histeresis +- git: + local-name: flexbe_app + uri: https://github.com/ffriese/flexbe_app.git + version: master +- git: + local-name: gender-age-classification + uri: https://github.com/WalkingMachine/gender-age-classification.git + version: master +- git: + local-name: generic_flexbe_states + uri: https://github.com/FlexBE/generic_flexbe_states.git + version: master +- git: + local-name: gpd + uri: https://github.com/atenpas/gpd.git + version: forward +- git: + local-name: gpg + uri: https://github.com/atenpas/gpg.git + version: master +- git: + local-name: lab_ros_speech_to_text + uri: https://github.com/WalkingMachine/lab_ros_speech_to_text.git + version: master +- git: + local-name: libdynamixel + uri: https://github.com/resibots/libdynamixel.git + version: x-series +- git: + local-name: marytts + uri: https://github.com/marytts/marytts + version: master +- git: + local-name: object_recognition_msgs + uri: https://github.com/wg-perception/object_recognition_msgs.git + version: master +- git: + local-name: odas_ros + uri: https://github.com/introlab/odas_ros.git + version: dev +- git: + local-name: people + uri: https://github.com/kdhansen/people.git + version: kinetic +- git: + local-name: robot_pose_publisher + uri: https://github.com/GT-RAIL/robot_pose_publisher.git + version: master +- git: + local-name: roboteq + uri: https://github.com/WalkingMachine/roboteq.git + version: master +- git: + local-name: robotiq_140_description + uri: https://github.com/WalkingMachine/robotiq_140_description.git + version: master +- git: + local-name: robotiq_140_gripper + uri: https://github.com/WalkingMachine/robotiq_140_gripper.git + version: master +- git: + local-name: ros-face-recognition + uri: https://github.com/WalkingMachine/ros-face-recognition.git + version: feature/remove_age +- git: + local-name: rviz_tools_py + uri: https://github.com/DavidB-CMU/rviz_tools_py.git + version: master +- git: + local-name: sara_behaviors + uri: https://github.com/WalkingMachine/sara_behaviors.git + version: merge_master +- git: + local-name: sara_control + uri: https://github.com/WalkingMachine/sara_control.git + version: ajustements +- git: + local-name: sara_description + uri: https://github.com/WalkingMachine/sara_description.git + version: lowPolyURDF +- git: + local-name: sara_launch + uri: https://github.com/WalkingMachine/sara_launch.git + version: master +- git: + local-name: sara_moveit + uri: https://github.com/WalkingMachine/sara_moveit.git + version: feature/simulation_safe - git: local-name: sara_msgs uri: https://github.com/walkingmachine/sara_msgs.git From 5376ce100315d081939402542920c0774cd0d045 Mon Sep 17 00:00:00 2001 From: philippe Date: Sat, 16 Nov 2019 17:44:59 -0500 Subject: [PATCH 02/19] Met la branche de sara_description sur master --- src/.rosinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/.rosinstall b/src/.rosinstall index 95f36e0..aa917f8 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -90,7 +90,7 @@ - git: local-name: sara_description uri: https://github.com/WalkingMachine/sara_description.git - version: lowPolyURDF + version: master - git: local-name: sara_launch uri: https://github.com/WalkingMachine/sara_launch.git From 5055e3a25e4e4b5a43c0c3bb93762cc0a4c5e668 Mon Sep 17 00:00:00 2001 From: philippe Date: Fri, 10 Jan 2020 11:44:16 -0500 Subject: [PATCH 03/19] Ajoute les configurations de test pour odas et dynamixel --- src/.rosinstall | 131 ++++++++++++++++++++++++------------------------ 1 file changed, 65 insertions(+), 66 deletions(-) diff --git a/src/.rosinstall b/src/.rosinstall index aa917f8..862b777 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -1,105 +1,104 @@ - - git: - local-name: LED-Visage-Arduino - uri: https://github.com/WalkingMachine/LED-Visage-Arduino.git - version: nouvelle_emotion + local-name: wm_admitance + uri: https://github.com/WalkingMachine/wm_admitance.git + version: master - git: - local-name: darknet_ros - uri: https://github.com/WalkingMachine/darknet_ros.git - version: feature/compression + local-name: sara_msgs + uri: https://github.com/walkingmachine/sara_msgs.git + version: master - git: - local-name: dynamixel_control_hw - uri: https://github.com/WalkingMachine/dynamixel_control_hw.git - version: feature/histeresis + local-name: sara_moveit + uri: https://github.com/WalkingMachine/sara_moveit.git + version: feature/simulation_safe - git: - local-name: flexbe_app - uri: https://github.com/ffriese/flexbe_app.git + local-name: sara_launch + uri: https://github.com/WalkingMachine/sara_launch.git version: master - git: - local-name: gender-age-classification - uri: https://github.com/WalkingMachine/gender-age-classification.git + local-name: sara_description + uri: https://github.com/WalkingMachine/sara_description.git version: master - git: - local-name: generic_flexbe_states - uri: https://github.com/FlexBE/generic_flexbe_states.git - version: master + local-name: sara_control + uri: https://github.com/WalkingMachine/sara_control.git + version: ajustements - git: - local-name: gpd - uri: https://github.com/atenpas/gpd.git - version: forward + local-name: sara_behaviors + uri: https://github.com/WalkingMachine/sara_behaviors.git + version: merge_master - git: - local-name: gpg - uri: https://github.com/atenpas/gpg.git + local-name: rviz_tools_py + uri: https://github.com/DavidB-CMU/rviz_tools_py.git version: master - git: - local-name: lab_ros_speech_to_text - uri: https://github.com/WalkingMachine/lab_ros_speech_to_text.git - version: master + local-name: ros-face-recognition + uri: https://github.com/WalkingMachine/ros-face-recognition.git + version: feature/remove_age - git: - local-name: libdynamixel - uri: https://github.com/resibots/libdynamixel.git - version: x-series + local-name: robotiq_140_gripper + uri: https://github.com/WalkingMachine/robotiq_140_gripper.git + version: master - git: - local-name: marytts - uri: https://github.com/marytts/marytts + local-name: robotiq_140_description + uri: https://github.com/WalkingMachine/robotiq_140_description.git version: master - git: - local-name: object_recognition_msgs - uri: https://github.com/wg-perception/object_recognition_msgs.git + local-name: roboteq + uri: https://github.com/WalkingMachine/roboteq.git version: master - git: - local-name: odas_ros - uri: https://github.com/introlab/odas_ros.git - version: dev + local-name: robot_pose_publisher + uri: https://github.com/GT-RAIL/robot_pose_publisher.git + version: master - git: local-name: people uri: https://github.com/kdhansen/people.git version: kinetic - git: - local-name: robot_pose_publisher - uri: https://github.com/GT-RAIL/robot_pose_publisher.git - version: master + local-name: odas_ros + uri: https://github.com/WalkingMachine/odas_ros.git + version: feature/auto_installation - git: - local-name: roboteq - uri: https://github.com/WalkingMachine/roboteq.git + local-name: object_recognition_msgs + uri: https://github.com/wg-perception/object_recognition_msgs.git version: master - git: - local-name: robotiq_140_description - uri: https://github.com/WalkingMachine/robotiq_140_description.git + local-name: marytts + uri: https://github.com/marytts/marytts version: master - git: - local-name: robotiq_140_gripper - uri: https://github.com/WalkingMachine/robotiq_140_gripper.git + local-name: lab_ros_speech_to_text + uri: https://github.com/WalkingMachine/lab_ros_speech_to_text.git version: master - git: - local-name: ros-face-recognition - uri: https://github.com/WalkingMachine/ros-face-recognition.git - version: feature/remove_age -- git: - local-name: rviz_tools_py - uri: https://github.com/DavidB-CMU/rviz_tools_py.git + local-name: gpg + uri: https://github.com/atenpas/gpg.git version: master - git: - local-name: sara_behaviors - uri: https://github.com/WalkingMachine/sara_behaviors.git - version: merge_master + local-name: gpd + uri: https://github.com/atenpas/gpd.git + version: forward - git: - local-name: sara_control - uri: https://github.com/WalkingMachine/sara_control.git - version: ajustements + local-name: generic_flexbe_states + uri: https://github.com/FlexBE/generic_flexbe_states.git + version: master - git: - local-name: sara_description - uri: https://github.com/WalkingMachine/sara_description.git + local-name: gender-age-classification + uri: https://github.com/WalkingMachine/gender-age-classification.git version: master - git: - local-name: sara_launch - uri: https://github.com/WalkingMachine/sara_launch.git + local-name: flexbe_app + uri: https://github.com/ffriese/flexbe_app.git version: master - git: - local-name: sara_moveit - uri: https://github.com/WalkingMachine/sara_moveit.git - version: feature/simulation_safe + local-name: dynamixel_control_hw + uri: https://github.com/WalkingMachine/dynamixel_control_hw.git + version: feature/install_libdynamixel - git: - local-name: sara_msgs - uri: https://github.com/walkingmachine/sara_msgs.git - version: master + local-name: darknet_ros + uri: https://github.com/WalkingMachine/darknet_ros.git + version: feature/compression +- git: + local-name: LED-Visage-Arduino + uri: https://github.com/WalkingMachine/LED-Visage-Arduino.git + version: nouvelle_emotion From 555ca93969df3368b6a0824fcf41f47cd03f2e12 Mon Sep 17 00:00:00 2001 From: philippe Date: Sun, 12 Jan 2020 16:26:22 -0500 Subject: [PATCH 04/19] Utilise la branche de test pour gpd --- src/.rosinstall | 128 ++++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/src/.rosinstall b/src/.rosinstall index 862b777..3630e44 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -1,104 +1,104 @@ - git: - local-name: wm_admitance - uri: https://github.com/WalkingMachine/wm_admitance.git - version: master + local-name: LED-Visage-Arduino + uri: https://github.com/WalkingMachine/LED-Visage-Arduino.git + version: nouvelle_emotion - git: - local-name: sara_msgs - uri: https://github.com/walkingmachine/sara_msgs.git - version: master + local-name: darknet_ros + uri: https://github.com/WalkingMachine/darknet_ros.git + version: feature/compression - git: - local-name: sara_moveit - uri: https://github.com/WalkingMachine/sara_moveit.git - version: feature/simulation_safe + local-name: dynamixel_control_hw + uri: https://github.com/WalkingMachine/dynamixel_control_hw.git + version: feature/install_libdynamixel - git: - local-name: sara_launch - uri: https://github.com/WalkingMachine/sara_launch.git + local-name: flexbe_app + uri: https://github.com/ffriese/flexbe_app.git version: master - git: - local-name: sara_description - uri: https://github.com/WalkingMachine/sara_description.git + local-name: gender-age-classification + uri: https://github.com/WalkingMachine/gender-age-classification.git version: master - git: - local-name: sara_control - uri: https://github.com/WalkingMachine/sara_control.git - version: ajustements -- git: - local-name: sara_behaviors - uri: https://github.com/WalkingMachine/sara_behaviors.git - version: merge_master -- git: - local-name: rviz_tools_py - uri: https://github.com/DavidB-CMU/rviz_tools_py.git + local-name: generic_flexbe_states + uri: https://github.com/FlexBE/generic_flexbe_states.git version: master - git: - local-name: ros-face-recognition - uri: https://github.com/WalkingMachine/ros-face-recognition.git - version: feature/remove_age + local-name: gpd + uri: https://(github.com/atenpas/gpd.git) + version: fix/package_compilation - git: - local-name: robotiq_140_gripper - uri: https://github.com/WalkingMachine/robotiq_140_gripper.git + local-name: gpg + uri: https://github.com/atenpas/gpg.git version: master - git: - local-name: robotiq_140_description - uri: https://github.com/WalkingMachine/robotiq_140_description.git + local-name: lab_ros_speech_to_text + uri: https://github.com/WalkingMachine/lab_ros_speech_to_text.git version: master - git: - local-name: roboteq - uri: https://github.com/WalkingMachine/roboteq.git + local-name: marytts + uri: https://github.com/marytts/marytts version: master - git: - local-name: robot_pose_publisher - uri: https://github.com/GT-RAIL/robot_pose_publisher.git + local-name: object_recognition_msgs + uri: https://github.com/wg-perception/object_recognition_msgs.git version: master -- git: - local-name: people - uri: https://github.com/kdhansen/people.git - version: kinetic - git: local-name: odas_ros uri: https://github.com/WalkingMachine/odas_ros.git version: feature/auto_installation - git: - local-name: object_recognition_msgs - uri: https://github.com/wg-perception/object_recognition_msgs.git + local-name: people + uri: https://github.com/kdhansen/people.git + version: kinetic +- git: + local-name: robot_pose_publisher + uri: https://github.com/GT-RAIL/robot_pose_publisher.git version: master - git: - local-name: marytts - uri: https://github.com/marytts/marytts + local-name: roboteq + uri: https://github.com/WalkingMachine/roboteq.git version: master - git: - local-name: lab_ros_speech_to_text - uri: https://github.com/WalkingMachine/lab_ros_speech_to_text.git + local-name: robotiq_140_description + uri: https://github.com/WalkingMachine/robotiq_140_description.git version: master - git: - local-name: gpg - uri: https://github.com/atenpas/gpg.git + local-name: robotiq_140_gripper + uri: https://github.com/WalkingMachine/robotiq_140_gripper.git version: master - git: - local-name: gpd - uri: https://github.com/atenpas/gpd.git - version: forward + local-name: ros-face-recognition + uri: https://github.com/WalkingMachine/ros-face-recognition.git + version: feature/remove_age - git: - local-name: generic_flexbe_states - uri: https://github.com/FlexBE/generic_flexbe_states.git + local-name: rviz_tools_py + uri: https://github.com/DavidB-CMU/rviz_tools_py.git version: master - git: - local-name: gender-age-classification - uri: https://github.com/WalkingMachine/gender-age-classification.git + local-name: sara_behaviors + uri: https://github.com/WalkingMachine/sara_behaviors.git + version: merge_master +- git: + local-name: sara_control + uri: https://github.com/WalkingMachine/sara_control.git + version: ajustements +- git: + local-name: sara_description + uri: https://github.com/WalkingMachine/sara_description.git version: master - git: - local-name: flexbe_app - uri: https://github.com/ffriese/flexbe_app.git + local-name: sara_launch + uri: https://github.com/WalkingMachine/sara_launch.git version: master - git: - local-name: dynamixel_control_hw - uri: https://github.com/WalkingMachine/dynamixel_control_hw.git - version: feature/install_libdynamixel + local-name: sara_moveit + uri: https://github.com/WalkingMachine/sara_moveit.git + version: feature/simulation_safe - git: - local-name: darknet_ros - uri: https://github.com/WalkingMachine/darknet_ros.git - version: feature/compression + local-name: sara_msgs + uri: https://github.com/walkingmachine/sara_msgs.git + version: master - git: - local-name: LED-Visage-Arduino - uri: https://github.com/WalkingMachine/LED-Visage-Arduino.git - version: nouvelle_emotion + local-name: wm_admitance + uri: https://github.com/WalkingMachine/wm_admitance.git + version: master From a7128d5ec6993db9aed35d56873d49866f902dde Mon Sep 17 00:00:00 2001 From: philippe Date: Sun, 12 Jan 2020 16:29:36 -0500 Subject: [PATCH 05/19] ajoute frame to box --- src/.rosinstall | 132 +++++++++++++++++++++++++----------------------- 1 file changed, 68 insertions(+), 64 deletions(-) diff --git a/src/.rosinstall b/src/.rosinstall index 3630e44..d43b799 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -1,104 +1,108 @@ - git: - local-name: LED-Visage-Arduino - uri: https://github.com/WalkingMachine/LED-Visage-Arduino.git - version: nouvelle_emotion -- git: - local-name: darknet_ros - uri: https://github.com/WalkingMachine/darknet_ros.git - version: feature/compression + local-name: wm_frame_to_box + uri: https://github.com/WalkingMachine/wm_frame_to_box.git + version: master - git: - local-name: dynamixel_control_hw - uri: https://github.com/WalkingMachine/dynamixel_control_hw.git - version: feature/install_libdynamixel + local-name: wm_admitance + uri: https://github.com/WalkingMachine/wm_admitance.git + version: master - git: - local-name: flexbe_app - uri: https://github.com/ffriese/flexbe_app.git + local-name: sara_msgs + uri: https://github.com/walkingmachine/sara_msgs.git version: master - git: - local-name: gender-age-classification - uri: https://github.com/WalkingMachine/gender-age-classification.git + local-name: sara_moveit + uri: https://github.com/WalkingMachine/sara_moveit.git + version: feature/simulation_safe +- git: + local-name: sara_launch + uri: https://github.com/WalkingMachine/sara_launch.git version: master - git: - local-name: generic_flexbe_states - uri: https://github.com/FlexBE/generic_flexbe_states.git + local-name: sara_description + uri: https://github.com/WalkingMachine/sara_description.git version: master - git: - local-name: gpd - uri: https://(github.com/atenpas/gpd.git) - version: fix/package_compilation + local-name: sara_control + uri: https://github.com/WalkingMachine/sara_control.git + version: ajustements - git: - local-name: gpg - uri: https://github.com/atenpas/gpg.git + local-name: sara_behaviors + uri: https://github.com/WalkingMachine/sara_behaviors.git + version: merge_master +- git: + local-name: rviz_tools_py + uri: https://github.com/DavidB-CMU/rviz_tools_py.git version: master - git: - local-name: lab_ros_speech_to_text - uri: https://github.com/WalkingMachine/lab_ros_speech_to_text.git + local-name: ros-face-recognition + uri: https://github.com/WalkingMachine/ros-face-recognition.git + version: feature/remove_age +- git: + local-name: robotiq_140_gripper + uri: https://github.com/WalkingMachine/robotiq_140_gripper.git version: master - git: - local-name: marytts - uri: https://github.com/marytts/marytts + local-name: robotiq_140_description + uri: https://github.com/WalkingMachine/robotiq_140_description.git version: master - git: - local-name: object_recognition_msgs - uri: https://github.com/wg-perception/object_recognition_msgs.git + local-name: roboteq + uri: https://github.com/WalkingMachine/roboteq.git version: master - git: - local-name: odas_ros - uri: https://github.com/WalkingMachine/odas_ros.git - version: feature/auto_installation + local-name: robot_pose_publisher + uri: https://github.com/GT-RAIL/robot_pose_publisher.git + version: master - git: local-name: people uri: https://github.com/kdhansen/people.git version: kinetic - git: - local-name: robot_pose_publisher - uri: https://github.com/GT-RAIL/robot_pose_publisher.git - version: master + local-name: odas_ros + uri: https://github.com/WalkingMachine/odas_ros.git + version: feature/auto_installation - git: - local-name: roboteq - uri: https://github.com/WalkingMachine/roboteq.git + local-name: object_recognition_msgs + uri: https://github.com/wg-perception/object_recognition_msgs.git version: master - git: - local-name: robotiq_140_description - uri: https://github.com/WalkingMachine/robotiq_140_description.git + local-name: marytts + uri: https://github.com/marytts/marytts version: master - git: - local-name: robotiq_140_gripper - uri: https://github.com/WalkingMachine/robotiq_140_gripper.git + local-name: lab_ros_speech_to_text + uri: https://github.com/WalkingMachine/lab_ros_speech_to_text.git version: master - git: - local-name: ros-face-recognition - uri: https://github.com/WalkingMachine/ros-face-recognition.git - version: feature/remove_age -- git: - local-name: rviz_tools_py - uri: https://github.com/DavidB-CMU/rviz_tools_py.git + local-name: gpg + uri: https://github.com/atenpas/gpg.git version: master - git: - local-name: sara_behaviors - uri: https://github.com/WalkingMachine/sara_behaviors.git - version: merge_master + local-name: gpd + uri: https://((github.com/atenpas/gpd.git)) + version: fix/package_compilation - git: - local-name: sara_control - uri: https://github.com/WalkingMachine/sara_control.git - version: ajustements + local-name: generic_flexbe_states + uri: https://github.com/FlexBE/generic_flexbe_states.git + version: master - git: - local-name: sara_description - uri: https://github.com/WalkingMachine/sara_description.git + local-name: gender-age-classification + uri: https://github.com/WalkingMachine/gender-age-classification.git version: master - git: - local-name: sara_launch - uri: https://github.com/WalkingMachine/sara_launch.git + local-name: flexbe_app + uri: https://github.com/ffriese/flexbe_app.git version: master - git: - local-name: sara_moveit - uri: https://github.com/WalkingMachine/sara_moveit.git - version: feature/simulation_safe + local-name: dynamixel_control_hw + uri: https://github.com/WalkingMachine/dynamixel_control_hw.git + version: feature/install_libdynamixel - git: - local-name: sara_msgs - uri: https://github.com/walkingmachine/sara_msgs.git - version: master + local-name: darknet_ros + uri: https://github.com/WalkingMachine/darknet_ros.git + version: feature/compression - git: - local-name: wm_admitance - uri: https://github.com/WalkingMachine/wm_admitance.git - version: master + local-name: LED-Visage-Arduino + uri: https://github.com/WalkingMachine/LED-Visage-Arduino.git + version: nouvelle_emotion From 3e2f85c3cc074a1fbdcb095b40ee068eccf912df Mon Sep 17 00:00:00 2001 From: philippe Date: Sun, 12 Jan 2020 17:25:59 -0500 Subject: [PATCH 06/19] reture frame to box --- src/.rosinstall | 138 ++++++++++++++++++++++++------------------------ 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/src/.rosinstall b/src/.rosinstall index d43b799..af48821 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -1,108 +1,108 @@ - git: - local-name: wm_frame_to_box - uri: https://github.com/WalkingMachine/wm_frame_to_box.git - version: master -- git: - local-name: wm_admitance - uri: https://github.com/WalkingMachine/wm_admitance.git - version: master + local-name: LED-Visage-Arduino + uri: https://github.com/WalkingMachine/LED-Visage-Arduino.git + version: nouvelle_emotion - git: - local-name: sara_msgs - uri: https://github.com/walkingmachine/sara_msgs.git - version: master + local-name: darknet_ros + uri: https://github.com/WalkingMachine/darknet_ros.git + version: feature/compression - git: - local-name: sara_moveit - uri: https://github.com/WalkingMachine/sara_moveit.git - version: feature/simulation_safe + local-name: dynamixel_control_hw + uri: https://github.com/WalkingMachine/dynamixel_control_hw.git + version: feature/install_libdynamixel - git: - local-name: sara_launch - uri: https://github.com/WalkingMachine/sara_launch.git + local-name: flexbe_app + uri: https://github.com/ffriese/flexbe_app.git version: master - git: - local-name: sara_description - uri: https://github.com/WalkingMachine/sara_description.git + local-name: gender-age-classification + uri: https://github.com/WalkingMachine/gender-age-classification.git version: master - git: - local-name: sara_control - uri: https://github.com/WalkingMachine/sara_control.git - version: ajustements -- git: - local-name: sara_behaviors - uri: https://github.com/WalkingMachine/sara_behaviors.git - version: merge_master -- git: - local-name: rviz_tools_py - uri: https://github.com/DavidB-CMU/rviz_tools_py.git + local-name: generic_flexbe_states + uri: https://github.com/FlexBE/generic_flexbe_states.git version: master +- x: + local-name: gpd + uri: https://((github.com/atenpas/gpd.git)) + version: git - git: - local-name: ros-face-recognition - uri: https://github.com/WalkingMachine/ros-face-recognition.git - version: feature/remove_age -- git: - local-name: robotiq_140_gripper - uri: https://github.com/WalkingMachine/robotiq_140_gripper.git + local-name: gpg + uri: https://github.com/atenpas/gpg.git version: master - git: - local-name: robotiq_140_description - uri: https://github.com/WalkingMachine/robotiq_140_description.git + local-name: lab_ros_speech_to_text + uri: https://github.com/WalkingMachine/lab_ros_speech_to_text.git version: master - git: - local-name: roboteq - uri: https://github.com/WalkingMachine/roboteq.git + local-name: marytts + uri: https://github.com/marytts/marytts version: master - git: - local-name: robot_pose_publisher - uri: https://github.com/GT-RAIL/robot_pose_publisher.git + local-name: object_recognition_msgs + uri: https://github.com/wg-perception/object_recognition_msgs.git version: master -- git: - local-name: people - uri: https://github.com/kdhansen/people.git - version: kinetic - git: local-name: odas_ros uri: https://github.com/WalkingMachine/odas_ros.git version: feature/auto_installation - git: - local-name: object_recognition_msgs - uri: https://github.com/wg-perception/object_recognition_msgs.git + local-name: people + uri: https://github.com/kdhansen/people.git + version: kinetic +- git: + local-name: robot_pose_publisher + uri: https://github.com/GT-RAIL/robot_pose_publisher.git version: master - git: - local-name: marytts - uri: https://github.com/marytts/marytts + local-name: roboteq + uri: https://github.com/WalkingMachine/roboteq.git version: master - git: - local-name: lab_ros_speech_to_text - uri: https://github.com/WalkingMachine/lab_ros_speech_to_text.git + local-name: robotiq_140_description + uri: https://github.com/WalkingMachine/robotiq_140_description.git version: master - git: - local-name: gpg - uri: https://github.com/atenpas/gpg.git + local-name: robotiq_140_gripper + uri: https://github.com/WalkingMachine/robotiq_140_gripper.git version: master - git: - local-name: gpd - uri: https://((github.com/atenpas/gpd.git)) - version: fix/package_compilation + local-name: ros-face-recognition + uri: https://github.com/WalkingMachine/ros-face-recognition.git + version: feature/remove_age - git: - local-name: generic_flexbe_states - uri: https://github.com/FlexBE/generic_flexbe_states.git + local-name: rviz_tools_py + uri: https://github.com/DavidB-CMU/rviz_tools_py.git version: master - git: - local-name: gender-age-classification - uri: https://github.com/WalkingMachine/gender-age-classification.git + local-name: sara_behaviors + uri: https://github.com/WalkingMachine/sara_behaviors.git + version: merge_master +- git: + local-name: sara_control + uri: https://github.com/WalkingMachine/sara_control.git + version: ajustements +- git: + local-name: sara_description + uri: https://github.com/WalkingMachine/sara_description.git version: master - git: - local-name: flexbe_app - uri: https://github.com/ffriese/flexbe_app.git + local-name: sara_launch + uri: https://github.com/WalkingMachine/sara_launch.git version: master - git: - local-name: dynamixel_control_hw - uri: https://github.com/WalkingMachine/dynamixel_control_hw.git - version: feature/install_libdynamixel + local-name: sara_moveit + uri: https://github.com/WalkingMachine/sara_moveit.git + version: feature/simulation_safe - git: - local-name: darknet_ros - uri: https://github.com/WalkingMachine/darknet_ros.git - version: feature/compression + local-name: sara_msgs + uri: https://github.com/walkingmachine/sara_msgs.git + version: master - git: - local-name: LED-Visage-Arduino - uri: https://github.com/WalkingMachine/LED-Visage-Arduino.git - version: nouvelle_emotion + local-name: wm_admitance + uri: https://github.com/WalkingMachine/wm_admitance.git + version: master +- x: + local-name: wm_frame_to_box + uri: https://github.com/WalkingMachine/wm_frame_to_box.git + version: git From eb5ad8a92e3358621855c94cd0e5d657d9e9af05 Mon Sep 17 00:00:00 2001 From: philippe Date: Mon, 13 Jan 2020 01:09:02 -0500 Subject: [PATCH 07/19] corrige les versions --- src/.rosinstall | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/.rosinstall b/src/.rosinstall index af48821..df83283 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -22,10 +22,10 @@ local-name: generic_flexbe_states uri: https://github.com/FlexBE/generic_flexbe_states.git version: master -- x: +- git: local-name: gpd - uri: https://((github.com/atenpas/gpd.git)) - version: git + uri: https://github.com/WalkingMachine/gpd.git + version: fix/package_compilation - git: local-name: gpg uri: https://github.com/atenpas/gpg.git @@ -102,7 +102,3 @@ local-name: wm_admitance uri: https://github.com/WalkingMachine/wm_admitance.git version: master -- x: - local-name: wm_frame_to_box - uri: https://github.com/WalkingMachine/wm_frame_to_box.git - version: git From 232807543971e2370c79d88c8ae550bf87e5792c Mon Sep 17 00:00:00 2001 From: philippe Date: Mon, 13 Jan 2020 11:34:39 -0500 Subject: [PATCH 08/19] Ajuste la liste .rosinstall --- src/.rosinstall | 130 ++++++++++++++++++++++++------------------------ 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/src/.rosinstall b/src/.rosinstall index df83283..96bddf8 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -1,104 +1,104 @@ - git: - local-name: LED-Visage-Arduino - uri: https://github.com/WalkingMachine/LED-Visage-Arduino.git - version: nouvelle_emotion + local-name: wm_admitance + uri: https://github.com/WalkingMachine/wm_admitance.git + version: master - git: - local-name: darknet_ros - uri: https://github.com/WalkingMachine/darknet_ros.git - version: feature/compression + local-name: sara_msgs + uri: https://github.com/walkingmachine/sara_msgs.git + version: master - git: - local-name: dynamixel_control_hw - uri: https://github.com/WalkingMachine/dynamixel_control_hw.git - version: feature/install_libdynamixel + local-name: sara_moveit + uri: https://github.com/WalkingMachine/sara_moveit.git + version: feature/simulation_safe - git: - local-name: flexbe_app - uri: https://github.com/ffriese/flexbe_app.git + local-name: sara_launch + uri: https://github.com/WalkingMachine/sara_launch.git version: master - git: - local-name: gender-age-classification - uri: https://github.com/WalkingMachine/gender-age-classification.git - version: master + local-name: sara_description + uri: https://github.com/WalkingMachine/sara_description.git + version: feature/total_revision - git: - local-name: generic_flexbe_states - uri: https://github.com/FlexBE/generic_flexbe_states.git - version: master + local-name: sara_control + uri: https://github.com/WalkingMachine/sara_control.git + version: ajustements - git: - local-name: gpd - uri: https://github.com/WalkingMachine/gpd.git - version: fix/package_compilation + local-name: sara_behaviors + uri: https://github.com/WalkingMachine/sara_behaviors.git + version: merge_master - git: - local-name: gpg - uri: https://github.com/atenpas/gpg.git + local-name: rviz_tools_py + uri: https://github.com/DavidB-CMU/rviz_tools_py.git version: master - git: - local-name: lab_ros_speech_to_text - uri: https://github.com/WalkingMachine/lab_ros_speech_to_text.git + local-name: ros-face-recognition + uri: https://github.com/WalkingMachine/ros-face-recognition.git + version: feature/remove_age +- git: + local-name: robotiq_140_gripper + uri: https://github.com/WalkingMachine/robotiq_140_gripper.git version: master - git: - local-name: marytts - uri: https://github.com/marytts/marytts + local-name: robotiq_140_description + uri: https://github.com/WalkingMachine/robotiq_140_description.git version: master - git: - local-name: object_recognition_msgs - uri: https://github.com/wg-perception/object_recognition_msgs.git + local-name: roboteq + uri: https://github.com/WalkingMachine/roboteq.git version: master - git: - local-name: odas_ros - uri: https://github.com/WalkingMachine/odas_ros.git - version: feature/auto_installation + local-name: robot_pose_publisher + uri: https://github.com/GT-RAIL/robot_pose_publisher.git + version: master - git: local-name: people uri: https://github.com/kdhansen/people.git version: kinetic - git: - local-name: robot_pose_publisher - uri: https://github.com/GT-RAIL/robot_pose_publisher.git - version: master + local-name: odas_ros + uri: https://github.com/WalkingMachine/odas_ros.git + version: feature/auto_installation - git: - local-name: roboteq - uri: https://github.com/WalkingMachine/roboteq.git + local-name: object_recognition_msgs + uri: https://github.com/wg-perception/object_recognition_msgs.git version: master - git: - local-name: robotiq_140_description - uri: https://github.com/WalkingMachine/robotiq_140_description.git + local-name: marytts + uri: https://github.com/marytts/marytts version: master - git: - local-name: robotiq_140_gripper - uri: https://github.com/WalkingMachine/robotiq_140_gripper.git + local-name: lab_ros_speech_to_text + uri: https://github.com/WalkingMachine/lab_ros_speech_to_text.git version: master - git: - local-name: ros-face-recognition - uri: https://github.com/WalkingMachine/ros-face-recognition.git - version: feature/remove_age -- git: - local-name: rviz_tools_py - uri: https://github.com/DavidB-CMU/rviz_tools_py.git + local-name: gpg + uri: https://github.com/atenpas/gpg.git version: master - git: - local-name: sara_behaviors - uri: https://github.com/WalkingMachine/sara_behaviors.git - version: merge_master + local-name: gpd + uri: https://github.com/WalkingMachine/gpd.git + version: fix/package_compilation - git: - local-name: sara_control - uri: https://github.com/WalkingMachine/sara_control.git - version: ajustements + local-name: generic_flexbe_states + uri: https://github.com/FlexBE/generic_flexbe_states.git + version: master - git: - local-name: sara_description - uri: https://github.com/WalkingMachine/sara_description.git + local-name: gender-age-classification + uri: https://github.com/WalkingMachine/gender-age-classification.git version: master - git: - local-name: sara_launch - uri: https://github.com/WalkingMachine/sara_launch.git + local-name: flexbe_app + uri: https://github.com/ffriese/flexbe_app.git version: master - git: - local-name: sara_moveit - uri: https://github.com/WalkingMachine/sara_moveit.git - version: feature/simulation_safe + local-name: dynamixel_control_hw + uri: https://github.com/WalkingMachine/dynamixel_control_hw.git + version: feature/install_libdynamixel - git: - local-name: sara_msgs - uri: https://github.com/walkingmachine/sara_msgs.git - version: master + local-name: darknet_ros + uri: https://github.com/WalkingMachine/darknet_ros.git + version: feature/compression - git: - local-name: wm_admitance - uri: https://github.com/WalkingMachine/wm_admitance.git - version: master + local-name: LED-Visage-Arduino + uri: https://github.com/WalkingMachine/LED-Visage-Arduino.git + version: nouvelle_emotion From 2024dfb2faf20210a20cf28cd87acd59012397d4 Mon Sep 17 00:00:00 2001 From: philippe Date: Tue, 14 Jan 2020 16:10:28 -0500 Subject: [PATCH 09/19] Remet frame to box en place --- src/.rosinstall | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/.rosinstall b/src/.rosinstall index 96bddf8..ec51621 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -17,7 +17,7 @@ - git: local-name: sara_description uri: https://github.com/WalkingMachine/sara_description.git - version: feature/total_revision + version: master - git: local-name: sara_control uri: https://github.com/WalkingMachine/sara_control.git @@ -102,3 +102,7 @@ local-name: LED-Visage-Arduino uri: https://github.com/WalkingMachine/LED-Visage-Arduino.git version: nouvelle_emotion +- git: + local-name: wm_frame_to_box + uri: https://github.com/WalkingMachine/wm_frame_to_box.git + version: master From 04b9621103e7f35449c025e8d01d5ac2f2c2e3cc Mon Sep 17 00:00:00 2001 From: philippe Date: Tue, 14 Jan 2020 23:52:10 -0500 Subject: [PATCH 10/19] update config --- src/.rosinstall | 134 ++++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/src/.rosinstall b/src/.rosinstall index ec51621..e0697c5 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -1,108 +1,108 @@ - git: - local-name: wm_admitance - uri: https://github.com/WalkingMachine/wm_admitance.git - version: master + local-name: wm_frame_to_box + uri: https://github.com/WalkingMachine/wm_frame_to_box.git + version: fix/compilation - git: - local-name: sara_msgs - uri: https://github.com/walkingmachine/sara_msgs.git - version: master + local-name: LED-Visage-Arduino + uri: https://github.com/WalkingMachine/LED-Visage-Arduino.git + version: nouvelle_emotion - git: - local-name: sara_moveit - uri: https://github.com/WalkingMachine/sara_moveit.git - version: feature/simulation_safe + local-name: darknet_ros + uri: https://github.com/WalkingMachine/darknet_ros.git + version: feature/compression - git: - local-name: sara_launch - uri: https://github.com/WalkingMachine/sara_launch.git - version: master + local-name: dynamixel_control_hw + uri: https://github.com/WalkingMachine/dynamixel_control_hw.git + version: feature/install_libdynamixel - git: - local-name: sara_description - uri: https://github.com/WalkingMachine/sara_description.git + local-name: flexbe_app + uri: https://github.com/ffriese/flexbe_app.git version: master - git: - local-name: sara_control - uri: https://github.com/WalkingMachine/sara_control.git - version: ajustements -- git: - local-name: sara_behaviors - uri: https://github.com/WalkingMachine/sara_behaviors.git - version: merge_master + local-name: gender-age-classification + uri: https://github.com/WalkingMachine/gender-age-classification.git + version: master - git: - local-name: rviz_tools_py - uri: https://github.com/DavidB-CMU/rviz_tools_py.git + local-name: generic_flexbe_states + uri: https://github.com/FlexBE/generic_flexbe_states.git version: master - git: - local-name: ros-face-recognition - uri: https://github.com/WalkingMachine/ros-face-recognition.git - version: feature/remove_age + local-name: gpd + uri: https://github.com/WalkingMachine/gpd.git + version: fix/package_compilation - git: - local-name: robotiq_140_gripper - uri: https://github.com/WalkingMachine/robotiq_140_gripper.git + local-name: gpg + uri: https://github.com/atenpas/gpg.git version: master - git: - local-name: robotiq_140_description - uri: https://github.com/WalkingMachine/robotiq_140_description.git + local-name: lab_ros_speech_to_text + uri: https://github.com/WalkingMachine/lab_ros_speech_to_text.git version: master - git: - local-name: roboteq - uri: https://github.com/WalkingMachine/roboteq.git + local-name: marytts + uri: https://github.com/marytts/marytts version: master - git: - local-name: robot_pose_publisher - uri: https://github.com/GT-RAIL/robot_pose_publisher.git + local-name: object_recognition_msgs + uri: https://github.com/wg-perception/object_recognition_msgs.git version: master -- git: - local-name: people - uri: https://github.com/kdhansen/people.git - version: kinetic - git: local-name: odas_ros uri: https://github.com/WalkingMachine/odas_ros.git version: feature/auto_installation - git: - local-name: object_recognition_msgs - uri: https://github.com/wg-perception/object_recognition_msgs.git + local-name: people + uri: https://github.com/kdhansen/people.git + version: kinetic +- git: + local-name: robot_pose_publisher + uri: https://github.com/GT-RAIL/robot_pose_publisher.git version: master - git: - local-name: marytts - uri: https://github.com/marytts/marytts + local-name: roboteq + uri: https://github.com/WalkingMachine/roboteq.git version: master - git: - local-name: lab_ros_speech_to_text - uri: https://github.com/WalkingMachine/lab_ros_speech_to_text.git + local-name: robotiq_140_description + uri: https://github.com/WalkingMachine/robotiq_140_description.git version: master - git: - local-name: gpg - uri: https://github.com/atenpas/gpg.git + local-name: robotiq_140_gripper + uri: https://github.com/WalkingMachine/robotiq_140_gripper.git version: master - git: - local-name: gpd - uri: https://github.com/WalkingMachine/gpd.git - version: fix/package_compilation + local-name: ros-face-recognition + uri: https://github.com/WalkingMachine/ros-face-recognition.git + version: feature/remove_age - git: - local-name: generic_flexbe_states - uri: https://github.com/FlexBE/generic_flexbe_states.git + local-name: rviz_tools_py + uri: https://github.com/DavidB-CMU/rviz_tools_py.git version: master - git: - local-name: gender-age-classification - uri: https://github.com/WalkingMachine/gender-age-classification.git - version: master + local-name: sara_behaviors + uri: https://github.com/WalkingMachine/sara_behaviors.git + version: merge_master - git: - local-name: flexbe_app - uri: https://github.com/ffriese/flexbe_app.git + local-name: sara_control + uri: https://github.com/WalkingMachine/sara_control.git + version: ajustements +- git: + local-name: sara_description + uri: https://github.com/WalkingMachine/sara_description.git version: master - git: - local-name: dynamixel_control_hw - uri: https://github.com/WalkingMachine/dynamixel_control_hw.git - version: feature/install_libdynamixel + local-name: sara_launch + uri: https://github.com/WalkingMachine/sara_launch.git + version: master - git: - local-name: darknet_ros - uri: https://github.com/WalkingMachine/darknet_ros.git - version: feature/compression + local-name: sara_moveit + uri: https://github.com/WalkingMachine/sara_moveit.git + version: feature/simulation_safe - git: - local-name: LED-Visage-Arduino - uri: https://github.com/WalkingMachine/LED-Visage-Arduino.git - version: nouvelle_emotion + local-name: sara_msgs + uri: https://github.com/walkingmachine/sara_msgs.git + version: master - git: - local-name: wm_frame_to_box - uri: https://github.com/WalkingMachine/wm_frame_to_box.git + local-name: wm_admitance + uri: https://github.com/WalkingMachine/wm_admitance.git version: master From dc9eeb14b9a315bc9e7e1fea6b65a8cccd9d2f91 Mon Sep 17 00:00:00 2001 From: philippe Date: Thu, 16 Jan 2020 23:55:09 -0500 Subject: [PATCH 11/19] update rosinstall to fix gpd compilation --- src/.rosinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/.rosinstall b/src/.rosinstall index e0697c5..d116920 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -29,7 +29,7 @@ - git: local-name: gpd uri: https://github.com/WalkingMachine/gpd.git - version: fix/package_compilation + version: fix/compilation - git: local-name: gpg uri: https://github.com/atenpas/gpg.git From ffde40451fc598ca21623bf4297dbcecf8098d3d Mon Sep 17 00:00:00 2001 From: philippe Date: Wed, 29 Jan 2020 21:11:52 -0500 Subject: [PATCH 12/19] =?UTF-8?q?Ajoute=20tout=20les=20packages=20utilis?= =?UTF-8?q?=C3=A9es=20par=20Sara?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/.rosinstall | 132 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 116 insertions(+), 16 deletions(-) diff --git a/src/.rosinstall b/src/.rosinstall index d116920..a004dde 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -1,7 +1,3 @@ -- git: - local-name: wm_frame_to_box - uri: https://github.com/WalkingMachine/wm_frame_to_box.git - version: fix/compilation - git: local-name: LED-Visage-Arduino uri: https://github.com/WalkingMachine/LED-Visage-Arduino.git @@ -13,10 +9,10 @@ - git: local-name: dynamixel_control_hw uri: https://github.com/WalkingMachine/dynamixel_control_hw.git - version: feature/install_libdynamixel + version: feature/histeresis - git: local-name: flexbe_app - uri: https://github.com/ffriese/flexbe_app.git + uri: https://github.com/FlexBE/flexbe_app.git version: master - git: local-name: gender-age-classification @@ -28,16 +24,16 @@ version: master - git: local-name: gpd - uri: https://github.com/WalkingMachine/gpd.git - version: fix/compilation + uri: https://github.com/atenpas/gpd.git + version: forward - git: local-name: gpg uri: https://github.com/atenpas/gpg.git version: master - git: - local-name: lab_ros_speech_to_text - uri: https://github.com/WalkingMachine/lab_ros_speech_to_text.git - version: master + local-name: jog_arm + uri: https://git@github.com:UTNuclearRoboticsPublic/jog_arm.git + version: kinetic - git: local-name: marytts uri: https://github.com/marytts/marytts @@ -48,8 +44,8 @@ version: master - git: local-name: odas_ros - uri: https://github.com/WalkingMachine/odas_ros.git - version: feature/auto_installation + uri: https://github.com/introlab/odas_ros.git + version: dev - git: local-name: people uri: https://github.com/kdhansen/people.git @@ -81,7 +77,7 @@ - git: local-name: sara_behaviors uri: https://github.com/WalkingMachine/sara_behaviors.git - version: merge_master + version: update/portes_ouvertes - git: local-name: sara_control uri: https://github.com/WalkingMachine/sara_control.git @@ -89,7 +85,7 @@ - git: local-name: sara_description uri: https://github.com/WalkingMachine/sara_description.git - version: master + version: lowPolyURDF - git: local-name: sara_launch uri: https://github.com/WalkingMachine/sara_launch.git @@ -100,9 +96,113 @@ version: feature/simulation_safe - git: local-name: sara_msgs - uri: https://github.com/walkingmachine/sara_msgs.git + uri: https://github.com/WalkingMachine/sara_msgs.git + version: feature/entity_pose +- git: + local-name: sara_navigation + uri: https://github.com/WalkingMachine/sara_navigation + version: map/portes_ouvertes +- git: + local-name: sara_teleop + uri: https://github.com/WalkingMachine/sara_teleop version: master +- git: + local-name: sara_udev + uri: https://github.com/WalkingMachine/sara_udev.git + version: feature/add_arduino_mega +- git: + local-name: vizbox + uri: https://git@github.com:WalkingMachine/vizbox.git + version: feature/allow_from_outside - git: local-name: wm_admitance uri: https://github.com/WalkingMachine/wm_admitance.git version: master +- git: + local-name: wm_direction_to_point + uri: https://github.com/WalkingMachine/wm_direction_to_point.git + version: master +- git: + local-name: wm_entity_tracker + uri: https://github.com/WalkingMachine/wm_entity_tracker.git + version: feature/PoseInput +- git: + local-name: wm_fake_hardware_interface + uri: https://github.com/WalkingMachine/wm_fake_hardware_interface.git + version: master +- git: + local-name: wm_frame_to_box + uri: https://github.com/WalkingMachine/wm_frame_to_box.git + version: master +- git: + local-name: wm_grasp_selection + uri: https://git@github.com:WalkingMachine/wm_grasp_selection.git + version: master +- git: + local-name: wm_kinova_hardware_interface + uri: https://github.com/WalkingMachine/wm_kinova_hardware_interface.git + version: feature/better_efficiency +- git: + local-name: wm_lifting-column_hardware_interface + uri: https://github.com/WalkingMachine/wm_lifting-column_hardware_interface.git + version: feature/self_calibration +- git: + local-name: wm_lifting_column_arduino + uri: https://github.com/WalkingMachine/wm_lifting_column_arduino.git + version: feature/use_encoder_library +- git: + local-name: wm_mecanum_cmd + uri: https://github.com/WalkingMachine/wm_mecanum_cmd + version: master +- git: + local-name: wm_nlu + uri: https://git@github.com:WalkingMachine/wm_nlu.git + version: feature/nlu_receptionist +- git: + local-name: wm_object_segmentation + uri: https://git@github.com:WalkingMachine/wm_object_segmentation.git + version: feature/no_low_object_publication +- git: + local-name: wm_odometry_feedback + uri: https://github.com/WalkingMachine/wm_odometry_feedback.git + version: master +- git: + local-name: wm_openpifpaf_ros_wrapper + uri: https://github.com/WalkingMachine/wm_openpifpaf_ros_wrapper.git + version: feature/LigneDansRVIZ3d +- git: + local-name: wm_pose_classification + uri: https://github.com/WalkingMachine/wm_pose_classification.git + version: master +- git: + local-name: wm_roboteq_hardware_interface + uri: https://github.com/WalkingMachine/wm_roboteq_hardware_interface + version: master +- git: + local-name: wm_robotiq_hardware_interface + uri: https://github.com/WalkingMachine/wm_robotiq_hardware_interface.git + version: feature/moar_force +- git: + local-name: wm_sound_library + uri: https://github.com/WalkingMachine/wm_sound_library.git + version: master +- git: + local-name: wm_table_segmentation + uri: https://git@github.com:WalkingMachine/wm_table_segmentation.git + version: feature/publish_table_pose +- git: + local-name: wm_trajectory_manager + uri: https://github.com/WalkingMachine/wm_trajectory_manager.git + version: master +- git: + local-name: wm_tts + uri: https://github.com/WalkingMachine/wm_tts.git + version: fix/try_except +- git: + local-name: wonderland + uri: https://git@github.com:WalkingMachine/wonderland.git + version: master +- git: + local-name: zbar_ros + uri: https://github.com/WalkingMachine/zbar_ros.git + version: update_fork From a865dfb446d22c2bb6e35bc95b6d694420d5dfc1 Mon Sep 17 00:00:00 2001 From: philippe Date: Sat, 1 Feb 2020 20:24:04 -0500 Subject: [PATCH 13/19] =?UTF-8?q?Ajuste=20la=20config=20=C3=A0=20la=20vrai?= =?UTF-8?q?=20Sara?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/.rosinstall | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/.rosinstall b/src/.rosinstall index a004dde..9d7ec40 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -5,7 +5,7 @@ - git: local-name: darknet_ros uri: https://github.com/WalkingMachine/darknet_ros.git - version: feature/compression + version: robocup2019/adjustements - git: local-name: dynamixel_control_hw uri: https://github.com/WalkingMachine/dynamixel_control_hw.git @@ -17,23 +17,19 @@ - git: local-name: gender-age-classification uri: https://github.com/WalkingMachine/gender-age-classification.git - version: master + version: feature/gitignore - git: local-name: generic_flexbe_states uri: https://github.com/FlexBE/generic_flexbe_states.git version: master - git: local-name: gpd - uri: https://github.com/atenpas/gpd.git + uri: https://github.com/WalkingMachine/gpd.git version: forward - git: local-name: gpg - uri: https://github.com/atenpas/gpg.git + uri: https://github.com/WalkingMachine/gpg.git version: master -- git: - local-name: jog_arm - uri: https://git@github.com:UTNuclearRoboticsPublic/jog_arm.git - version: kinetic - git: local-name: marytts uri: https://github.com/marytts/marytts @@ -46,10 +42,6 @@ local-name: odas_ros uri: https://github.com/introlab/odas_ros.git version: dev -- git: - local-name: people - uri: https://github.com/kdhansen/people.git - version: kinetic - git: local-name: robot_pose_publisher uri: https://github.com/GT-RAIL/robot_pose_publisher.git @@ -65,14 +57,14 @@ - git: local-name: robotiq_140_gripper uri: https://github.com/WalkingMachine/robotiq_140_gripper.git - version: master + version: feature/add_gitignore - git: local-name: ros-face-recognition uri: https://github.com/WalkingMachine/ros-face-recognition.git version: feature/remove_age - git: local-name: rviz_tools_py - uri: https://github.com/DavidB-CMU/rviz_tools_py.git + uri: https://github.com/JeroenDM/rviz_tools_py.git version: master - git: local-name: sara_behaviors @@ -89,7 +81,7 @@ - git: local-name: sara_launch uri: https://github.com/WalkingMachine/sara_launch.git - version: master + version: feature/use_new_navigation - git: local-name: sara_moveit uri: https://github.com/WalkingMachine/sara_moveit.git @@ -101,7 +93,7 @@ - git: local-name: sara_navigation uri: https://github.com/WalkingMachine/sara_navigation - version: map/portes_ouvertes + version: feature/new_navigation - git: local-name: sara_teleop uri: https://github.com/WalkingMachine/sara_teleop @@ -109,7 +101,7 @@ - git: local-name: sara_udev uri: https://github.com/WalkingMachine/sara_udev.git - version: feature/add_arduino_mega + version: fix/kinova_udev - git: local-name: vizbox uri: https://git@github.com:WalkingMachine/vizbox.git @@ -141,7 +133,7 @@ - git: local-name: wm_kinova_hardware_interface uri: https://github.com/WalkingMachine/wm_kinova_hardware_interface.git - version: feature/better_efficiency + version: master - git: local-name: wm_lifting-column_hardware_interface uri: https://github.com/WalkingMachine/wm_lifting-column_hardware_interface.git From b3398e7290a53c18d33020878c27e1d747d9ad23 Mon Sep 17 00:00:00 2001 From: philippe Date: Sun, 2 Feb 2020 12:05:56 -0500 Subject: [PATCH 14/19] Ne scrape pas les packages qui manques. --- script/scrape_config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/scrape_config.sh b/script/scrape_config.sh index 9ad7ffa..3794e20 100644 --- a/script/scrape_config.sh +++ b/script/scrape_config.sh @@ -49,8 +49,8 @@ wstool scrape -y -t src 2> /dev/null if [ "$1" != "commit" ] then echo "By Branch:" -wstool info -t src --data-only | sed -r 's/\ [xXLVCM][XLVCM]?\ /\ /' | sed 's/([^(]*)/\ /'g | tac > /tmp/sara_install_ws -gawk 'BEGIN { FS = " " } ; /git/ {print "- "$2":\n\ +wstool info -t src --data-only | sed -r 's/\ [XLVCM][XLVCM]?\ /\ /' | sed 's/([^(]*)/\ /'g | tac > /tmp/sara_install_ws +gawk 'BEGIN { FS = " " } ; $2=="git" {print "- "$2":\n\ local-name: "$1"\n\ uri: https://"$5"\n\ version: "$3}' /tmp/sara_install_ws > src/.rosinstall From 5cea94d45c367d74f61d1819f0e1196dddf8a8d3 Mon Sep 17 00:00:00 2001 From: philippe Date: Sun, 2 Feb 2020 12:05:56 -0500 Subject: [PATCH 15/19] Ne scrape pas les packages qui manques. --- script/scrape_config.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/scrape_config.sh b/script/scrape_config.sh index 3794e20..c2a2083 100644 --- a/script/scrape_config.sh +++ b/script/scrape_config.sh @@ -56,17 +56,17 @@ gawk 'BEGIN { FS = " " } ; $2=="git" {print "- "$2":\n\ version: "$3}' /tmp/sara_install_ws > src/.rosinstall echo "here is a summary of all packages in src:" - gawk 'BEGIN { FS = " " } ; /git/ {print " - "$1" "$3""}' /tmp/sara_install_ws | column -t + gawk 'BEGIN { FS = " " } ; $2=="git" {print " - "$1" "$3""}' /tmp/sara_install_ws | column -t else echo "By commit:" wstool info -t src --only=scmtype,localname,revision,uri | tr , \ | tac > /tmp/sara_install_ws -gawk '/git/ {print "- "$1":\n\ +gawk '$2=="git" {print "- "$1":\n\ local-name: "$2"\n\ uri: https://"$4"\n\ version: "$3}' /tmp/sara_install_ws > src/.rosinstall echo "here is a summary of all packages in src:" - gawk '/git/ {print " - "$2" ("$3")"}' /tmp/sara_install_ws + gawk '$2=="git" {print " - "$2" ("$3")"}' /tmp/sara_install_ws fi From 1f85fa152dc7297a9b0893d8581dc0eeb10d9412 Mon Sep 17 00:00:00 2001 From: philippe Date: Fri, 7 Feb 2020 18:20:30 -0500 Subject: [PATCH 16/19] Utilise https au lieu de ssh --- src/.rosinstall | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/.rosinstall b/src/.rosinstall index 9d7ec40..efd098c 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -104,8 +104,8 @@ version: fix/kinova_udev - git: local-name: vizbox - uri: https://git@github.com:WalkingMachine/vizbox.git - version: feature/allow_from_outside + uri: https://github.com/WalkingMachine/vizbox.git + version: master - git: local-name: wm_admitance uri: https://github.com/WalkingMachine/wm_admitance.git @@ -128,7 +128,7 @@ version: master - git: local-name: wm_grasp_selection - uri: https://git@github.com:WalkingMachine/wm_grasp_selection.git + uri: https://github.com/WalkingMachine/wm_grasp_selection.git version: master - git: local-name: wm_kinova_hardware_interface @@ -148,11 +148,11 @@ version: master - git: local-name: wm_nlu - uri: https://git@github.com:WalkingMachine/wm_nlu.git + uri: https://github.com/WalkingMachine/wm_nlu.git version: feature/nlu_receptionist - git: local-name: wm_object_segmentation - uri: https://git@github.com:WalkingMachine/wm_object_segmentation.git + uri: https://github.com/WalkingMachine/wm_object_segmentation.git version: feature/no_low_object_publication - git: local-name: wm_odometry_feedback @@ -180,8 +180,8 @@ version: master - git: local-name: wm_table_segmentation - uri: https://git@github.com:WalkingMachine/wm_table_segmentation.git - version: feature/publish_table_pose + uri: https://github.com/WalkingMachine/wm_table_segmentation.git + version: master - git: local-name: wm_trajectory_manager uri: https://github.com/WalkingMachine/wm_trajectory_manager.git @@ -192,7 +192,7 @@ version: fix/try_except - git: local-name: wonderland - uri: https://git@github.com:WalkingMachine/wonderland.git + uri: https://github.com/WalkingMachine/wonderland.git version: master - git: local-name: zbar_ros From c8695fdaef3c45e21e543083b581b03f328b6ab0 Mon Sep 17 00:00:00 2001 From: philippe Date: Fri, 7 Feb 2020 19:46:26 -0500 Subject: [PATCH 17/19] Ajoute le fix des dynamixels pour sara_launch --- src/.rosinstall | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/.rosinstall b/src/.rosinstall index efd098c..1ccf717 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -69,7 +69,7 @@ - git: local-name: sara_behaviors uri: https://github.com/WalkingMachine/sara_behaviors.git - version: update/portes_ouvertes + version: master - git: local-name: sara_control uri: https://github.com/WalkingMachine/sara_control.git @@ -77,7 +77,7 @@ - git: local-name: sara_description uri: https://github.com/WalkingMachine/sara_description.git - version: lowPolyURDF + version: master - git: local-name: sara_launch uri: https://github.com/WalkingMachine/sara_launch.git @@ -89,7 +89,7 @@ - git: local-name: sara_msgs uri: https://github.com/WalkingMachine/sara_msgs.git - version: feature/entity_pose + version: master - git: local-name: sara_navigation uri: https://github.com/WalkingMachine/sara_navigation @@ -141,7 +141,7 @@ - git: local-name: wm_lifting_column_arduino uri: https://github.com/WalkingMachine/wm_lifting_column_arduino.git - version: feature/use_encoder_library + version: master - git: local-name: wm_mecanum_cmd uri: https://github.com/WalkingMachine/wm_mecanum_cmd From 408192c19e485952a7915e5eb0c6d04ea3f8bcde Mon Sep 17 00:00:00 2001 From: philippe Date: Wed, 26 Feb 2020 18:54:36 -0500 Subject: [PATCH 18/19] ajuste les launchfiles --- src/.rosinstall | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/.rosinstall b/src/.rosinstall index 1ccf717..5b51163 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -78,10 +78,14 @@ local-name: sara_description uri: https://github.com/WalkingMachine/sara_description.git version: master +- git: + local-name: sara_hosts + uri: https://github.com/WalkingMachine/sara_hosts.git + version: update/hostlist - git: local-name: sara_launch uri: https://github.com/WalkingMachine/sara_launch.git - version: feature/use_new_navigation + version: total_revision - git: local-name: sara_moveit uri: https://github.com/WalkingMachine/sara_moveit.git @@ -113,7 +117,7 @@ - git: local-name: wm_direction_to_point uri: https://github.com/WalkingMachine/wm_direction_to_point.git - version: master + version: feature/launchfile - git: local-name: wm_entity_tracker uri: https://github.com/WalkingMachine/wm_entity_tracker.git From aaa704c424cd6c521a0b913448eec79708d78488 Mon Sep 17 00:00:00 2001 From: philippe Date: Mon, 2 Mar 2020 01:57:56 -0500 Subject: [PATCH 19/19] met la bonne config pour sara_hosts --- src/.rosinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/.rosinstall b/src/.rosinstall index 5b51163..49e1b3f 100644 --- a/src/.rosinstall +++ b/src/.rosinstall @@ -81,7 +81,7 @@ - git: local-name: sara_hosts uri: https://github.com/WalkingMachine/sara_hosts.git - version: update/hostlist + version: config/sara-lenovo - git: local-name: sara_launch uri: https://github.com/WalkingMachine/sara_launch.git