fixed files

Author: alexglzg

vehicle_descriptions/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0.2)
-project(vehicles_descriptions)
+project(vehicle_descriptions)
 
 ## Compile as C++11, supported in ROS Kinetic and newer
 add_compile_options(-std=c++11)

vehicle_descriptions/launch/vtec_s3.launch

@@ -24,7 +24,7 @@
 
   <group ns="$(arg namespace)">
     <param name="robot_description"
-           command="$(find xacro)/xacro --inorder '$(find vehicles_descriptions)/robots/$(arg mode).xacro' debug:=$(arg debug) namespace:=$(arg namespace)" />
+           command="$(find xacro)/xacro --inorder '$(find vehicle_descriptions)/robots/$(arg mode).xacro' debug:=$(arg debug) namespace:=$(arg namespace)" />
 
     <!-- Run a python script to the send a service call to gazebo_ros to spawn a URDF robot -->
     <node name="urdf_spawner" pkg="gazebo_ros" type="spawn_model" respawn="false" output="screen"

vehicle_descriptions/launch/vtec_u3.launch

@@ -34,7 +34,7 @@
 
   <group ns="$(arg namespace)">
     <param name="robot_description"
-           command="$(find xacro)/xacro --inorder '$(find vehicles_descriptions)/robots/$(arg mode).xacro' debug:=$(arg debug) namespace:=$(arg namespace)" />
+           command="$(find xacro)/xacro --inorder '$(find vehicle_descriptions)/robots/$(arg mode).xacro' debug:=$(arg debug) namespace:=$(arg namespace)" />
 
     <!-- Run a python script to the send a service call to gazebo_ros to spawn a URDF robot -->
       <node name="urdf_spawner" pkg="gazebo_ros" type="spawn_model" respawn="false" output="screen"
@@ -47,7 +47,7 @@
       <param name="robot_description" value="/$(arg namespace)/robot_description" />
     </node>
 
-      <!-- <include file="$(find vehicles_descriptions)/launch/peripherals.launch" /> -->   
+      <!-- <include file="$(find vehicle_descriptions)/launch/peripherals.launch" /> -->   
   </group> 
 
 </launch>

vehicle_descriptions/package.xml

@@ -3,9 +3,9 @@
 <!-- https://answers.ros.org/question/257694/questions-to-sdf-urdf-xacro-material-textures-using-gazebo/ -->
 
 <package format="2">
-  <name>vehicles_descriptions</name>
+  <name>vehicle_descriptions</name>
   <version>0.0.0</version>
-  <description>The vehicles_description package</description>
+  <description>The vehicle_description package</description>
 
   <!-- One maintainer tag required, multiple allowed, one person per tag -->
   <!-- Example:  -->

vehicle_descriptions/robots/vtec_s3.xacro

@@ -4,9 +4,9 @@
   <xacro:arg name="namespace" default="vtec_s3"/>
   <xacro:arg name="inertial_reference_frame" default="world_ned"/>
 
-  <xacro:include filename="$(find vehicles_descriptions)/urdf/USVs/vtec_s3_base.xacro"/>
+  <xacro:include filename="$(find vehicle_descriptions)/urdf/USVs/vtec_s3_base.xacro"/>
   <xacro:include filename="$(find uuv_sensor_ros_plugins)/urdf/sensor_snippets.xacro"/>
-  <!-- <xacro:include filename="$(find vehicles_descriptions)/urdf/USVs/vtec_s3_sensors.xacro"/> -->
+  <!-- <xacro:include filename="$(find vehicle_descriptions)/urdf/USVs/vtec_s3_sensors.xacro"/> -->
   <xacro:include filename="$(find velodyne_description)/urdf/VLP-16.urdf.xacro"/>
 
   <xacro:vtec_s3_base namespace="$(arg namespace)"/>

vehicle_descriptions/robots/vtec_u3.xacro

