From ba4f95aa239e383f53a982911cfc2d47ba953b46 Mon Sep 17 00:00:00 2001 From: Oscar Lima Date: Mon, 9 Nov 2020 14:28:24 +0100 Subject: [PATCH 1/6] update root README to include noetic installation instructions --- README.md | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d93db75..4d04db0 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,29 @@ Each demo package contains a README with description and instructions for both installation and running. +# Installation + +This repository contains demos for [ROSPlan](https://github.com/KCL-Planning/rosplan) + +First, you must install ROSPlan on your system. Please refer to the [ROSPlan installation instructions](https://github.com/KCL-Planning/ROSPlan/blob/master/README.md#installation). + +Additionally, in order to succesfully compile this repository, please do: + + sudo apt install ros-$ROS_DISTRO-tf2-bullet + +For ROS noetic: + + git clone --branch noetic-devel git@github.com:galou/occupancy_grid_utils.git + +For ROS melodic: + + git clone git@github.com:clearpathrobotics/occupancy_grid_utils.git + +Build + + cd + catkin build + ### Stage Demos - **Stage Demo** [*rosplan_stage_demo*](https://github.com/KCL-Planning/rosplan_demos/blob/master/rosplan_stage_demo) (melodic) @@ -19,7 +42,12 @@ This demonstrates [ROB-IS](https://github.com/sarah-keren/ROB-IS) and builds upo

### Gazebo Demos + - **Turtlebot2 Exploration** [*rosplan_turtlebot2_demo*](https://github.com/KCL-Planning/rosplan_demos/blob/master/rosplan_turtlebot2_demo) (kinetic) This demo is a simple exploration mission. The robot visits randomly generated waypoints around a map. -- **Turtlebot3 Exploration** [*rosplan_turtlebot3_demo*](https://github.com/KCL-Planning/rosplan_demos/blob/master/rosplan_turtlebot3_demo) (melodic) +

