mirrors/scout_ros
1
0
Fork 0
mirror of https://github.com/westonrobot/scout_ros.git synced 2026-01-12 11:20:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed conflicts in readme

Browse Source
This commit is contained in:
Ruixiang Du
2020-08-21 17:11:57 +08:00
parent 1e321b74ef
commit 4ebad08517
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

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