@@ -4,11 +4,11 @@
   <xacro:arg name="namespace" default="vtec_u3"/>
   <xacro:arg name="inertial_reference_frame" default="world_ned"/>
 
-  <xacro:include filename="$(find vehicles_descriptions)/urdf/UUVs/vtec_u3_base.xacro"/>
+  <xacro:include filename="$(find vehicle_descriptions)/urdf/UUVs/vtec_u3_base.xacro"/>
   <xacro:include filename="$(find uuv_sensor_ros_plugins)/urdf/sensor_snippets.xacro"/>
-  <xacro:include filename="$(find vehicles_descriptions)/urdf/UUVs/vtec_u3_sensors.xacro"/> 
-  <xacro:include filename="$(find vehicles_descriptions)/urdf/UUVs/vtec_u3_arm.xacro"/> 
-  <xacro:include filename="$(find vehicles_descriptions)/urdf/UUVs/vtec_u3_shooter.xacro"/> 
+  <xacro:include filename="$(find vehicle_descriptions)/urdf/UUVs/vtec_u3_sensors.xacro"/> 
+  <xacro:include filename="$(find vehicle_descriptions)/urdf/UUVs/vtec_u3_arm.xacro"/> 
+  <xacro:include filename="$(find vehicle_descriptions)/urdf/UUVs/vtec_u3_shooter.xacro"/> 
 
   <xacro:vtec_u3_base namespace="$(arg namespace)"/>
   <xacro:vtec_u3_sensors namespace="$(arg namespace)"/>

vehicle_descriptions/urdf/USVs/vtec_s3_base.xacro

@@ -12,14 +12,14 @@
     mesh with the origin of the mesh on the same position of the center of mass, otherwise
     the mesh pose will have to be corrected below in the <visual> block.
   -->
-  <xacro:property name="visual_mesh_file" value="file://$(find vehicles_descriptions)/meshes/vtec_s3.dae"/>
+  <xacro:property name="visual_mesh_file" value="file://$(find vehicle_descriptions)/meshes/vtec_s3.dae"/>
 
   <!-- 
     Collision geometry mesh, usually in STL format (it is recommended to keep
     this geometry as simple as possible to improve the performance the physics engine
     regarding the computation of collision forces)
   -->
-  <xacro:property name="collision_mesh_file" value="file://$(find vehicles_descriptions)/meshes/vtec_s3.stl"/>
+  <xacro:property name="collision_mesh_file" value="file://$(find vehicle_descriptions)/meshes/vtec_s3.stl"/>
 
   <xacro:macro name="vtec_s3_base" params="namespace">
       <link name="${namespace}_base_link">

vehicle_descriptions/urdf/UUVs/vtec_u3_arm.xacro

@@ -66,14 +66,14 @@
       <visual>
         <origin xyz="0 0 0" rpi="0 0 0"/>
         <geometry>
-          <mesh filename="package://vehicles_descriptions/meshes/arm/arm_rail.stl" />
+          <mesh filename="package://vehicle_descriptions/meshes/arm/arm_rail.stl" />
         </geometry>
       </visual>
       <!-- Leave commented. This makes the whole arm to move -->
       <!-- <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://vehicles_descriptions/meshes/arm/arm_rail.stl" />
+          <mesh filename="package://vehicle_descriptions/meshes/arm/arm_rail.stl" />
         </geometry>
       </collision> -->
       <inertial>
@@ -95,13 +95,13 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://vehicles_descriptions/meshes/arm/extendible_arm.stl" />
+          <mesh filename="package://vehicle_descriptions/meshes/arm/extendible_arm.stl" />
         </geometry>
       </visual>
       <!-- <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://vehicles_descriptions/meshes/arm/extendible_arm.stl" />
+          <mesh filename="package://vehicle_descriptions/meshes/arm/extendible_arm.stl" />
         </geometry>
       </collision> -->
       <inertial>
