diff --git a/ariac_ws/src/universal_robot b/ariac_ws/src/universal_robot deleted file mode 160000 index 8bb711d..0000000 --- a/ariac_ws/src/universal_robot +++ /dev/null @@ -1 +0,0 @@ -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 76% rename from rrrobot_ws/src/rrrobot/config/rrrobot_sensors.yaml rename to src/rrrobot_ws/src/rrrobot/config/rrrobot_sensors.yaml index d3976e9..aa94c75 100644 --- a/rrrobot_ws/src/rrrobot/config/rrrobot_sensors.yaml +++ b/src/rrrobot_ws/src/rrrobot/config/rrrobot_sensors.yaml @@ -7,5 +7,5 @@ sensors: depth_camera_1: type: depth_camera pose: - xyz: [1.2, 0.75, 1.5] - rpy: [0, 1.5707, 0] + xyz: [0.75, 0.75, 1.5] + rpy: [0, 1, 0] 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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 old mode 100755 new mode 100644 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