resovled conflicts

This commit is contained in:
Ruixiang Du
2020-08-21 16:50:53 +08:00
82 changed files with 8838 additions and 130 deletions

View File

@@ -103,7 +103,7 @@ Two scripts inside the "scout_bringup/scripts" folder are provided for easy setu
4. Launch ROS nodes
* Start the base node
* Start the base node for the real robot
```
$ roslaunch scout_bringup scout_minimal.launch
@@ -115,10 +115,16 @@ Two scripts inside the "scout_bringup/scripts" folder are provided for easy setu
$ roslaunch scout_bringup scout_minimal_uart.launch
```
* Or you can start the Webots-based simulation
* Start the Webots-based simulation (Scout V1)
```
$ roslaunch scout_bringup scout_base_sim.launch
$ roslaunch scout_bringup scout_base_webots_sim.launch
```
* Start the Gazebo-based simulation (Scout V2)
```
$ roslaunch scout_bringup scout_base_gazebo_sim.launch
```
* Start the keyboard tele-op node