From f6c202548da17bcebc06e67cf75f4ae52181a93b Mon Sep 17 00:00:00 2001 From: Sravan Balaji Date: Mon, 20 Apr 2020 18:28:21 -0400 Subject: [PATCH] Root src folder & submodule - Move workspace folders to root src folder - Add ARIAC UR10 MoveIt configuration submodule to ariac_ws --- .gitignore | 8 ++++---- .gitmodules | 4 ++++ src/ariac_ws/src/universal_robot | 1 + {rrrobot_ws => src/rrrobot_ws}/build.sh | 0 {rrrobot_ws => src/rrrobot_ws}/src/CMakeLists.txt | 0 .../arm_joint_and_link_definitions.jpg | Bin .../meshes/arm_link_1.STL | Bin .../meshes/arm_link_2.STL | Bin .../meshes/arm_link_3.STL | Bin .../meshes/arm_link_4.STL | Bin .../meshes/arm_link_5.STL | Bin .../meshes/arm_link_6.STL | Bin .../meshes/base_link.STL | Bin .../fanuc_robotic_arm_with_gripper/model.config | 0 .../fanuc_robotic_arm_with_gripper/model.sdf | 0 .../src/gazebo_models/model_mappings.txt | 0 .../plastic_bottle/meshes/plastic_bottle.STL | Bin .../src/gazebo_models/plastic_bottle/model.config | 0 .../src/gazebo_models/plastic_bottle/model.sdf | 0 .../src/gazebo_models/square_trash_can/model.config | 0 .../src/gazebo_models/square_trash_can/model.sdf | 0 .../src/gazebo_models/unit_box/model.config | 0 .../src/gazebo_models/unit_box/model.sdf | 0 .../rrrobot_ws}/src/rrrobot/CMakeLists.txt | 0 .../rrrobot_ws}/src/rrrobot/config/rrrobot.yaml | 0 .../src/rrrobot/config/rrrobot_sensors.yaml | 0 .../rrrobot_ws}/src/rrrobot/launch/rrrobot.launch | 0 .../rrrobot_ws}/src/rrrobot/msg/model_insertion.msg | 0 .../rrrobot_ws}/src/rrrobot/package.xml | 0 .../rrrobot_ws}/src/rrrobot/scripts/rrrobot_run.sh | 0 .../src/rrrobot/scripts/rrrobot_run_no_build.sh | 0 .../rrrobot_ws}/src/rrrobot/scripts/sample_run.sh | 0 .../src/rrrobot/src/arm_controller_node.cpp | 0 .../rrrobot_ws}/src/rrrobot/src/cv_model.py | 0 .../src/rrrobot/src/depth_camera_node.cpp | 0 .../src/rrrobot/src/model_insertion_plugin.cpp | 0 .../src/rrrobot/src/object_spawner_node.cpp | 0 .../rrrobot_ws}/src/rrrobot/src/rrrobot_node.cpp | 0 .../rrrobot_ws}/src/rrrobot/src/v1_0.001.pt | Bin .../src/rrrobot/test/test_insert_object.cpp | 0 {rrrobot_ws => src/rrrobot_ws}/world/gear.py | 0 .../rrrobot_ws}/world/gear.world.template | 0 .../rrrobot_ws}/world/rrrobot_setpoint.world | 0 43 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 .gitmodules create mode 160000 src/ariac_ws/src/universal_robot rename {rrrobot_ws => src/rrrobot_ws}/build.sh (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/CMakeLists.txt (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/fanuc_robotic_arm_with_gripper/arm_joint_and_link_definitions.jpg (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_1.STL (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_2.STL (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_3.STL (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_4.STL (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_5.STL (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_6.STL (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/base_link.STL (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/fanuc_robotic_arm_with_gripper/model.config (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/fanuc_robotic_arm_with_gripper/model.sdf (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/model_mappings.txt (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/plastic_bottle/meshes/plastic_bottle.STL (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/plastic_bottle/model.config (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/plastic_bottle/model.sdf (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/square_trash_can/model.config (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/square_trash_can/model.sdf (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/unit_box/model.config (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/gazebo_models/unit_box/model.sdf (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/CMakeLists.txt (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/config/rrrobot.yaml (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/config/rrrobot_sensors.yaml (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/launch/rrrobot.launch (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/msg/model_insertion.msg (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/package.xml (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/scripts/rrrobot_run.sh (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/scripts/rrrobot_run_no_build.sh (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/scripts/sample_run.sh (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/src/arm_controller_node.cpp (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/src/cv_model.py (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/src/depth_camera_node.cpp (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/src/model_insertion_plugin.cpp (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/src/object_spawner_node.cpp (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/src/rrrobot_node.cpp (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/src/v1_0.001.pt (100%) rename {rrrobot_ws => src/rrrobot_ws}/src/rrrobot/test/test_insert_object.cpp (100%) rename {rrrobot_ws => src/rrrobot_ws}/world/gear.py (100%) rename {rrrobot_ws => src/rrrobot_ws}/world/gear.world.template (100%) rename {rrrobot_ws => src/rrrobot_ws}/world/rrrobot_setpoint.world (100%) diff --git a/.gitignore b/.gitignore index cc0b46d..cc21741 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ # Don't track the content of these folders # ############################################ -rrrobot_ws/lib/ -rrrobot_ws/build -rrrobot_ws/devel -rrrobot_ws/install +src/*/lib/ +src/*/build +src/*/devel +src/*/install .* !.gitignore diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..380eeba --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "src/ariac_ws/src/universal_robot"] + path = src/ariac_ws/src/universal_robot + url = https://github.com/osrf/universal_robot + branch = ariac_2019_ur10_moveit_config diff --git a/src/ariac_ws/src/universal_robot b/src/ariac_ws/src/universal_robot new file mode 160000 index 0000000..8bb711d --- /dev/null +++ b/src/ariac_ws/src/universal_robot @@ -0,0 +1 @@ +Subproject commit 8bb711dc9f81087306ae962f9e251e69dc31721d diff --git a/rrrobot_ws/build.sh b/src/rrrobot_ws/build.sh similarity index 100% rename from rrrobot_ws/build.sh rename to src/rrrobot_ws/build.sh diff --git a/rrrobot_ws/src/CMakeLists.txt b/src/rrrobot_ws/src/CMakeLists.txt similarity index 100% rename from rrrobot_ws/src/CMakeLists.txt rename to src/rrrobot_ws/src/CMakeLists.txt diff --git a/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/arm_joint_and_link_definitions.jpg b/src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/arm_joint_and_link_definitions.jpg similarity index 100% rename from rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/arm_joint_and_link_definitions.jpg rename to src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/arm_joint_and_link_definitions.jpg diff --git a/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_1.STL b/src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_1.STL similarity index 100% rename from rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_1.STL rename to src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_1.STL diff --git a/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_2.STL b/src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_2.STL similarity index 100% rename from rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_2.STL rename to src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_2.STL diff --git a/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_3.STL b/src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_3.STL similarity index 100% rename from rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_3.STL rename to src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_3.STL diff --git a/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_4.STL b/src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_4.STL similarity index 100% rename from rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_4.STL rename to src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_4.STL diff --git a/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_5.STL b/src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_5.STL similarity index 100% rename from rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_5.STL rename to src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_5.STL diff --git a/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_6.STL b/src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_6.STL similarity index 100% rename from rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_6.STL rename to src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/arm_link_6.STL diff --git a/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/base_link.STL b/src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/base_link.STL similarity index 100% rename from rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/base_link.STL rename to src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/meshes/base_link.STL diff --git a/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/model.config b/src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/model.config similarity index 100% rename from rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/model.config rename to src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/model.config diff --git a/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/model.sdf b/src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/model.sdf similarity index 100% rename from rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/model.sdf rename to src/rrrobot_ws/src/gazebo_models/fanuc_robotic_arm_with_gripper/model.sdf diff --git a/rrrobot_ws/src/gazebo_models/model_mappings.txt b/src/rrrobot_ws/src/gazebo_models/model_mappings.txt similarity index 100% rename from rrrobot_ws/src/gazebo_models/model_mappings.txt rename to src/rrrobot_ws/src/gazebo_models/model_mappings.txt diff --git a/rrrobot_ws/src/gazebo_models/plastic_bottle/meshes/plastic_bottle.STL b/src/rrrobot_ws/src/gazebo_models/plastic_bottle/meshes/plastic_bottle.STL similarity index 100% rename from rrrobot_ws/src/gazebo_models/plastic_bottle/meshes/plastic_bottle.STL rename to src/rrrobot_ws/src/gazebo_models/plastic_bottle/meshes/plastic_bottle.STL diff --git a/rrrobot_ws/src/gazebo_models/plastic_bottle/model.config b/src/rrrobot_ws/src/gazebo_models/plastic_bottle/model.config similarity index 100% rename from rrrobot_ws/src/gazebo_models/plastic_bottle/model.config rename to src/rrrobot_ws/src/gazebo_models/plastic_bottle/model.config diff --git a/rrrobot_ws/src/gazebo_models/plastic_bottle/model.sdf b/src/rrrobot_ws/src/gazebo_models/plastic_bottle/model.sdf similarity index 100% rename from rrrobot_ws/src/gazebo_models/plastic_bottle/model.sdf rename to src/rrrobot_ws/src/gazebo_models/plastic_bottle/model.sdf diff --git a/rrrobot_ws/src/gazebo_models/square_trash_can/model.config b/src/rrrobot_ws/src/gazebo_models/square_trash_can/model.config similarity index 100% rename from rrrobot_ws/src/gazebo_models/square_trash_can/model.config rename to src/rrrobot_ws/src/gazebo_models/square_trash_can/model.config diff --git a/rrrobot_ws/src/gazebo_models/square_trash_can/model.sdf b/src/rrrobot_ws/src/gazebo_models/square_trash_can/model.sdf similarity index 100% rename from rrrobot_ws/src/gazebo_models/square_trash_can/model.sdf rename to src/rrrobot_ws/src/gazebo_models/square_trash_can/model.sdf diff --git a/rrrobot_ws/src/gazebo_models/unit_box/model.config b/src/rrrobot_ws/src/gazebo_models/unit_box/model.config similarity index 100% rename from rrrobot_ws/src/gazebo_models/unit_box/model.config rename to src/rrrobot_ws/src/gazebo_models/unit_box/model.config diff --git a/rrrobot_ws/src/gazebo_models/unit_box/model.sdf b/src/rrrobot_ws/src/gazebo_models/unit_box/model.sdf similarity index 100% rename from rrrobot_ws/src/gazebo_models/unit_box/model.sdf rename to src/rrrobot_ws/src/gazebo_models/unit_box/model.sdf diff --git a/rrrobot_ws/src/rrrobot/CMakeLists.txt b/src/rrrobot_ws/src/rrrobot/CMakeLists.txt similarity index 100% rename from rrrobot_ws/src/rrrobot/CMakeLists.txt rename to src/rrrobot_ws/src/rrrobot/CMakeLists.txt diff --git a/rrrobot_ws/src/rrrobot/config/rrrobot.yaml b/src/rrrobot_ws/src/rrrobot/config/rrrobot.yaml similarity index 100% rename from rrrobot_ws/src/rrrobot/config/rrrobot.yaml rename to src/rrrobot_ws/src/rrrobot/config/rrrobot.yaml diff --git a/rrrobot_ws/src/rrrobot/config/rrrobot_sensors.yaml b/src/rrrobot_ws/src/rrrobot/config/rrrobot_sensors.yaml similarity index 100% rename from rrrobot_ws/src/rrrobot/config/rrrobot_sensors.yaml rename to src/rrrobot_ws/src/rrrobot/config/rrrobot_sensors.yaml diff --git a/rrrobot_ws/src/rrrobot/launch/rrrobot.launch b/src/rrrobot_ws/src/rrrobot/launch/rrrobot.launch similarity index 100% rename from rrrobot_ws/src/rrrobot/launch/rrrobot.launch rename to src/rrrobot_ws/src/rrrobot/launch/rrrobot.launch diff --git a/rrrobot_ws/src/rrrobot/msg/model_insertion.msg b/src/rrrobot_ws/src/rrrobot/msg/model_insertion.msg similarity index 100% rename from rrrobot_ws/src/rrrobot/msg/model_insertion.msg rename to src/rrrobot_ws/src/rrrobot/msg/model_insertion.msg diff --git a/rrrobot_ws/src/rrrobot/package.xml b/src/rrrobot_ws/src/rrrobot/package.xml similarity index 100% rename from rrrobot_ws/src/rrrobot/package.xml rename to src/rrrobot_ws/src/rrrobot/package.xml diff --git a/rrrobot_ws/src/rrrobot/scripts/rrrobot_run.sh b/src/rrrobot_ws/src/rrrobot/scripts/rrrobot_run.sh similarity index 100% rename from rrrobot_ws/src/rrrobot/scripts/rrrobot_run.sh rename to src/rrrobot_ws/src/rrrobot/scripts/rrrobot_run.sh diff --git a/rrrobot_ws/src/rrrobot/scripts/rrrobot_run_no_build.sh b/src/rrrobot_ws/src/rrrobot/scripts/rrrobot_run_no_build.sh similarity index 100% rename from rrrobot_ws/src/rrrobot/scripts/rrrobot_run_no_build.sh rename to src/rrrobot_ws/src/rrrobot/scripts/rrrobot_run_no_build.sh diff --git a/rrrobot_ws/src/rrrobot/scripts/sample_run.sh b/src/rrrobot_ws/src/rrrobot/scripts/sample_run.sh similarity index 100% rename from rrrobot_ws/src/rrrobot/scripts/sample_run.sh rename to src/rrrobot_ws/src/rrrobot/scripts/sample_run.sh diff --git a/rrrobot_ws/src/rrrobot/src/arm_controller_node.cpp b/src/rrrobot_ws/src/rrrobot/src/arm_controller_node.cpp similarity index 100% rename from rrrobot_ws/src/rrrobot/src/arm_controller_node.cpp rename to src/rrrobot_ws/src/rrrobot/src/arm_controller_node.cpp diff --git a/rrrobot_ws/src/rrrobot/src/cv_model.py b/src/rrrobot_ws/src/rrrobot/src/cv_model.py similarity index 100% rename from rrrobot_ws/src/rrrobot/src/cv_model.py rename to src/rrrobot_ws/src/rrrobot/src/cv_model.py diff --git a/rrrobot_ws/src/rrrobot/src/depth_camera_node.cpp b/src/rrrobot_ws/src/rrrobot/src/depth_camera_node.cpp similarity index 100% rename from rrrobot_ws/src/rrrobot/src/depth_camera_node.cpp rename to src/rrrobot_ws/src/rrrobot/src/depth_camera_node.cpp diff --git a/rrrobot_ws/src/rrrobot/src/model_insertion_plugin.cpp b/src/rrrobot_ws/src/rrrobot/src/model_insertion_plugin.cpp similarity index 100% rename from rrrobot_ws/src/rrrobot/src/model_insertion_plugin.cpp rename to src/rrrobot_ws/src/rrrobot/src/model_insertion_plugin.cpp diff --git a/rrrobot_ws/src/rrrobot/src/object_spawner_node.cpp b/src/rrrobot_ws/src/rrrobot/src/object_spawner_node.cpp similarity index 100% rename from rrrobot_ws/src/rrrobot/src/object_spawner_node.cpp rename to src/rrrobot_ws/src/rrrobot/src/object_spawner_node.cpp diff --git a/rrrobot_ws/src/rrrobot/src/rrrobot_node.cpp b/src/rrrobot_ws/src/rrrobot/src/rrrobot_node.cpp similarity index 100% rename from rrrobot_ws/src/rrrobot/src/rrrobot_node.cpp rename to src/rrrobot_ws/src/rrrobot/src/rrrobot_node.cpp diff --git a/rrrobot_ws/src/rrrobot/src/v1_0.001.pt b/src/rrrobot_ws/src/rrrobot/src/v1_0.001.pt similarity index 100% rename from rrrobot_ws/src/rrrobot/src/v1_0.001.pt rename to src/rrrobot_ws/src/rrrobot/src/v1_0.001.pt diff --git a/rrrobot_ws/src/rrrobot/test/test_insert_object.cpp b/src/rrrobot_ws/src/rrrobot/test/test_insert_object.cpp similarity index 100% rename from rrrobot_ws/src/rrrobot/test/test_insert_object.cpp rename to src/rrrobot_ws/src/rrrobot/test/test_insert_object.cpp diff --git a/rrrobot_ws/world/gear.py b/src/rrrobot_ws/world/gear.py similarity index 100% rename from rrrobot_ws/world/gear.py rename to src/rrrobot_ws/world/gear.py diff --git a/rrrobot_ws/world/gear.world.template b/src/rrrobot_ws/world/gear.world.template similarity index 100% rename from rrrobot_ws/world/gear.world.template rename to src/rrrobot_ws/world/gear.world.template diff --git a/rrrobot_ws/world/rrrobot_setpoint.world b/src/rrrobot_ws/world/rrrobot_setpoint.world similarity index 100% rename from rrrobot_ws/world/rrrobot_setpoint.world rename to src/rrrobot_ws/world/rrrobot_setpoint.world