diff --git a/mapping.sh b/mapping.sh index 470f9e5..978fc89 100644 --- a/mapping.sh +++ b/mapping.sh @@ -3,14 +3,14 @@ source install/setup.bash commands=( "ros2 launch rm_serial_driver rm_serial_driver.launch.py" "ros2 launch rm_decision decision.launch.py" - # "ros2 launch rm_simpal_move simple_move.launch.py" - # "ros2 launch rm_nav_bringup bringup_real.launch.py \ - # world:=wanzheng \ - # mode:=mapping \ - # lio:=fastlio \ - # lio_rviz:=True \ - # nav_rviz:=True - # " + "ros2 launch rm_simpal_move simple_move.launch.py" + "ros2 launch rm_nav_bringup bringup_sim.launch.py \ + world:=2026RMUL \ + mode:=mapping \ + lio:=fastlio \ + lio_rviz:=True \ + nav_rviz:=True + " ) for cmd in "${commands[@]}"; do diff --git a/sim.sh b/sim.sh index 6b909fd..a5e5cc7 100644 --- a/sim.sh +++ b/sim.sh @@ -5,7 +5,7 @@ commands=( # "ros2 launch rm_decision decision.launch.py" "ros2 launch rm_simpal_move simple_move.launch.py" "ros2 launch rm_nav_bringup bringup_sim.launch.py \ - world:=RMUC \ + world:=2026RMUL \ mode:=nav \ lio:=fastlio \ localization:=gicp \ diff --git a/src/rm_nav/rm_nav_bringup/PCD/2026RMUL.pcd b/src/rm_nav/rm_nav_bringup/PCD/2026RMUL.pcd new file mode 100644 index 0000000..fa6c700 Binary files /dev/null and b/src/rm_nav/rm_nav_bringup/PCD/2026RMUL.pcd differ diff --git a/src/rm_nav/rm_nav_bringup/config/simulation/fastlio_mid360_sim.yaml b/src/rm_nav/rm_nav_bringup/config/simulation/fastlio_mid360_sim.yaml index 4b67aea..2a118a0 100644 --- a/src/rm_nav/rm_nav_bringup/config/simulation/fastlio_mid360_sim.yaml +++ b/src/rm_nav/rm_nav_bringup/config/simulation/fastlio_mid360_sim.yaml @@ -7,7 +7,7 @@ filter_size_map: 0.5 cube_side_length: 1000.0 runtime_pos_log_enable: false - map_file_path: "src/rm_nav/rm_nav_bringup/PCD/RMUL2026.pcd" + map_file_path: "src/rm_nav/rm_nav_bringup/PCD/2026RMUL.pcd" common: lid_topic: "/livox/lidar" diff --git a/src/rm_nav/rm_nav_bringup/map/2026RMUL.data b/src/rm_nav/rm_nav_bringup/map/2026RMUL.data new file mode 100644 index 0000000..d8cd1bb Binary files /dev/null and b/src/rm_nav/rm_nav_bringup/map/2026RMUL.data differ diff --git a/src/rm_nav/rm_nav_bringup/map/2026RMUL.pgm b/src/rm_nav/rm_nav_bringup/map/2026RMUL.pgm new file mode 100644 index 0000000..5bc4545 Binary files /dev/null and b/src/rm_nav/rm_nav_bringup/map/2026RMUL.pgm differ diff --git a/src/rm_nav/rm_nav_bringup/map/2026RMUL.posegraph b/src/rm_nav/rm_nav_bringup/map/2026RMUL.posegraph new file mode 100644 index 0000000..94fb46b Binary files /dev/null and b/src/rm_nav/rm_nav_bringup/map/2026RMUL.posegraph differ diff --git a/src/rm_nav/rm_nav_bringup/map/2026RMUL.yaml b/src/rm_nav/rm_nav_bringup/map/2026RMUL.yaml new file mode 100644 index 0000000..bd256e4 --- /dev/null +++ b/src/rm_nav/rm_nav_bringup/map/2026RMUL.yaml @@ -0,0 +1,7 @@ +image: 2026RMUL.pgm +mode: trinary +resolution: 0.05 +origin: [-0.921, -6.36, 0] +negate: 0 +occupied_thresh: 0.65 +free_thresh: 0.25 \ No newline at end of file diff --git a/src/rm_nav/rm_simulation/pb_rm_simulation/launch/rm_simulation.launch.py b/src/rm_nav/rm_simulation/pb_rm_simulation/launch/rm_simulation.launch.py index 3fa7a97..998b4e2 100644 --- a/src/rm_nav/rm_simulation/pb_rm_simulation/launch/rm_simulation.launch.py +++ b/src/rm_nav/rm_simulation/pb_rm_simulation/launch/rm_simulation.launch.py @@ -18,6 +18,7 @@ class WorldType: RMUC = 'RMUC' RMUL = 'RMUL' RMUL2026 = 'RMUL2026' + _2026RMUL = '2026RMUL' def get_world_config(world_type): world_configs = { @@ -42,6 +43,13 @@ def get_world_config(world_type): 'z': '0.063720', 'yaw': '0.0', 'world_path': 'RMUL2026_world/RMUL2026_world.world' + }, + WorldType._2026RMUL: { + 'x': '-5.3', + 'y': '2.3', + 'z': '0.063720', + 'yaw': '0.0', + 'world_path': '2026RMUL_world/2026RMUL_world.world' } } return world_configs.get(world_type, None) @@ -155,6 +163,7 @@ def generate_launch_description(): bringup_RMUC_cmd_group = create_gazebo_launch_group(WorldType.RMUC) bringup_RMUL_cmd_group = create_gazebo_launch_group(WorldType.RMUL) bringup_RMUL2026_cmd_group = create_gazebo_launch_group(WorldType.RMUL2026) + bringup_2026RMUL_cmd_group = create_gazebo_launch_group(WorldType._2026RMUL) # Create the launch description and populate ld = LaunchDescription() @@ -172,6 +181,7 @@ def generate_launch_description(): ld.add_action(bringup_RMUL_cmd_group) # type: ignore ld.add_action(bringup_RMUC_cmd_group) # type: ignore ld.add_action(bringup_RMUL2026_cmd_group) # type: ignore + ld.add_action(bringup_2026RMUL_cmd_group) # type: ignore # Uncomment this line if you want to start RViz ld.add_action(start_rviz_cmd) diff --git a/src/rm_nav/rm_simulation/pb_rm_simulation/meshes/2026RMUL_world/meshes/2026RMUL.STL b/src/rm_nav/rm_simulation/pb_rm_simulation/meshes/2026RMUL_world/meshes/2026RMUL.STL new file mode 100644 index 0000000..0723744 Binary files /dev/null and b/src/rm_nav/rm_simulation/pb_rm_simulation/meshes/2026RMUL_world/meshes/2026RMUL.STL differ diff --git a/src/rm_nav/rm_simulation/pb_rm_simulation/meshes/2026RMUL_world/model.config b/src/rm_nav/rm_simulation/pb_rm_simulation/meshes/2026RMUL_world/model.config new file mode 100644 index 0000000..5ec30a9 --- /dev/null +++ b/src/rm_nav/rm_simulation/pb_rm_simulation/meshes/2026RMUL_world/model.config @@ -0,0 +1,6 @@ + + + 2026RMUL_world + 1.0 + model.sdf + diff --git a/src/rm_nav/rm_simulation/pb_rm_simulation/meshes/2026RMUL_world/model.sdf b/src/rm_nav/rm_simulation/pb_rm_simulation/meshes/2026RMUL_world/model.sdf new file mode 100644 index 0000000..95e0201 --- /dev/null +++ b/src/rm_nav/rm_simulation/pb_rm_simulation/meshes/2026RMUL_world/model.sdf @@ -0,0 +1,45 @@ + + + + true + + + 0 0 0 1.5705 0 0 + + + model://2026RMUL_world/meshes/2026RMUL.STL + 0.001 0.001 0.001 + + + + 1 + + 0.3 0.3 0.3 1 + 0.7 0.7 0.7 1 + 0.01 0.01 0.01 1 + 0 0 0 1 + + + + 0 0 0 1.5705 0 0 + + + model://2026RMUL_world/meshes/2026RMUL.STL + 0.001 0.001 0.001 + + + + + + 1 + 1 + + + + + + + diff --git a/src/rm_nav/rm_simulation/pb_rm_simulation/world/2026RMUL_world/2026RMUL_world.world b/src/rm_nav/rm_simulation/pb_rm_simulation/world/2026RMUL_world/2026RMUL_world.world new file mode 100644 index 0000000..8d2c02c --- /dev/null +++ b/src/rm_nav/rm_simulation/pb_rm_simulation/world/2026RMUL_world/2026RMUL_world.world @@ -0,0 +1,149 @@ + + + + 1 + + + + + 0 0 1 + 100 100 + + + + + 65535 + + + + + 100 + 50 + + + + + + + + 10 + + + 0 + + + 0 0 1 + 100 100 + + + + + + + + + 0 0 -9.8 + 6e-06 2.3e-05 -4.2e-05 + + + 0.001 + 1 + 1000 + + + 0.4 0.4 0.4 1 + 0.7 0.7 0.7 1 + 0 + + + + + 1 + + 0.166667 + 0 + 0 + 0.166667 + 0 + 0.166667 + + + + 0 0 0 1.5705 0 0 + + + model://2026RMUL_world/meshes/2026RMUL.STL + 0.001 0.001 0.001 + + + + 1 + + 0.3 0.3 0.3 1 + 0.7 0.7 0.7 1 + 0.01 0.01 0.01 1 + 0 0 0 1 + + + + 0 0 0 1.5705 0 0 + + + model://2026RMUL_world/meshes/2026RMUL.STL + 0.001 0.001 0.001 + + + + + + 1 + 1 + + + + + + 1 + -6.2 4.2 0 0 0 0 + + + 0.5 0.5 13 0 -0 0 + 0.5 0.5 0.5 1 + 0.1 0.1 0.1 1 + 0 0 -1 + + 20 + 0.5 + 0.01 + 0.001 + + 0 + + + 0.5 0.5 14 0 -0 0 + 0.5 0.5 0.5 1 + 0.1 0.1 0.1 1 + + 20 + 0.5 + 0.01 + 0.001 + + 0 + 0 0 -1 + + + + 7.46312 3.78907 13.2486 -2.7e-05 1.5698 1.56647 + orbit + perspective + + + +