Root src folder & submodule

- Move workspace folders to root src folder - Add ARIAC UR10 MoveIt configuration submodule to ariac_ws
2025-08-15 22:38:31 +00:00 · 2020-04-20 18:28:21 -04:00
parent 35adc72950
commit f6c202548d
43 changed files with 9 additions and 4 deletions
--- 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

--- a/.gitmodules
+++ 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
--- a/src/ariac_ws/src/universal_robot
+++ b/src/ariac_ws/src/universal_robot
--- a/src/rrrobot_ws/build.sh
+++ b/src/rrrobot_ws/build.sh
--- a/src/rrrobot_ws/src/CMakeLists.txt
+++ b/src/rrrobot_ws/src/CMakeLists.txt
--- a/src/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
--- a/src/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
--- a/src/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
--- a/src/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
--- a/src/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
--- a/src/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
--- a/src/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
--- a/src/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
--- a/src/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
--- a/src/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
--- a/src/rrrobot_ws/src/gazebo_models/model_mappings.txt
+++ b/src/rrrobot_ws/src/gazebo_models/model_mappings.txt
--- a/src/rrrobot_ws/src/gazebo_models/plastic_bottle/meshes/plastic_bottle.STL
+++ b/src/rrrobot_ws/src/gazebo_models/plastic_bottle/meshes/plastic_bottle.STL
--- a/src/rrrobot_ws/src/gazebo_models/plastic_bottle/model.config
+++ b/src/rrrobot_ws/src/gazebo_models/plastic_bottle/model.config
--- a/src/rrrobot_ws/src/gazebo_models/plastic_bottle/model.sdf
+++ b/src/rrrobot_ws/src/gazebo_models/plastic_bottle/model.sdf
--- a/src/rrrobot_ws/src/gazebo_models/square_trash_can/model.config
+++ b/src/rrrobot_ws/src/gazebo_models/square_trash_can/model.config
--- a/src/rrrobot_ws/src/gazebo_models/square_trash_can/model.sdf
+++ b/src/rrrobot_ws/src/gazebo_models/square_trash_can/model.sdf
--- a/src/rrrobot_ws/src/gazebo_models/unit_box/model.config
+++ b/src/rrrobot_ws/src/gazebo_models/unit_box/model.config
--- a/src/rrrobot_ws/src/gazebo_models/unit_box/model.sdf
+++ b/src/rrrobot_ws/src/gazebo_models/unit_box/model.sdf
--- a/src/rrrobot_ws/src/rrrobot/CMakeLists.txt
+++ b/src/rrrobot_ws/src/rrrobot/CMakeLists.txt
--- a/src/rrrobot_ws/src/rrrobot/config/rrrobot.yaml
+++ b/src/rrrobot_ws/src/rrrobot/config/rrrobot.yaml
--- a/src/rrrobot_ws/src/rrrobot/config/rrrobot_sensors.yaml
+++ b/src/rrrobot_ws/src/rrrobot/config/rrrobot_sensors.yaml
--- a/src/rrrobot_ws/src/rrrobot/launch/rrrobot.launch
+++ b/src/rrrobot_ws/src/rrrobot/launch/rrrobot.launch
--- a/src/rrrobot_ws/src/rrrobot/msg/model_insertion.msg
+++ b/src/rrrobot_ws/src/rrrobot/msg/model_insertion.msg
--- a/src/rrrobot_ws/src/rrrobot/package.xml
+++ b/src/rrrobot_ws/src/rrrobot/package.xml
--- a/src/rrrobot_ws/src/rrrobot/scripts/rrrobot_run.sh
+++ b/src/rrrobot_ws/src/rrrobot/scripts/rrrobot_run.sh
--- a/src/rrrobot_ws/src/rrrobot/scripts/rrrobot_run_no_build.sh
+++ b/src/rrrobot_ws/src/rrrobot/scripts/rrrobot_run_no_build.sh
--- a/src/rrrobot_ws/src/rrrobot/scripts/sample_run.sh
+++ b/src/rrrobot_ws/src/rrrobot/scripts/sample_run.sh
--- a/src/rrrobot_ws/src/rrrobot/src/arm_controller_node.cpp
+++ b/src/rrrobot_ws/src/rrrobot/src/arm_controller_node.cpp
--- a/src/rrrobot_ws/src/rrrobot/src/cv_model.py
+++ b/src/rrrobot_ws/src/rrrobot/src/cv_model.py
--- a/src/rrrobot_ws/src/rrrobot/src/depth_camera_node.cpp
+++ b/src/rrrobot_ws/src/rrrobot/src/depth_camera_node.cpp
--- a/src/rrrobot_ws/src/rrrobot/src/model_insertion_plugin.cpp
+++ b/src/rrrobot_ws/src/rrrobot/src/model_insertion_plugin.cpp
--- a/src/rrrobot_ws/src/rrrobot/src/object_spawner_node.cpp
+++ b/src/rrrobot_ws/src/rrrobot/src/object_spawner_node.cpp
--- a/src/rrrobot_ws/src/rrrobot/src/rrrobot_node.cpp
+++ b/src/rrrobot_ws/src/rrrobot/src/rrrobot_node.cpp
--- a/src/rrrobot_ws/src/rrrobot/src/v1_0.001.pt
+++ b/src/rrrobot_ws/src/rrrobot/src/v1_0.001.pt
--- a/src/rrrobot_ws/src/rrrobot/test/test_insert_object.cpp
+++ b/src/rrrobot_ws/src/rrrobot/test/test_insert_object.cpp
--- a/src/rrrobot_ws/world/gear.py
+++ b/src/rrrobot_ws/world/gear.py
--- a/src/rrrobot_ws/world/gear.world.template
+++ b/src/rrrobot_ws/world/gear.world.template
--- a/src/rrrobot_ws/world/rrrobot_setpoint.world
+++ b/src/rrrobot_ws/world/rrrobot_setpoint.world