From 552e7c2cca57746dda24791e2515663bda4282a4 Mon Sep 17 00:00:00 2001 From: kuroemon2509 Date: Tue, 6 Nov 2018 22:14:49 +0800 Subject: [PATCH 1/3] update README.md --- README.md | 33 ++++++++++++++++++++++++++++++++- unity/README.md | 30 ++++++++++++++++++------------ 2 files changed, 50 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 5e50763..2400f49 100644 --- a/README.md +++ b/README.md @@ -20,5 +20,36 @@ 4. Install rosbridge-suite ``` $ sudo apt-get install ros--rosbridge-server + ``` + - Note that if you are using VirtualBox, you will need to do some addition [steps](https://github.com/siemens/ros-sharp/wiki/User_Inst_UbuntuOnOracleVM). + +5. Clone this repository + - Install `git` and `git-lfs` if you haven't + - `cd` to the `catkin` source folder ``` -5. [New version unity](https://drive.google.com/drive/folders/1V4V5Qegb8DfxDpzpgH0b572IA_mUgXBP?usp=sharing) + $ cd ~/catkin_ws/src + ``` + - `clone` the repo + ``` + $ git clone https://github.com/fpt-corp/ROS_Package_example [(optional) shorter_file_name] + ``` +6. `make` the `src` and run some ros nodes + - `cd` back to the workspace + ``` + $ cd ~/catkin_ws + ``` + - `make` the `src` + ``` + $ catkin_make + ``` + - Add the maked `src` to the terminal + ``` + $ source devel/setup.bash + ``` + + You will need to run these steps everytime you change "something". + - Launch ros nodes + ``` + $ roslaunch lane_detect lane_detect.launch + ``` + - You will need to leave this terminal as it is in order to run the simulator. +- Now, let's run the [simulator](unity/README.md). diff --git a/unity/README.md b/unity/README.md index 7777a37..02f9ff9 100644 --- a/unity/README.md +++ b/unity/README.md @@ -1,13 +1,19 @@ -B1. Chạy câu lệnh sau để khởi động sever: +## Requirements +- Completed previous [guides](../README.md). +- OpenGL 3.2 or later + - If you are using VirtualBox, you will not able to run this program yet because VirtualBox only support OpenGL 2.x + - If you are using any virtual machine other than VirtualBox, you may not able to setup these [steps](https://github.com/siemens/ros-sharp/wiki/User_Inst_UbuntuOnOracleVM) although they may not suffer OpenGL problem. -$ roslaunch lane_detect lane_detect.launch - -B2. Bật app unity, điền đầy đủ thông tin và ấn Connect. - -- Tên đội: Team1 -- IP: ws://127.0.0.1:9090 hoặc ip của máy chủ ROS_MASTER - -chú ý: để chạy được xe cần 3 topic. đổi tên topic theo tên đội và make lại bằng catkin_make -- /Team1_speed : topic truyền tốc độ từ thuật toán lên xe để chạy -- /Team1_steerAngle : Topic truyền góc lái cho xe -- /Team1_image : Topic cho các đội thi subcriber ảnh từ phần mềm mô phỏng +## Installation + - If your `test.x86_64` file is just a text file looks similar like this + ``` + version https://git-lfs.github.com/spec/v1 + oid sha256:4882eb05e85521b333621a15f0f76083c45ae66f869557d5d6c4838ffe8e3930 + size 100719740 + ``` + then you will need to run the following comand to get the actual file because `git clone` hasn't `pull` this file down for you yet. + ``` + $ git lfs pull --include "test.x86_64" + ``` + or you can download the [file](https://github.com/fpt-corp/ROS_Package_example/blob/master/unity/test.x86_64) directly from github and put it wherever you want. + - \ No newline at end of file From 2cf1cdc4936284c9a9f478d267501828185faedd Mon Sep 17 00:00:00 2001 From: kuroemon2509 Date: Tue, 6 Nov 2018 22:15:35 +0800 Subject: [PATCH 2/3] vietnamese ver --- unity/README.vn.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 unity/README.vn.md diff --git a/unity/README.vn.md b/unity/README.vn.md new file mode 100644 index 0000000..7777a37 --- /dev/null +++ b/unity/README.vn.md @@ -0,0 +1,13 @@ +B1. Chạy câu lệnh sau để khởi động sever: + +$ roslaunch lane_detect lane_detect.launch + +B2. Bật app unity, điền đầy đủ thông tin và ấn Connect. + +- Tên đội: Team1 +- IP: ws://127.0.0.1:9090 hoặc ip của máy chủ ROS_MASTER + +chú ý: để chạy được xe cần 3 topic. đổi tên topic theo tên đội và make lại bằng catkin_make +- /Team1_speed : topic truyền tốc độ từ thuật toán lên xe để chạy +- /Team1_steerAngle : Topic truyền góc lái cho xe +- /Team1_image : Topic cho các đội thi subcriber ảnh từ phần mềm mô phỏng From 2fd27808b8644ee4c88706eb2d7ff92dfa19879d Mon Sep 17 00:00:00 2001 From: kuroemon2509 Date: Tue, 6 Nov 2018 22:20:59 +0800 Subject: [PATCH 3/3] fix markdown syntax --- unity/README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/unity/README.md b/unity/README.md index 02f9ff9..c735a6a 100644 --- a/unity/README.md +++ b/unity/README.md @@ -5,15 +5,15 @@ - If you are using any virtual machine other than VirtualBox, you may not able to setup these [steps](https://github.com/siemens/ros-sharp/wiki/User_Inst_UbuntuOnOracleVM) although they may not suffer OpenGL problem. ## Installation - - If your `test.x86_64` file is just a text file looks similar like this - ``` - version https://git-lfs.github.com/spec/v1 - oid sha256:4882eb05e85521b333621a15f0f76083c45ae66f869557d5d6c4838ffe8e3930 - size 100719740 - ``` - then you will need to run the following comand to get the actual file because `git clone` hasn't `pull` this file down for you yet. - ``` - $ git lfs pull --include "test.x86_64" - ``` - or you can download the [file](https://github.com/fpt-corp/ROS_Package_example/blob/master/unity/test.x86_64) directly from github and put it wherever you want. +- If your `test.x86_64` file is just a text file looks similar like this +``` +version https://git-lfs.github.com/spec/v1 +oid sha256:4882eb05e85521b333621a15f0f76083c45ae66f869557d5d6c4838ffe8e3930 +size 100719740 +``` +then you will need to run the following comand to get the actual file because `git clone` hasn't `pull` this file down for you yet. +``` +$ git lfs pull --include "test.x86_64" +``` +or you can download the [file](https://github.com/fpt-corp/ROS_Package_example/blob/master/unity/test.x86_64) directly from github and put it wherever you want. - \ No newline at end of file