Unified config names

ganechean · Nov 25, 2017 · 20f3bcb · 20f3bcb
1 parent 091b3fb
commit 20f3bcb
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/src/mrslam_sim/config/net.sh → src/mrslam_sim/config/adhoc_net.sh b/src/mrslam_sim/config/net.sh → src/mrslam_sim/config/adhoc_net.sh
@@ -1,6 +1,3 @@
-export ROS_IP=169.254.34.2
-export ROS_MASTER_URI=http://169.254.34.2:11112
-
 sudo ip link set wlan0 down 
 sudo iwconfig wlan0 mode ad-hoc 
 sudo iwconfig wlan0 channel 4 
@@ -9,3 +6,6 @@ sudo iwconfig wlan0 key 1234267895
 sudo ip link set wlan0 up 
 sudo ip addr add 169.254.34.2/16 dev wlan0
 sudo route add -net 224.0.0.0 netmask 224.0.0.0 wlan0
+
+export ROS_IP=169.254.34.2
+export ROS_MASTER_URI=http://169.254.34.2:11112
diff --git a/...m_sim/launch/_multi_gmapping_robot.launch → ...rslam_sim/launch/_robot_m_gmapping.launch b/...m_sim/launch/_multi_gmapping_robot.launch → ...rslam_sim/launch/_robot_m_gmapping.launch
diff --git a/...launch/_multi_gmapping_merge_robot.launch → ...aunch/_robot_m_gmapping_mapmerging.launch b/...launch/_multi_gmapping_merge_robot.launch → ...aunch/_robot_m_gmapping_mapmerging.launch
diff --git a/src/mrslam_sim/launch/multi_gmapping.launch → src/mrslam_sim/launch/m_gmapping.launch b/src/mrslam_sim/launch/multi_gmapping.launch → src/mrslam_sim/launch/m_gmapping.launch
@@ -10,17 +10,17 @@
     <arg name="debug" value="false"/>
   </include>
 
-  <node name="rviz" pkg="rviz" type="rviz" args="-d $(find mrslam_sim)/rviz/multi_gmapping.rviz"/>
+  <node name="rviz" pkg="rviz" type="rviz" args="-d $(find mrslam_sim)/rviz/m_gmapping.rviz"/>
 
   <!--Robot 1-->
-  <include file="$(find mrslam_sim)/launch/_multi_gmapping_robot.launch" >
+  <include file="$(find mrslam_sim)/launch/_robot_m_gmapping.launch" >
     <arg name="init_pose" value="-x 6 -y -6 -z 0" />
     <arg name="robot_name" value="robot1" />
     <arg name="model" value="burger"/>
   </include>
 
   <!--Robot 2-->
-  <include file="$(find mrslam_sim)/launch/_multi_gmapping_robot.launch" >
+  <include file="$(find mrslam_sim)/launch/_robot_m_gmapping.launch" >
     <arg name="init_pose" value="-x -10 -y 10 -z 0" />
     <arg name="robot_name" value="robot2" />
     <arg name="model" value="burger"/>

diff --git a/...am_sim/launch/multi_gmapping_merge.launch → ...m_sim/launch/m_gmapping_mapmerging.launch b/...am_sim/launch/multi_gmapping_merge.launch → ...m_sim/launch/m_gmapping_mapmerging.launch
@@ -10,10 +10,10 @@
     <arg name="debug" value="false"/>
   </include>
 
-  <node name="rviz" pkg="rviz" type="rviz" args="-d $(find mrslam_sim)/rviz/multi_gmapping_merge.rviz"/>
+  <node name="rviz" pkg="rviz" type="rviz" args="-d $(find mrslam_sim)/rviz/m_gmapping_mapmerging.rviz"/>
 
   <!--Robot 1-->
-  <include file="$(find mrslam_sim)/launch/_multi_gmapping_merge_robot.launch" >
+  <include file="$(find mrslam_sim)/launch/_robot_m_gmapping_mapmerging.launch" >
     <arg name="x" value="6" />
     <arg name="y" value="-6" />
     <arg name="z" value="0" />
@@ -22,7 +22,7 @@
   </include>
 
   <!--Robot 2-->
-  <include file="$(find mrslam_sim)/launch/_multi_gmapping_merge_robot.launch" >
+  <include file="$(find mrslam_sim)/launch/_robot_m_gmapping_mapmerging.launch" >
     <arg name="x" value="-10" />
     <arg name="y" value="10" />
     <arg name="z" value="0" />

diff --git a/.../launch/multimaster_gmapping_merge.launch → ..._sim/launch/mm_gmapping_mapmerging.launch b/.../launch/multimaster_gmapping_merge.launch → ..._sim/launch/mm_gmapping_mapmerging.launch
@@ -28,9 +28,9 @@ Second PC: roslaunch mrslam_sim multimaster_gmapping_merge.launch x:=10 y:=10 ro
     <arg name="debug" value="false"/>
   </include>
 
-  <node name="rviz" pkg="rviz" type="rviz" args="-d $(find mrslam_sim)/rviz/multimaster_gmapping_merge.rviz"/>
+  <node name="rviz" pkg="rviz" type="rviz" args="-d $(find mrslam_sim)/rviz/mm_gmapping_mapmerging.rviz"/>
 
