From d2e90a93c91c371f7b074c848f83128b0851ac66 Mon Sep 17 00:00:00 2001
From: Chiyu Chen <chiyu1468@hotmail.com>
Date: Mon, 1 Dec 2025 21:15:57 +0800
Subject: [PATCH] Fix geographic_info branch to ros2

---
 .gitmodules                  |  7 ++++---
 README.md                    | 13 ++++++++-----
 src/external/geographic_info |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 6630485..1742bc8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,7 @@
-[submodule "src/external/geographic_info"]
-	path = src/external/geographic_info
-	url = https://github.com/ros-geographic-info/geographic_info.git
 [submodule "src/external/angles"]
 	path = src/external/angles
 	url = https://github.com/ros/angles.git
+[submodule "src/external/geographic_info"]
+	path = src/external/geographic_info
+	url = https://github.com/ros-geographic-info/geographic_info.git
+	branch = ros2
diff --git a/README.md b/README.md
index 4f9dff7..1cbbf37 100644
--- a/README.md
+++ b/README.md
@@ -7,12 +7,14 @@
 
 
 ===
-必要相依套件
+必要相依套件 順便記錄我開發時的環境版本
 
 Python
-1. pymavlink
+1. pymavlink -> Version: 2.4.42
 2. conda-forge 中的 pyserial-asyncio
-3. 
+3. importlib_metadata -> Version: 8.5.0
+4. setuptools -> Version: 58.2.0 (版本太新不行)
+
 
 ROS2
 1. source ~/ros2_humble/install/setup.bash
@@ -25,7 +27,7 @@ ROS2
 
 ===
 依賴的 ROS 庫
-1. https://github.com/ros-geographic-info/geographic_info.git
+1. https://github.com/ros-geographic-info/geographic_info.git 記得要搞 ros2 版本的
 2. https://github.com/ros/angles.git
 3. mavros_msgs 是 https://github.com/mavlink/mavros 這個專案中的一個資料夾 這邊手動複製的
 
@@ -36,7 +38,8 @@ cd ~/AirTrapMine
 git submodule init
 git submodule update
 # 2. build 需要的 package
-colcon build --packages-select angles geographic_msgs mavros_msgs
+colcon build --packages-select angles geographic_msgs
+colcon build --packages-select mavros_msgs # 這個依賴前面的
 ```
 
 
diff --git a/src/external/geographic_info b/src/external/geographic_info
index bc73c05..24806ad 160000
--- a/src/external/geographic_info
+++ b/src/external/geographic_info
@@ -1 +1 @@
-Subproject commit bc73c05ee79c31a88b4a23b545a2fe55eae8089e
+Subproject commit 24806adc767414eb3a34a58aefeb648ee415b09a