merged with scout_sim

README.md

@@ -22,8 +22,14 @@ Please refer to the [README](https://github.com/westonrobot/wrp_sdk#hardware-int
 1. Install dependent libraries
 
     ```
+<<<<<<< HEAD
     $ sudo apt install libasio-dev
     $ sudo apt install ros-$ROS_DISTRO-teleop-twist-keyboard
+=======
+    $ sudo apt install ros-melodic-teleop-twist-keyboard
+    $ sudo apt-get install ros-melodic-joint-state-publisher-gui
+    $ sudo apt install ros-melodic-ros-controllers
+>>>>>>> scout_sim
     ```
 
 2. Clone the packages into your catkin workspace and compile
@@ -40,7 +46,7 @@ Please refer to the [README](https://github.com/westonrobot/wrp_sdk#hardware-int
 
 4. Launch ROS nodes
  
-* Start the base node 
+* Start the base node for the real robot
 
     ```
     $ roslaunch scout_bringup scout_minimal.launch
@@ -52,6 +58,21 @@ Please refer to the [README](https://github.com/westonrobot/wrp_sdk#hardware-int
     $ roslaunch scout_bringup scout_minimal_uart.launch
     ```
 
+<<<<<<< HEAD
+=======
+* Start the Webots-based simulation (Scout V1)
+
+    ```
+    $ roslaunch scout_bringup scout_base_webots_sim.launch
+    ```
+
+* Start the Gazebo-based simulation (Scout V2)
+
+    ```
+    $ roslaunch scout_bringup scout_base_gazebo_sim.launch
+    ```
+
+>>>>>>> scout_sim
 * Start the keyboard tele-op node
 
     ```