Merge pull request #3 from IOES-Lab/restructure

Restructuring of ROS 2 packages
IOES-Lab · Jun 25, 2024 · 50b4752 · 50b4752
2 parents 9ce1b99 + 13c02f6
commit 50b4752
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 10 deletions.
diff --git a/dave_demos/CMakeLists.txt → examples/dave_demos/CMakeLists.txt b/dave_demos/CMakeLists.txt → examples/dave_demos/CMakeLists.txt
diff --git a/dave_demos/README.md → examples/dave_demos/README.md b/dave_demos/README.md → examples/dave_demos/README.md
@@ -22,16 +22,16 @@ This method simplifies the process by pulling the model directly from Fuel, ensu
 
 If you prefer to use model files downloaded from Fuel, proceed as follows:
 
-1. Add a hook within the `dave_model_description` package to configure the necessary environment variables for Gazebo model lookup.
+1. Add a hook within the `dave_object_models` package to configure the necessary environment variables for Gazebo model lookup.
 
    ```bash
-   cd <path-to-dave_ws>/src/dave/dave_model_description
+   cd <path-to-dave_ws>/src/dave/models/dave_object_models
    mkdir hooks && cd hooks
-   touch dave_model_description.dsv.in
-   echo "prepend-non-duplicate;GZ_SIM_RESOURCE_PATH;@CMAKE_INSTALL_PREFIX@/share/@PROJECT_NAME@" >> dave_model_description.dsv.in
+   touch dave_object_models.dsv.in
+   echo "prepend-non-duplicate;GZ_SIM_RESOURCE_PATH;@CMAKE_INSTALL_PREFIX@/share/@PROJECT_NAME@" >> dave_object_models.dsv.in
    ```
 
-2. Append the following line to the CMakeLists.txt file in the `dave_model_description` package:
+2. Append the following line to the CMakeLists.txt file in the `dave_object_models` package:
 
    ```bash
    ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/hooks/${PROJECT_NAME}.dsv.in")

diff --git a/...mos/launch/model_in_empty_world.launch.py → ...mos/launch/model_in_empty_world.launch.py b/...mos/launch/model_in_empty_world.launch.py → ...mos/launch/model_in_empty_world.launch.py
@@ -61,7 +61,7 @@ def generate_launch_description():
             [
                 PathJoinSubstitution(
                     [
-                        FindPackageShare("dave_model_description"),
+                        FindPackageShare("dave_object_models"),
                         "launch",
                         "upload_model.launch.py",
                     ]

diff --git a/dave_demos/package.xml → examples/dave_demos/package.xml b/dave_demos/package.xml → examples/dave_demos/package.xml
diff --git a/dave_model_description/CMakeLists.txt → models/dave_object_models/CMakeLists.txt b/dave_model_description/CMakeLists.txt → models/dave_object_models/CMakeLists.txt
@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.8)
-project(dave_model_description)
+project(dave_object_models)
 
 find_package(ament_cmake REQUIRED)
 
 install(
   DIRECTORY description launch meshes
-  DESTINATION share/dave_model_description
+  DESTINATION share/dave_object_models
 )
 
 ament_environment_hooks(

diff --git a/.../description/mossy_cinder_block/model.sdf → .../description/mossy_cinder_block/model.sdf b/.../description/mossy_cinder_block/model.sdf → .../description/mossy_cinder_block/model.sdf
diff --git a/...n/description/nortek_dvl500_300/model.sdf → ...s/description/nortek_dvl500_300/model.sdf b/...n/description/nortek_dvl500_300/model.sdf → ...s/description/nortek_dvl500_300/model.sdf
diff --git a/...ption/hooks/dave_model_description.dsv.in → ...ct_models/hooks/dave_object_models.dsv.in b/...ption/hooks/dave_model_description.dsv.in → ...ct_models/hooks/dave_object_models.dsv.in
diff --git a/...description/launch/upload_model.launch.py → ...ject_models/launch/upload_model.launch.py b/...description/launch/upload_model.launch.py → ...ject_models/launch/upload_model.launch.py
@@ -26,7 +26,7 @@ def generate_launch_description():
 
     description_file = PathJoinSubstitution(
         [
-            FindPackageShare("dave_model_description"),
+            FindPackageShare("dave_object_models"),
             "description",
             model_name,
             "model.sdf",

diff --git a/.../meshes/nortek_dvl500_300/DVL500-300m.dae → .../meshes/nortek_dvl500_300/DVL500-300m.dae b/.../meshes/nortek_dvl500_300/DVL500-300m.dae → .../meshes/nortek_dvl500_300/DVL500-300m.dae
diff --git a/...shes/nortek_dvl500_300/tx-DVL500-300m.png → ...shes/nortek_dvl500_300/tx-DVL500-300m.png b/...shes/nortek_dvl500_300/tx-DVL500-300m.png → ...shes/nortek_dvl500_300/tx-DVL500-300m.png
diff --git a/dave_model_description/package.xml → models/dave_object_models/package.xml b/dave_model_description/package.xml → models/dave_object_models/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
 
-  <name>dave_model_description</name>
+  <name>dave_object_models</name>
   <version>0.1.0</version>
   <description> Dave model description files are placed here. </description>