Skip to content

Commit

Permalink
3.19 updated readme resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
naitri committed Dec 13, 2021
2 parents e109ce5 + 33b1d7c commit 9bca0ed
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ Firefighters all over the world, put the safety of others before their
* Project: Project Finder is search and rescue robot for hazardous environment
* Overview of prosposed work, including risks, mitigation, timeline
* UML and activity diagrams
* Travis code coverage setup with Coveralls
* Developer-level documentation

## Presentation
* Project FINDER presentation can be found [here](https://docs.google.com/presentation/d/1KdqD9iXE6J5zDkRmNgDRY7NPadIoZbQjSN5EO-4kMEs/edit?usp=sharing)

## Dependencies with licenses
* OpenCV 4.5.0 (covered under the open-source Apache 2 License)
* ROS Noetic
Expand All @@ -43,17 +45,15 @@ Following the Agile Iterative Process for Development, we switch roles of driver

## Installation

### Install TurtleBot3
# Install Requirements
```
cd ~/finderbot_ws/src
git clone https://github.com/ROBOTIS-GIT/turtlebot3_msgs.git -b noetic-devel
git clone https://github.com/ROBOTIS-GIT/turtlebot3.git -b noetic-devel
git clone https://github.com/ROBOTIS-GIT/turtlebot3_simulations.git -b noetic-devel
cd ~/finderbot_ws
catkin_make
source devel/setup.bash
bash ros_requirements.bash
run requirements.sh
```
### Clone git repository


# Clone git repository

```
cd finderbot_ws/src
git clone --recursive https://github.com/naitri/project_finder
Expand All @@ -67,10 +67,12 @@ source devel/setup.bash
```
In terminal 1
```
source devel/setup.bash
roslaunch project_finder main.launch
```
In terminal 2
```
source devel/setup.bash
rosrun project_finder finder
```
### Result
Expand Down
Binary file removed data/result.png
Binary file not shown.

0 comments on commit 9bca0ed

Please sign in to comment.