From da69d8879045bde87dd1600510fea9726498a4c2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 28 May 2025 06:20:51 -0500
Subject: [PATCH 1/2] [create-pull-request] automated change (#6909)

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
---
 protobufs                               | 2 +-
 src/mesh/generated/meshtastic/mesh.pb.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/protobufs b/protobufs
index 022ea79ba..24c7a3d28 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 022ea79bad79b70d0bee286cd9184916ab47c1b1
+Subproject commit 24c7a3d287a4bd269ce191827e5dabd8ce8f57a7
diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h
index c1ec607d6..5fc1cc4f5 100644
--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/src/mesh/generated/meshtastic/mesh.pb.h
@@ -252,10 +252,10 @@ typedef enum _meshtastic_HardwareModel {
     meshtastic_HardwareModel_LINK_32 = 98,
     /* *
  Seeed Tracker L1 */
-    meshtastic_HardwareModel_SEEED_TRACKER_L1 = 99,
+    meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1 = 99,
     /* *
  Seeed Tracker L1 EINK driver */
-    meshtastic_HardwareModel_SEEED_TRACKER_L1_EINK = 100,
+    meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1_EINK = 100,
     /* Reserved ID for future and past use */
     meshtastic_HardwareModel_QWANTZ_TINY_ARMS = 101,
     /* ------------------------------------------------------------------------------------------------------------------------------------------

From 42a80d8aeda556df7f30ec67a612273e48241502 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Wed, 28 May 2025 11:30:59 -0500
Subject: [PATCH 2/2] Coerce user.id to always be derive from the nodenum
 (#6906)

* Coerce user.id to always be derive from the nodenum

* Additionally null it out on send

* Revert "Additionally null it out on send"

This reverts commit 22a2d687237d9f49024bfb8641043cc8e99b32f0.
---
 src/modules/NodeInfoModule.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/modules/NodeInfoModule.cpp b/src/modules/NodeInfoModule.cpp
index 5142f2db0..e072fcb0f 100644
--- a/src/modules/NodeInfoModule.cpp
+++ b/src/modules/NodeInfoModule.cpp
@@ -14,6 +14,9 @@ bool NodeInfoModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
 {
     auto p = *pptr;
 
+    // Coerce user.id to be derived from the node number
+    snprintf(p.id, sizeof(p.id), "!%08x", getFrom(&mp));
+
     bool hasChanged = nodeDB->updateUser(getFrom(&mp), p, mp.channel);
 
     bool wasBroadcast = isBroadcast(mp.to);