From 72184ad5d6ed274a43d6e264f048b3a74f5df039 Mon Sep 17 00:00:00 2001
From: Pateman16 <patrickkarlsson16@gmail.com>
Date: Wed, 21 Feb 2018 14:03:27 +0100
Subject: [PATCH] minor changes in launch script and model scripts

---
 README                                  |  2 +
 src/models/apriltag/model.config        |  9 +++++
 src/models/apriltag/model.sdf           | 49 +++++++++++++++++++++++++
 src/scripts/descend_on_object_server.py |  1 -
 src/scripts/detect_object_server.py     |  1 -
 5 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 src/models/apriltag/model.config
 create mode 100644 src/models/apriltag/model.sdf

diff --git a/README b/README
index 12d2f4f..fa51ba0 100644
--- a/README
+++ b/README
@@ -11,4 +11,6 @@ terminal2: roslaunch simulation_control px4.launch fcu_url:="udp://:14550@127.0.
 
 terminal3: roslaunch simulation_control simulation_control.launch 
 
+you might want to delete  line 439 - 482 in the world file if gazebo doesnt startup, its just house in the map 
+
 have fun
diff --git a/src/models/apriltag/model.config b/src/models/apriltag/model.config
new file mode 100644
index 0000000..57c9231
--- /dev/null
+++ b/src/models/apriltag/model.config
@@ -0,0 +1,9 @@
+<model> 
+<name>AprilTag 36h11 0</name> 
+<version>1.0</version> 
+<sdf version="1.4">model.sdf</sdf>
+
+<description>
+  April Tag 36h11 tag 0.
+</description>
+</model>
diff --git a/src/models/apriltag/model.sdf b/src/models/apriltag/model.sdf
new file mode 100644
index 0000000..ab8c4b6
--- /dev/null
+++ b/src/models/apriltag/model.sdf
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<sdf version="1.4">
+<model name="apriltag">
+  <static>false</static>
+    <link name="link">
+     <inertial>
+        <mass>20</mass>
+        <pose frame=''>0 0 0 0 -0 0</pose>
+        <inertia>
+          <ixx>1</ixx>
+          <ixy>0</ixy>
+          <ixz>0</ixz>
+          <iyy>1</iyy>
+          <iyz>0</iyz>
+          <izz>1</izz>
+        </inertia>
+      </inertial>
+      <collision name="collision">
+        <geometry>
+          <box>
+            <size>1 1 0.5</size>
+          </box>
+        </geometry>
+        <surface>
+          <friction>
+            <ode>
+              <mu>100</mu>
+              <mu2>50</mu2>
+            </ode>
+          </friction>
+        </surface>
+      </collision>
+      <visual name="visual">
+        <cast_shadows>false</cast_shadows>
+        <geometry>
+        <box>
+            <size>1 1 0.5</size>
+
+          </box>
+        </geometry>
+        <material>
+          <script>
+            <name>AprilTag/Image</name>
+          </script>
+        </material>
+      </visual>
+    </link>
+  </model>
+</sdf>
diff --git a/src/scripts/descend_on_object_server.py b/src/scripts/descend_on_object_server.py
index 64ee160..62c8764 100755
--- a/src/scripts/descend_on_object_server.py
+++ b/src/scripts/descend_on_object_server.py
@@ -2,7 +2,6 @@
 import rospy
 import actionlib
 import simulation_control.msg
-#from apriltags2_ros.msg import AprilTagDetectionArray
 from geometry_msgs.msg import PoseStamped, Point
 from std_msgs.msg import Bool, String
 
diff --git a/src/scripts/detect_object_server.py b/src/scripts/detect_object_server.py
index 5dbf867..b6359a9 100755
--- a/src/scripts/detect_object_server.py
+++ b/src/scripts/detect_object_server.py
@@ -2,7 +2,6 @@
 import rospy
 import actionlib
 import simulation_control.msg
-from apriltags2_ros.msg import AprilTagDetectionArray
 
 from geometry_msgs.msg import PoseStamped, Point
 class detect_object_server():
-- 
GitLab