From 89f3eade151223f712e750cb99cfa2b3f1337a26 Mon Sep 17 00:00:00 2001
From: madeofstown <madeofstown@rndmm.us>
Date: Tue, 19 Aug 2025 17:12:40 -0700
Subject: [PATCH 1/7] re-add meshtastic/python submodule

---
 .gitmodules | 3 +++
 python      | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 python

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..92ee613
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "python"]
+	path = python
+	url = https://github.com/meshtastic/python.git
diff --git a/python b/python
new file mode 160000
index 0000000..d53ced2
--- /dev/null
+++ b/python
@@ -0,0 +1 @@
+Subproject commit d53ced216c429ee88b3324b24cbc0c2b83069f84

From 9ceca0eea97f2a1c66a2407f97d34c4c246308a7 Mon Sep 17 00:00:00 2001
From: madeofstown <33820964+madeofstown@users.noreply.github.com>
Date: Tue, 19 Aug 2025 17:31:36 -0700
Subject: [PATCH 2/7] Update .gitmodules

---
 .gitmodules | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitmodules b/.gitmodules
index 92ee613..edd56c2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "python"]
 	path = python
 	url = https://github.com/meshtastic/python.git
+
+[submodule "protobufs"]
+	path = python/protobufs
+	url = http://github.com/meshtastic/protobufs

From 954d6300dea244a5cc9c713ed3176bdca3b0715a Mon Sep 17 00:00:00 2001
From: madeofstown <33820964+madeofstown@users.noreply.github.com>
Date: Tue, 19 Aug 2025 17:35:26 -0700
Subject: [PATCH 3/7] Update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 6a77d3e..2832c4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ packets.db
 /table_details.py
 config.ini
 screenshots/*
+python/nanopb

From fb70f644e5325fa1776d95d62355d95e2caa30f7 Mon Sep 17 00:00:00 2001
From: madeofstown <33820964+madeofstown@users.noreply.github.com>
Date: Tue, 19 Aug 2025 19:08:38 -0700
Subject: [PATCH 4/7] Update README.md

Change install procedure to mitigate broken submodule
---
 README.md | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 52f1c1c..571b281 100644
--- a/README.md
+++ b/README.md
@@ -52,16 +52,23 @@ Requires **`python3.11`** or above.
 Clone the repo from GitHub:
 
 ```bash
-git clone --recurse-submodules https://github.com/pablorevilla-meshtastic/meshview.git
+git clone https://github.com/pablorevilla-meshtastic/meshview.git
 ```
 
 > **NOTE**  
-> It is important to include the `--recurse-submodules` flag or the meshtastic protobufs won't be included.
+> DO NOT include the `--recurse-submodules` flag! There appears to be a broken submodule in the meshtastic/python repo.
 
-Create a Python virtual environment:
+Initialize submodule (non-recursively) and create symlink:
 
 ```bash
 cd meshview
+git submodule update --init
+ln -s python/meshtastic/protobuf meshtastic/protobuf
+```
+Create a Python virtual environment:
+
+from the meshview directory...
+```bash
 python3 -m venv env
 ```
 

From 572e79c9acc8be4cfb1aff81edcb87a9a3497752 Mon Sep 17 00:00:00 2001
From: madeofstown <33820964+madeofstown@users.noreply.github.com>
Date: Tue, 19 Aug 2025 19:10:46 -0700
Subject: [PATCH 5/7] Update .gitmodules

---
 .gitmodules | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index edd56c2..92ee613 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
 [submodule "python"]
 	path = python
 	url = https://github.com/meshtastic/python.git
-
-[submodule "protobufs"]
-	path = python/protobufs
-	url = http://github.com/meshtastic/protobufs

From e3f5c0f00649318992aa6ce9ab521c6565be6c2c Mon Sep 17 00:00:00 2001
From: madeofstown <33820964+madeofstown@users.noreply.github.com>
Date: Tue, 19 Aug 2025 19:14:48 -0700
Subject: [PATCH 6/7] Delete meshtastic/protobuf

---
 meshtastic/protobuf | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 meshtastic/protobuf

diff --git a/meshtastic/protobuf b/meshtastic/protobuf
deleted file mode 120000
index b1a1c6f..0000000
--- a/meshtastic/protobuf
+++ /dev/null
@@ -1 +0,0 @@
-../python/meshtastic/protobuf

From 7e3076c0e286ed7cc98dd515bee0cb66d33734ef Mon Sep 17 00:00:00 2001
From: madeofstown <33820964+madeofstown@users.noreply.github.com>
Date: Tue, 19 Aug 2025 19:24:58 -0700
Subject: [PATCH 7/7] Update README.md

symlink target is relative to link location
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 571b281..4aa07c3 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ Initialize submodule (non-recursively) and create symlink:
 ```bash
 cd meshview
 git submodule update --init
-ln -s python/meshtastic/protobuf meshtastic/protobuf
+ln -s ../python/meshtastic/protobuf meshtastic/protobuf
 ```
 Create a Python virtual environment: