From 5d891787e11b2d01a0f2804f41ace6a3731613c6 Mon Sep 17 00:00:00 2001 From: Sravan Balaji Date: Sun, 5 Apr 2020 15:38:19 -0400 Subject: [PATCH] README Fix & build.sh unix newlines - Fix instructions in README for building and running simulation environment - Convert build.sh from dos to unix format and add shebang --- README.md | 12 +++++++----- rrrobot_src/src/simulation_drivers/build.sh | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ea7ed35..9e21e90 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ - [Docker Compose Services](#docker-compose-services) - [GUI Support](#gui-support) - [Running Docker Containers](#running-docker-containers) + - [Building the simulation environment](#building-the-simulation-environment) + - [Running the simulation](#running-the-simulation) ## Contributors @@ -98,18 +100,18 @@ Additionally, be sure to update the `IP_ADDRESS` variable in [.env](src/.env) wi 4. Use Docker Compose to run a service (refer to [docker-compose.yml](src/docker-compose.yml) or [Docker Compose Services](#docker-compose-services)) - `docker-compose run --rm ` - ### Building the simulation environment -1. Build the drivers for the simulation - - `cd /home/rrrobot/rrrobot_src/src/simulation_env/` +1. Source ROS Setup + - `source /opt/ros/melodic/setup.bash` +2. Build the drivers for the simulation + - `cd /app/rrrobot_src/src/simulation_drivers/` - `source build.sh` - ### Running the simulation 1. Start ros master node - `roscore &` 2. Run the gazebo simulator - this will bring up gazebo with a robotic arm - - `gazebo /home/rrrobot/rrrobot_src/world/rrrobot.world` + - `gazebo /app/rrrobot_src/world/rrrobot.world` 3. Run control and perception programs diff --git a/rrrobot_src/src/simulation_drivers/build.sh b/rrrobot_src/src/simulation_drivers/build.sh index 96b4638..4145f11 100755 --- a/rrrobot_src/src/simulation_drivers/build.sh +++ b/rrrobot_src/src/simulation_drivers/build.sh @@ -1,3 +1,5 @@ +#!/bin/bash + catkin_make clean catkin_make catkin_make install