From d765bd99ca21e7915a1f9f68830989ec545ccec2 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Tue, 11 Aug 2026 12:28:25 -0700
Subject: [PATCH] Fix the all-zero MAC address for own node (#11409)

* Fix the all-zero MAC address for own node

* Increment native suite count from 46 to 47

* Fix condition for copying MAC address in PhoneAPI
---
 src/mesh/PhoneAPI.cpp   | 3 +++
 test/native-suite-count | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/mesh/PhoneAPI.cpp b/src/mesh/PhoneAPI.cpp
index 28d35d00f..696c370fa 100644
--- a/src/mesh/PhoneAPI.cpp
+++ b/src/mesh/PhoneAPI.cpp
@@ -615,6 +615,9 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
             auto info = TypeConversions::ConvertToNodeInfo(us);
             info.has_hops_away = false;
             info.is_favorite = true;
+            // NodeInfoLite dropped macaddr, so ConvertToUser() zero-fills it.
+            if (info.has_user)
+                memcpy(info.user.macaddr, owner.macaddr, sizeof(info.user.macaddr));
             {
                 concurrency::LockGuard guard(&nodeInfoMutex);
                 nodeInfoForPhone = info;
diff --git a/test/native-suite-count b/test/native-suite-count
index 9e5feb525..abac1ea7b 100644
--- a/test/native-suite-count
+++ b/test/native-suite-count
@@ -1 +1 @@
-46
+47