@@ -123,13 +123,13 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://vehicles_descriptions/meshes/arm/left_beam.stl" />
+          <mesh filename="package://vehicle_descriptions/meshes/arm/left_beam.stl" />
         </geometry>
       </visual>
       <!-- <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://vehicles_descriptions/meshes/arm/left_beam.stl" />
+          <mesh filename="package://vehicle_descriptions/meshes/arm/left_beam.stl" />
         </geometry>
       </collision> -->
       <inertial>
@@ -152,13 +152,13 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://vehicles_descriptions/meshes/arm/left_tip.stl" />
+          <mesh filename="package://vehicle_descriptions/meshes/arm/left_tip.stl" />
         </geometry>
       </visual>
       <!-- <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://vehicles_descriptions/meshes/arm/left_tip.stl" />
+          <mesh filename="package://vehicle_descriptions/meshes/arm/left_tip.stl" />
         </geometry>
       </collision> -->
       <inertial>
@@ -181,13 +181,13 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://vehicles_descriptions/meshes/arm/right_beam.stl" />
+          <mesh filename="package://vehicle_descriptions/meshes/arm/right_beam.stl" />
         </geometry>
       </visual>
       <!-- <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://vehicles_descriptions/meshes/arm/right_beam.stl" />
+          <mesh filename="package://vehicle_descriptions/meshes/arm/right_beam.stl" />
         </geometry>
       </collision> -->
       <inertial>
@@ -210,13 +210,13 @@
       <visual>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://vehicles_descriptions/meshes/arm/right_tip.stl" />
+          <mesh filename="package://vehicle_descriptions/meshes/arm/right_tip.stl" />
         </geometry>
       </visual>
       <!-- <collision>
         <origin xyz="0 0 0" rpy="0 0 0" />
         <geometry>
-          <mesh filename="package://vehicles_descriptions/meshes/arm/right_tip.stl" />
+          <mesh filename="package://vehicle_descriptions/meshes/arm/right_tip.stl" />
         </geometry>
       </collision> -->
       <inertial>

vehicle_descriptions/urdf/UUVs/vtec_u3_base.xacro

@@ -13,14 +13,14 @@
     mesh with the origin of the mesh on the same position of the center of mass, otherwise
     the mesh pose will have to be corrected below in the <visual> block.
   -->
-  <xacro:property name="visual_mesh_file" value="file://$(find vehicles_descriptions)/meshes/vtec_u3.dae"/>
+  <xacro:property name="visual_mesh_file" value="file://$(find vehicle_descriptions)/meshes/vtec_u3.dae"/>
 
   <!-- 
     Collision geometry mesh, usually in STL format (it is recommended to keep
     this geometry as simple as possible to improve the performance the physics engine
     regarding the computation of collision forces)
   -->
-  <xacro:property name="collision_mesh_file" value="file://$(find vehicles_descriptions)/meshes/vtec_u3.stl"/>
+  <xacro:property name="collision_mesh_file" value="file://$(find vehicle_descriptions)/meshes/vtec_u3.stl"/>
 
   <xacro:macro name="vtec_u3_base" params="namespace">
       <link name="${namespace}_base_link">

vehicle_descriptions/urdf/UUVs/vtec_u3_shooter.xacro

@@ -2,8 +2,8 @@
 <robot xmlns:xacro="http://www.ros.org/wiki/xacro">
 
   <xacro:macro name="vtec_u3_shooter" params="parent">
-    <xacro:property name="visual_mesh_file" value="file://$(find vehicles_descriptions)/meshes/shooter/shooter_base.dae" />
-    <!-- <xacro:property name="collision_mesh_file" value="file://$(find vehicles_descriptions)/meshes/shooter/shooter_base.dae"/> -->
+    <xacro:property name="visual_mesh_file" value="file://$(find vehicle_descriptions)/meshes/shooter/shooter_base.dae" />
+    <!-- <xacro:property name="collision_mesh_file" value="file://$(find vehicle_descriptions)/meshes/shooter/shooter_base.dae"/> -->
 
     <gazebo reference="shooter_base_link">
         <material>Gazebo/White</material>