+ +- **Turtlebot3 Exploration** [*rosplan_turtlebot3_demo*](https://github.com/KCL-Planning/rosplan_demos/blob/master/rosplan_turtlebot3_demo) (melodic, noetic) This demo is a simple exploration mission. The robot visits randomly generated waypoints around a map. +

+

From eaa793e5ca8eb8155280d28c756b65f45e4bccf5 Mon Sep 17 00:00:00 2001 From: Oscar Lima Date: Mon, 9 Nov 2020 14:33:55 +0100 Subject: [PATCH 2/6] make image of rosplan tb demo2 smaller, improve text --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4d04db0..b87b5f9 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,8 @@ Each demo package contains a README with description and instructions for both i # Installation -This repository contains demos for [ROSPlan](https://github.com/KCL-Planning/rosplan) - -First, you must install ROSPlan on your system. Please refer to the [ROSPlan installation instructions](https://github.com/KCL-Planning/ROSPlan/blob/master/README.md#installation). +This repository contains demos for [ROSPlan](https://github.com/KCL-Planning/rosplan). +Please refer to the [ROSPlan installation instructions](https://github.com/KCL-Planning/ROSPlan/blob/master/README.md#installation) before proceeding. Additionally, in order to succesfully compile this repository, please do: @@ -45,7 +44,7 @@ This demonstrates [ROB-IS](https://github.com/sarah-keren/ROB-IS) and builds upo - **Turtlebot2 Exploration** [*rosplan_turtlebot2_demo*](https://github.com/KCL-Planning/rosplan_demos/blob/master/rosplan_turtlebot2_demo) (kinetic) This demo is a simple exploration mission. The robot visits randomly generated waypoints around a map. -

+

- **Turtlebot3 Exploration** [*rosplan_turtlebot3_demo*](https://github.com/KCL-Planning/rosplan_demos/blob/master/rosplan_turtlebot3_demo) (melodic, noetic) This demo is a simple exploration mission. The robot visits randomly generated waypoints around a map. From c8d900f52dd2f4e68fe7a0b16175f9eb7c419af3 Mon Sep 17 00:00:00 2001 From: Oscar Lima Date: Mon, 9 Nov 2020 14:40:56 +0100 Subject: [PATCH 3/6] update main readme file --- README.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b87b5f9..57d9309 100644 --- a/README.md +++ b/README.md @@ -2,17 +2,22 @@ ![Build status](https://github.com/KCL-Planning/rosplan_demos/workflows/build/badge.svg) -Each demo package contains a README with description and instructions for both installation and running. +This repository contains demos for [ROSPlan](https://github.com/KCL-Planning/rosplan). -# Installation +Each demo package contains a README with description and instructions for both demo specific installation and running. + +The installation instructions below will allow you to succesfully build all ros packages provided in this repository. + +### Installation -This repository contains demos for [ROSPlan](https://github.com/KCL-Planning/rosplan). Please refer to the [ROSPlan installation instructions](https://github.com/KCL-Planning/ROSPlan/blob/master/README.md#installation) before proceeding. -Additionally, in order to succesfully compile this repository, please do: +Install dependencies from binaries: sudo apt install ros-$ROS_DISTRO-tf2-bullet +Install dependencies from source: + For ROS noetic: git clone --branch noetic-devel git@github.com:galou/occupancy_grid_utils.git From 499e7c2a5f47ef12d25fdb8ceab3f1badb4aad2c Mon Sep 17 00:00:00 2001 From: Oscar Lima Date: Mon, 9 Nov 2020 14:45:59 +0100 Subject: [PATCH 4/6] update main readme file --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 57d9309..28cedac 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,10 @@ The installation instructions below will allow you to succesfully build all ros Please refer to the [ROSPlan installation instructions](https://github.com/KCL-Planning/ROSPlan/blob/master/README.md#installation) before proceeding. +Clone this repository inside your catkin workspace: + + git clone https://github.com/KCL-Planning/rosplan_demos.git + Install dependencies from binaries: sudo apt install ros-$ROS_DISTRO-tf2-bullet @@ -20,11 +24,11 @@ Install dependencies from source: For ROS noetic: - git clone --branch noetic-devel git@github.com:galou/occupancy_grid_utils.git + git clone --branch noetic-devel https://github.com/galou/occupancy_grid_utils.git For ROS melodic: - git clone git@github.com:clearpathrobotics/occupancy_grid_utils.git + git clone https://github.com/clearpathrobotics/occupancy_grid_utils.git Build From 2d646a0dfebf182508e68a4728227d1b86fb1b3d Mon Sep 17 00:00:00 2001 From: Oscar Lima Date: Mon, 9 Nov 2020 15:06:59 +0100 Subject: [PATCH 5/6] replace frame name /map with map --- .../launch/rosplan_roadmap_server.launch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rosplan_demos_interfaces/rosplan_interface_mapping/launch/rosplan_roadmap_server.launch b/rosplan_demos_interfaces/rosplan_interface_mapping/launch/rosplan_roadmap_server.launch index 16cf273..a265ae1 100644 --- a/rosplan_demos_interfaces/rosplan_interface_mapping/launch/rosplan_roadmap_server.launch +++ b/rosplan_demos_interfaces/rosplan_interface_mapping/launch/rosplan_roadmap_server.launch @@ -19,7 +19,7 @@ - + From d427f89c988551596fa021b4bd0ef8a821c7a62c Mon Sep 17 00:00:00 2001 From: Oscar Lima Date: Mon, 9 Nov 2020 15:09:06 +0100 Subject: [PATCH 6/6] update turtlebot3 readme --- rosplan_turtlebot3_demo/README.md | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/rosplan_turtlebot3_demo/README.md b/rosplan_turtlebot3_demo/README.md index 0ce6c63..e33aedc 100644 --- a/rosplan_turtlebot3_demo/README.md +++ b/rosplan_turtlebot3_demo/README.md @@ -6,7 +6,7 @@ The turtlebot demo is a simple exploration mission. The robot will visit randoml See image below showing gazebo and rviz visualisation. - + ### Turtlebot PDDL domain @@ -19,12 +19,19 @@ rosed rosplan_turtlebot3_demo domain_turtlebot_demo.pddl ## Installation instructions +First make sure you have followed the installation instructions on [rosplan demos main repository](https://github.com/kcl-planning/rosplan_demos). + The demo requires that you install turtlebot 3 gazebo simulator and some other ros debian pkgs, this will be done later on using rosdep, for now setup only build dependencies. ``` -cd ~/rosplan_ws/src -git clone https://github.com/KCL-Planning/ROSPlan.git -git clone https://github.com/KCL-Planning/rosplan_demos.git -git clone https://github.com/clearpathrobotics/occupancy_grid_utils +git clone --branch noetic-devel https://github.com/ROBOTIS-GIT/turtlebot3_simulations.git +git clone --branch noetic-devel https://github.com/ROBOTIS-GIT/turtlebot3.git +``` + +Install dependencies: +``` +sudo apt install ros-$ROS_DISTRO-turtlebot3-msgs +cd /src +rosdep install --from-paths ./ -i -y --rosdistro noetic ``` Compile the code: @@ -32,10 +39,9 @@ Compile the code: catkin build ``` -Source the ROSPlan workspace and install runtime dependencies: +Source the ROSPlan workspace: ``` source ~/rosplan_ws/devel/setup.bash -rosdep install rosplan_turtlebot3_demo ``` ## Run instructions