Skip to content

Commit 9bca0ed

Browse files
committed
3.19 updated readme resolved conflicts
2 parents e109ce5 + 33b1d7c commit 9bca0ed

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

README.md

+12-10
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ Firefighters all over the world, put the safety of others before their
1717
* Project: Project Finder is search and rescue robot for hazardous environment
1818
* Overview of prosposed work, including risks, mitigation, timeline
1919
* UML and activity diagrams
20-
* Travis code coverage setup with Coveralls
2120
* Developer-level documentation
2221

22+
## Presentation
23+
* Project FINDER presentation can be found [here](https://docs.google.com/presentation/d/1KdqD9iXE6J5zDkRmNgDRY7NPadIoZbQjSN5EO-4kMEs/edit?usp=sharing)
24+
2325
## Dependencies with licenses
2426
* OpenCV 4.5.0 (covered under the open-source Apache 2 License)
2527
* ROS Noetic
@@ -43,17 +45,15 @@ Following the Agile Iterative Process for Development, we switch roles of driver
4345

4446
## Installation
4547

46-
### Install TurtleBot3
48+
# Install Requirements
4749
```
48-
cd ~/finderbot_ws/src
49-
git clone https://github.com/ROBOTIS-GIT/turtlebot3_msgs.git -b noetic-devel
50-
git clone https://github.com/ROBOTIS-GIT/turtlebot3.git -b noetic-devel
51-
git clone https://github.com/ROBOTIS-GIT/turtlebot3_simulations.git -b noetic-devel
52-
cd ~/finderbot_ws
53-
catkin_make
54-
source devel/setup.bash
50+
bash ros_requirements.bash
51+
run requirements.sh
5552
```
56-
### Clone git repository
53+
54+
55+
# Clone git repository
56+
5757
```
5858
cd finderbot_ws/src
5959
git clone --recursive https://github.com/naitri/project_finder
@@ -67,10 +67,12 @@ source devel/setup.bash
6767
```
6868
In terminal 1
6969
```
70+
source devel/setup.bash
7071
roslaunch project_finder main.launch
7172
```
7273
In terminal 2
7374
```
75+
source devel/setup.bash
7476
rosrun project_finder finder
7577
```
7678
### Result

data/result.png

-688 KB
Binary file not shown.

0 commit comments

Comments
 (0)