From bff53cd404db9c4c37828cb718245c2c7866c383 Mon Sep 17 00:00:00 2001
From: lr101095 <38200423+lr101095@users.noreply.github.com>
Date: Tue, 10 Jul 2018 09:55:39 +1000
Subject: [PATCH 1/3] suggested change from carlos

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 52157a0..1ba3974 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "ATI_FTSensors"]
 	path = ATI_FTSensors
-	url = ./ATI_FTSensors
+	url = https://github.com/CentroEPiaggio/ATI_FTSensors

From 37b25adb1e2045b28d758d75a0f2cb97c60705e0 Mon Sep 17 00:00:00 2001
From: lr101095 <luke.ramos@student.uts.edu.au>
Date: Tue, 10 Jul 2018 10:14:15 +1000
Subject: [PATCH 2/3] collision to match mesh

---
 model/models.urdf.xacro | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/model/models.urdf.xacro b/model/models.urdf.xacro
index 6132916..f537e19 100644
--- a/model/models.urdf.xacro
+++ b/model/models.urdf.xacro
@@ -38,7 +38,8 @@
 			<collision>
 				<origin xyz="0 0 0.00725" rpy="0 0 0"/>
 				<geometry>
-					<cylinder radius="0.0085" length="0.0145"/>
+<!--					<cylinder radius="0.0085" length="0.0145"/>-->
+					<mesh filename="package://force_torque_sensor/model/meshes/nano17.stl"/>
 				</geometry>
 			</collision>
 	</xacro:property>
@@ -68,4 +69,4 @@
 
 
 
-</robot>
\ No newline at end of file
+</robot>

From 0693f26e7400ca2585498428bb1330d825bc603f Mon Sep 17 00:00:00 2001
From: lr101095 <luke.ramos@student.uts.edu.au>
Date: Tue, 10 Jul 2018 10:27:00 +1000
Subject: [PATCH 3/3] collision amendment

---
 model/models.urdf.xacro | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/model/models.urdf.xacro b/model/models.urdf.xacro
index f537e19..9fbd7c4 100644
--- a/model/models.urdf.xacro
+++ b/model/models.urdf.xacro
@@ -38,8 +38,8 @@
 			<collision>
 				<origin xyz="0 0 0.00725" rpy="0 0 0"/>
 				<geometry>
-<!--					<cylinder radius="0.0085" length="0.0145"/>-->
-					<mesh filename="package://force_torque_sensor/model/meshes/nano17.stl"/>
+					<cylinder radius="0.0085" length="0.0145"/>
+<!--					<mesh filename="package://force_torque_sensor/model/meshes/nano17.stl"/>-->
 				</geometry>
 			</collision>
 	</xacro:property>