Correction after package name changing

Myzhar · Apr 3, 2015 · 74ac012 · 74ac012
1 parent bb73524
commit 74ac012
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/launch/include/myzharbot_description.launch b/launch/include/myzharbot_description.launch
@@ -2,7 +2,7 @@
 
 <launch>
   <!-- Send the MyzharBot Robot URDF/XACRO to param server -->
-  <param name="robot_description" command="$(find xacro)/xacro.py '$(find myzharbot_robot_ros)/urdf/description.xacro'" />
+  <param name="robot_description" command="$(find xacro)/xacro.py '$(find ros_myzharbot_robot)/urdf/description.xacro'" />
 
   <!-- Activate node to propagate the joint state -->
   <node name="robot_state_publisher" pkg="robot_state_publisher" type="robot_state_publisher" />

diff --git a/launch/myzharbot.launch b/launch/myzharbot.launch
@@ -1,18 +1,20 @@
 <launch>
   <param name="/info/robot_name" value="myzharbot" />
 
-  <include file="$(find myzharbot_robot_ros)/launch/include/myzharbot_description.launch" />
-  <include file="$(find myzharbot_robot_ros)/launch/include/rgbd.launch" />
+  <include file="$(find ros_myzharbot_robot)/launch/include/myzharbot_description.launch" />
+  <include file="$(find ros_myzharbot_robot)/launch/include/rgbd.launch" />
 
   <!-- LOAD bridge robot -->
   <group ns="myzharbot">
-      <rosparam command="load" file="$(find myzharbot_robot_ros)/myzharbot_robot.yaml" />      
+      <rosparam command="load" file="$(find ros_myzharbot_robot)/myzharbot_robot.yaml" />      
 
       <node name="myzharbot" pkg="serial_bridge" type="serial_bridge_node" args="/dev/ttyUSB0" output="screen" respawn="true" respawn_delay="20" >
           <remap from = "/myzharbot/joint_states" to = "/joint_states" />
       </node>
 
-      <!-- <node name="myzharbot_tf" pkg="myzharbot_robot_ros" type="myzharbot_tf_node.cpp" /> -->
+      <!-- <node name="inemo_m1_node" pkg="st_inemo_m1_imu" type="inemo_m1_node" output="screen" respawn="true" respawn_delay="20" /> -->
+
+      <!-- <node name="myzharbot_tf" pkg="ros_myzharbot_robot" type="myzharbot_tf_node.cpp" /> -->
   </group>
 
 </launch>
diff --git a/launch/myzharbot_rviz_robot_control.launch b/launch/myzharbot_rviz_robot_control.launch
@@ -5,5 +5,5 @@
 	<remap from = "/twist_marker_server/cmd_vel" to = "myzharbot/command/velocity" /> 
   </node>
 
-  <node name="rviz" pkg="rviz" type="rviz" args="-d $(find myzharbot_robot_ros)/rviz/robot.rviz" output="screen"/>
+  <node name="rviz" pkg="rviz" type="rviz" args="-d $(find ros_myzharbot_robot)/rviz/robot.rviz" output="screen"/>
 </launch>
diff --git a/urdf/description.xacro b/urdf/description.xacro
@@ -2,7 +2,7 @@
 
 <robot name="myzharbot" xmlns:xacro="http://ros.org/wiki/xacro">
 
-  <xacro:include filename="$(find myzharbot_robot_ros)/urdf/myzharbot.urdf.xacro" />
+  <xacro:include filename="$(find ros_myzharbot_robot)/urdf/myzharbot.urdf.xacro" />
   <xacro:myzharbot_robot />
 
 </robot>
diff --git a/urdf/myzharbot.urdf.xacro b/urdf/myzharbot.urdf.xacro
@@ -2,11 +2,11 @@
 <robot name="myzharbot_robot" xmlns:xacro="http://ros.org/wiki/xacro">
 
   <!-- Included URDF/XACRO Files -->
-  <xacro:include filename="$(find myzharbot_robot_ros)/urdf/materials.urdf" />
-  <xacro:include filename="$(find myzharbot_robot_ros)/urdf/passive_sprocket.urdf.xacro" />
-  <xacro:include filename="$(find myzharbot_robot_ros)/urdf/active_sprocket.urdf.xacro" />
-  <xacro:include filename="$(find myzharbot_robot_ros)/urdf/motor.urdf.xacro" />
-  <xacro:include filename="$(find myzharbot_robot_ros)/urdf/sensors/asus_xtion_pro.urdf.xacro"/>
+  <xacro:include filename="$(find ros_myzharbot_robot)/urdf/materials.urdf" />
+  <xacro:include filename="$(find ros_myzharbot_robot)/urdf/passive_sprocket.urdf.xacro" />
+  <xacro:include filename="$(find ros_myzharbot_robot)/urdf/active_sprocket.urdf.xacro" />
+  <xacro:include filename="$(find ros_myzharbot_robot)/urdf/motor.urdf.xacro" />
+  <xacro:include filename="$(find ros_myzharbot_robot)/urdf/sensors/asus_xtion_pro.urdf.xacro"/>
   <!-- Included URDF/XACRO Files -->
 
   <!-- Global properties -->

diff --git a/urdf/sensors/asus_xtion_pro.urdf.xacro b/urdf/sensors/asus_xtion_pro.urdf.xacro
@@ -33,7 +33,7 @@
       <visual>
         <origin xyz="-0.01 0 0" rpy="${-M_PI/2} -${M_PI} ${-M_PI/2}"/>
         <geometry>
-          <mesh filename="package://myzharbot_robot_ros/meshes/sensors/asus_xtion_pro_live.dae" scale="${M_SCALE} ${M_SCALE} ${M_SCALE}"/>
+          <mesh filename="package://ros_myzharbot_robot/meshes/sensors/asus_xtion_pro_live.dae" scale="${M_SCALE} ${M_SCALE} ${M_SCALE}"/>
         </geometry>
       </visual>
       <collision>