-  <include file="$(find mrslam_sim)/launch/_multi_gmapping_merge_robot.launch" >
+  <include file="$(find mrslam_sim)/launch/_robot_m_gmapping_mapmerging.launch" >
     <arg name="x" value="$(arg x)" />
     <arg name="y" value="$(arg y)" />
     <arg name="z" value="0" />

diff --git a/src/mrslam_sim/rviz/multi_gmapping.rviz → src/mrslam_sim/rviz/m_gmapping.rviz b/src/mrslam_sim/rviz/multi_gmapping.rviz → src/mrslam_sim/rviz/m_gmapping.rviz
diff --git a/...mrslam_sim/rviz/multi_gmapping_merge.rviz → ...rslam_sim/rviz/m_gmapping_mapmerging.rviz b/...mrslam_sim/rviz/multi_gmapping_merge.rviz → ...rslam_sim/rviz/m_gmapping_mapmerging.rviz
diff --git a/..._sim/rviz/multimaster_gmapping_merge.rviz → ...slam_sim/rviz/mm_gmapping_mapmerging.rviz b/..._sim/rviz/multimaster_gmapping_merge.rviz → ...slam_sim/rviz/mm_gmapping_mapmerging.rviz
diff --git a/src/mrslam_sim/rviz/one_gmapping.rviz b/src/mrslam_sim/rviz/one_gmapping.rviz
@@ -8,7 +8,7 @@ Panels:
         - /Status1
         - /TF1/Frames1
       Splitter Ratio: 0.594406
-    Tree Height: 719
+    Tree Height: 747
   - Class: rviz/Selection
     Name: Selection
   - Class: rviz/Tool Properties
@@ -273,7 +273,7 @@ Visualization Manager:
   Value: true
   Views:
     Current:
-      Angle: -1.42
+      Angle: -1.56
       Class: rviz/TopDownOrtho
       Enable Stereo Rendering:
         Stereo Eye Separation: 0.06
@@ -282,21 +282,21 @@ Visualization Manager:
         Value: false
       Name: Current View
       Near Clip Distance: 0.01
-      Scale: 53.5183
+      Scale: 12.0427
       Target Frame: map
       Value: TopDownOrtho (rviz)
-      X: -5.58524
-      Y: 1.53775
+      X: 0.260832
+      Y: -4.55523
     Saved: ~
 Window Geometry:
   Displays:
     collapsed: false
-  Height: 1028
+  Height: 1056
   Hide Left Dock: false
   Hide Right Dock: true
   Image:
     collapsed: false
-  QMainWindow State: 000000ff00000000fd0000000400000000000001af0000035ffc0200000009fb0000001200530065006c0065006300740069006f006e00000001e10000009b0000006400fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c00610079007301000000420000035f000000de00fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261fb0000000a0049006d0061006700650000000211000001900000001600ffffff000000010000010f0000037ffc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a0056006900650077007300000000270000037f000000b200fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e100000197000000030000073f0000003efc0100000002fb0000000800540069006d006501000000000000073f000002bc00fffffffb0000000800540069006d006501000000000000045000000000000000000000058a0000035f00000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
+  QMainWindow State: 000000ff00000000fd0000000400000000000001af0000037bfc0200000009fb0000001200530065006c0065006300740069006f006e00000001e10000009b0000006400fffffffb0000001e0054006f006f006c002000500072006f007000650072007400690065007302000001ed000001df00000185000000a3fb000000120056006900650077007300200054006f006f02000001df000002110000018500000122fb000000200054006f006f006c002000500072006f0070006500720074006900650073003203000002880000011d000002210000017afb000000100044006900730070006c00610079007301000000420000037b000000de00fffffffb0000002000730065006c0065006300740069006f006e00200062007500660066006500720200000138000000aa0000023a00000294fb00000014005700690064006500530074006500720065006f02000000e6000000d2000003ee0000030bfb0000000c004b0069006e0065006300740200000186000001060000030c00000261fb0000000a0049006d0061006700650000000211000001900000001600ffffff000000010000010f0000037ffc0200000003fb0000001e0054006f006f006c002000500072006f00700065007200740069006500730100000041000000780000000000000000fb0000000a0056006900650077007300000000270000037f000000b200fffffffb0000001200530065006c0065006300740069006f006e010000025a000000b200000000000000000000000200000490000000a9fc0100000001fb0000000a00560069006500770073030000004e00000080000002e10000019700000003000007490000003efc0100000002fb0000000800540069006d0065010000000000000749000002bc00fffffffb0000000800540069006d00650100000000000004500000000000000000000005940000037b00000004000000040000000800000008fc0000000100000002000000010000000a0054006f006f006c00730100000000ffffffff0000000000000000
   Selection:
     collapsed: false
   Time:
@@ -305,6 +305,6 @@ Window Geometry:
     collapsed: false
   Views:
     collapsed: true
-  Width: 1855
+  Width: 1865
   X: 55
-  Y: 23
+  Y: 0