From 7b95403f9a3b2f1bffe559e81ab30d61f1a89725 Mon Sep 17 00:00:00 2001
From: GabHoo <56197287+GabHoo@users.noreply.github.com>
Date: Tue, 26 Jan 2021 19:20:49 +0100
Subject: [PATCH 1/2] Update and rename GabHoo_camera_settings.yaml to
 P20_camera_settings.yaml

---
 .../{GabHoo_camera_settings.yaml => P20_camera_settings.yaml} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename slam_method/Settings/{GabHoo_camera_settings.yaml => P20_camera_settings.yaml} (92%)

diff --git a/slam_method/Settings/GabHoo_camera_settings.yaml b/slam_method/Settings/P20_camera_settings.yaml
similarity index 92%
rename from slam_method/Settings/GabHoo_camera_settings.yaml
rename to slam_method/Settings/P20_camera_settings.yaml
index b75b340..e321a19 100644
--- a/slam_method/Settings/GabHoo_camera_settings.yaml
+++ b/slam_method/Settings/P20_camera_settings.yaml
@@ -1,7 +1,7 @@
 %YAML:1.0
 
 #--------------------------------------------------------------------------------------------
-# Camera Parameters. Adjust them!
+# Camera Parameters. This settings refer to a Huawei P20 lite main camera, manually calibrated with opencv [resolution fixed to 720x1280]
 #--------------------------------------------------------------------------------------------
 Camera.type: "PinHole"
 
@@ -26,7 +26,7 @@ Camera.RGB: 1
 
 # Camera resolution
 Camera.width: 720
-Camera.height: 1282
+Camera.height: 1280
 
 #--------------------------------------------------------------------------------------------
 # ORB Parameters

From 590adb6773bf80b32bb41053adaa47c29f172654 Mon Sep 17 00:00:00 2001
From: GabHoo <56197287+GabHoo@users.noreply.github.com>
Date: Tue, 26 Jan 2021 19:35:08 +0100
Subject: [PATCH 2/2] Update utils.py

---
 utils.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/utils.py b/utils.py
index e13ab33..8e842f4 100644
--- a/utils.py
+++ b/utils.py
@@ -232,11 +232,7 @@ def save_pose_txt(args, name, pose):
     """
     pose_file_path = os.path.join(args.dest, "pose.txt")
     fp = open(pose_file_path, "a")
-    pose34 = pose[:3] 
-<<<<<<< HEAD
-=======
 
->>>>>>> 1b77b035e07f95e8d286dcf23192f7103c139f23
     fp.write(name)
     for row in pose34:
         fp.write(" ")