From bd9076b7401aed73b1810e746fbb1aed30ba8649 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Tue, 7 Oct 2025 06:14:35 -0500 Subject: [PATCH 1/2] Remove risky change --- src/modules/NodeInfoModule.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/NodeInfoModule.cpp b/src/modules/NodeInfoModule.cpp index 9b94b3933..aaab019d6 100644 --- a/src/modules/NodeInfoModule.cpp +++ b/src/modules/NodeInfoModule.cpp @@ -113,8 +113,12 @@ meshtastic_MeshPacket *NodeInfoModule::allocReply() u.public_key.size = 0; } - // Clear the user.id field since it should be derived from node number on the receiving end - u.id[0] = '\0'; + // FIXME: Clear the user.id field since it should be derived from node number on the receiving end + // u.id[0] = '\0'; + + // Ensure our user.id is derived correctly + strcpy(u.id, nodeDB->getNodeId().c_str()); + LOG_INFO("Send owner %s/%s/%s", u.id, u.long_name, u.short_name); lastSentToMesh = millis(); return allocDataProtobuf(u); From 74e6723ad90f1211421f7b8d6b5be62405eb0a7d Mon Sep 17 00:00:00 2001 From: Austin Date: Tue, 7 Oct 2025 14:14:19 -0400 Subject: [PATCH 2/2] Force coverage tests to run in simulation mode (#8251) * Force coverage tests to run in simulation mode * Revert "Force coverage tests to run in simulation mode" This reverts commit e4ec719e6f888c47ee3a1cc78afd2b96d5f196d1. * Force coverage tests to run in simulation mode --------- Co-authored-by: Ben Meadors --- variants/native/portduino/platformio.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/variants/native/portduino/platformio.ini b/variants/native/portduino/platformio.ini index 2ccdfbbfc..4e6a592de 100644 --- a/variants/native/portduino/platformio.ini +++ b/variants/native/portduino/platformio.ini @@ -107,3 +107,7 @@ build_src_filter = ${env:native-tft.build_src_filter} [env:coverage] extends = env:native build_flags = -lgcov --coverage -fprofile-abs-path -fsanitize=address ${env:native.build_flags} +; https://docs.platformio.org/en/latest/projectconf/sections/env/options/test/test_testing_command.html +test_testing_command = + ${platformio.build_dir}/${this.__env__}/program + -s