From 1225df3afbfff0573e58f767c0e2adf0ee66f7e9 Mon Sep 17 00:00:00 2001
From: d3dx13 <zhidkov2846@gmail.com>
Date: Wed, 15 Dec 2021 00:46:15 +0300
Subject: [PATCH 1/2] xacro.py is deprecated; please use xacro instead

---
 youbot_gazebo_robot/launch/youbot.launch                | 2 +-
 youbot_gazebo_robot/launch/youbot_arm_only.launch       | 2 +-
 youbot_gazebo_robot/launch/youbot_base_only.launch      | 2 +-
 youbot_gazebo_robot/launch/youbot_dual_arm.launch       | 2 +-
 youbot_gazebo_worlds/launch/robocup_at_work_2012.launch | 2 +-
 youbot_gazebo_worlds/launch/tower_of_hanoi.launch       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/youbot_gazebo_robot/launch/youbot.launch b/youbot_gazebo_robot/launch/youbot.launch
index 0401581..2761889 100644
--- a/youbot_gazebo_robot/launch/youbot.launch
+++ b/youbot_gazebo_robot/launch/youbot.launch
@@ -10,7 +10,7 @@
   <!-- launch world -->
   <include file="$(find youbot_gazebo_worlds)/launch/$(arg world).launch" />
 
-  <param name="robot_description" command="$(find xacro)/xacro.py $(find youbot_description)/robots/$(arg robot).urdf.xacro" />
+  <param name="robot_description" command="xacro $(find youbot_description)/robots/$(arg robot).urdf.xacro" />
 
   <node pkg="gazebo_ros" type="spawn_model" name="spawn_robot" respawn="false" output="screen"
     args="-param robot_description
diff --git a/youbot_gazebo_robot/launch/youbot_arm_only.launch b/youbot_gazebo_robot/launch/youbot_arm_only.launch
index 11b0bb3..badf549 100644
--- a/youbot_gazebo_robot/launch/youbot_arm_only.launch
+++ b/youbot_gazebo_robot/launch/youbot_arm_only.launch
@@ -9,7 +9,7 @@
   <!-- launch world -->
   <include file="$(find youbot_gazebo_worlds)/launch/$(arg world).launch" />
 
-  <param name="robot_description" command="$(find xacro)/xacro.py $(find youbot_description)/robots/youbot_arm_only.urdf.xacro" />
+  <param name="robot_description" command="xacro $(find youbot_description)/robots/youbot_arm_only.urdf.xacro" />
 
   <node pkg="gazebo_ros" type="spawn_model" name="spawn_robot" respawn="false" output="screen"
     args="-param robot_description
diff --git a/youbot_gazebo_robot/launch/youbot_base_only.launch b/youbot_gazebo_robot/launch/youbot_base_only.launch
index 326f8d3..0c54644 100644
--- a/youbot_gazebo_robot/launch/youbot_base_only.launch
+++ b/youbot_gazebo_robot/launch/youbot_base_only.launch
@@ -9,7 +9,7 @@
   <!-- launch world -->
   <include file="$(find youbot_gazebo_worlds)/launch/$(arg world).launch" />
 
-  <param name="robot_description" command="$(find xacro)/xacro.py $(find youbot_description)/robots/youbot_base_only.urdf.xacro" />
+  <param name="robot_description" command="xacro $(find youbot_description)/robots/youbot_base_only.urdf.xacro" />
 
   <node pkg="gazebo_ros" type="spawn_model" name="spawn_robot" respawn="false" output="screen"
     args="-param robot_description
diff --git a/youbot_gazebo_robot/launch/youbot_dual_arm.launch b/youbot_gazebo_robot/launch/youbot_dual_arm.launch
index e571b9c..28b5663 100644
--- a/youbot_gazebo_robot/launch/youbot_dual_arm.launch
+++ b/youbot_gazebo_robot/launch/youbot_dual_arm.launch
@@ -9,7 +9,7 @@
   <!-- launch world -->
   <include file="$(find youbot_gazebo_worlds)/launch/$(arg world).launch" />
 
-  <param name="robot_description" command="$(find xacro)/xacro.py $(find youbot_description)/robots/youbot_dual_arm.urdf.xacro" />
+  <param name="robot_description" command="xacro $(find youbot_description)/robots/youbot_dual_arm.urdf.xacro" />
 
   <node pkg="gazebo_ros" type="spawn_model" name="spawn_robot" respawn="false" output="screen"
     args="-param robot_description
diff --git a/youbot_gazebo_worlds/launch/robocup_at_work_2012.launch b/youbot_gazebo_worlds/launch/robocup_at_work_2012.launch
index 598f1af..1d3881b 100644
--- a/youbot_gazebo_worlds/launch/robocup_at_work_2012.launch
+++ b/youbot_gazebo_worlds/launch/robocup_at_work_2012.launch
@@ -16,7 +16,7 @@
   </include>
 
     <!-- send world urdf to param server -->
-	<param name="world_description" command="$(find xacro)/xacro.py $(find youbot_gazebo_worlds)/urdf/robocup_at_work_2012.urdf" />
+	<param name="world_description" command="xacro $(find youbot_gazebo_worlds)/urdf/robocup_at_work_2012.urdf" />
 
     <!-- spawn uploaded world model -->
 	<node pkg="gazebo_ros" type="spawn_model" name="gazebo_world_model" args="-urdf -param world_description -model world -x 0.0 -y 0.0 -z 0.2" respawn="false" output="screen" />    
diff --git a/youbot_gazebo_worlds/launch/tower_of_hanoi.launch b/youbot_gazebo_worlds/launch/tower_of_hanoi.launch
index 056a79a..53a9e74 100644
--- a/youbot_gazebo_worlds/launch/tower_of_hanoi.launch
+++ b/youbot_gazebo_worlds/launch/tower_of_hanoi.launch
@@ -16,7 +16,7 @@
   </include>
 
     <!-- send world urdf to param server -->
-	<param name="world_description" command="$(find xacro)/xacro.py $(find youbot_gazebo_worlds)/urdf/tower_of_hanoi.urdf" />
+	<param name="world_description" command="xacro $(find youbot_gazebo_worlds)/urdf/tower_of_hanoi.urdf" />
 
     <!-- spawn uploaded world model -->
 	<node pkg="gazebo_ros" type="spawn_model" name="gazebo_world_model" args="-urdf -param world_description -model world -x 1.0 -y 0.0 -z 0.2" respawn="false" output="screen" />    

From 1447714d83a6cb2f9ff36d64acd115dadfe42ae5 Mon Sep 17 00:00:00 2001
From: d3dx13 <zhidkov2846@gmail.com>
Date: Wed, 15 Dec 2021 02:14:27 +0300
Subject: [PATCH 2/2] add text in README

---
 README.md | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/README.md b/README.md
index 7e3f85c..2a14024 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,81 @@ youbot_simulation
 =================
 
 Packages to run the KUKA youBot in the Gazebo simulation with ROS
+
+
+
+#### Easy installation on ubuntu 20.04
+
+```bash
+cd ~/catkin_ws/src
+
+# check https://github.com/mas-group/youbot_simulation/pull/19
+# if it is accepted, then
+git clone https://github.com/mas-group/youbot_simulation.git --branch noetic-devel
+# else
+git clone https://github.com/d3dx13/youbot_simulation.git
+
+
+git clone https://github.com/mas-group/youbot_description.git
+
+cd ~/catkin_ws
+catkin build
+source ~/.bashrc
+
+```
+
+
+
+#### Start simulation in one terminal
+
+**OPTION 1:** Kuka manipulator only
+
+```bash
+killall rosmaster roscore gazebo roslaunch gzserver gzclient;
+rosrun gazebo_ros gazebo &
+roslaunch youbot_gazebo_robot youbot_arm_only.launch &
+
+```
+
+**OPTION 2:** Whole kuka youbot
+
+```bash
+killall rosmaster roscore gazebo roslaunch gzserver gzclient;
+rosrun gazebo_ros gazebo &
+roslaunch youbot_gazebo_robot youbot.launch &
+
+```
+
+
+
+#### Install some examples
+
+```bash
+cd ~/catkin_ws/src
+
+# required library
+git clone https://github.com/wnowak/brics_actuator.git
+
+# examples
+git clone https://github.com/d3dx13/youbot_ros_examples.git
+
+cd ~/catkin_ws
+catkin build
+source ~/.bashrc
+
+```
+
+
+
+#### Launch some examples
+
+Kuka manipulator moving
+
+`rosrun youbot_ros_simple_trajectory youbot_ros_simple_trajectory`
+
+YouBot platform moving (works only with **OPTION 2**)
+
+`rosrun youbot_ros_hello_world youbot_ros_hello_world`
+
+
+