From 90f8874a31ef2b4843210d507785c420df74ea6b Mon Sep 17 00:00:00 2001 From: Chris Davis Date: Tue, 18 Nov 2025 14:12:09 -0800 Subject: [PATCH 1/2] Added battery voltage as feature 1 Added board's battery voltage as feature 1 in AdvertDataBuilder --- src/helpers/CommonCLI.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp index 93773ccee..e3751ea47 100644 --- a/src/helpers/CommonCLI.cpp +++ b/src/helpers/CommonCLI.cpp @@ -164,16 +164,20 @@ void CommonCLI::savePrefs() { } uint8_t CommonCLI::buildAdvertData(uint8_t node_type, uint8_t* app_data) { - if (_prefs->advert_loc_policy == ADVERT_LOC_NONE) { - AdvertDataBuilder builder(node_type, _prefs->node_name); - return builder.encodeTo(app_data); - } else if (_prefs->advert_loc_policy == ADVERT_LOC_SHARE) { - AdvertDataBuilder builder(node_type, _prefs->node_name, _sensors->node_lat, _sensors->node_lon); - return builder.encodeTo(app_data); - } else { - AdvertDataBuilder builder(node_type, _prefs->node_name, _prefs->node_lat, _prefs->node_lon); - return builder.encodeTo(app_data); + AdvertDataBuilder builder(node_type, _prefs->node_name); + + if (_prefs->advert_loc_policy == ADVERT_LOC_SHARE) { + builder = AdvertDataBuilder(node_type, _prefs->node_name, _sensors->node_lat, _sensors->node_lon); + } else if (_prefs->advert_loc_policy == ADVERT_LOC_PREFS) { + builder = AdvertDataBuilder(node_type, _prefs->node_name, _prefs->node_lat, _prefs->node_lon); + } + + uint16_t batt_mv = _board->getBattMilliVolts(); + if (batt_mv > 0) { + builder.setFeat1(batt_mv); } + + return builder.encodeTo(app_data); } void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, char* reply) { From 3858c378662b05ef37f994a0632ecf064dded153 Mon Sep 17 00:00:00 2001 From: Chris Davis Date: Thu, 20 Nov 2025 22:31:27 -0800 Subject: [PATCH 2/2] Modify buildAdvertData to include location parameters --- src/helpers/CommonCLI.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp index e3751ea47..5c8e6ee8b 100644 --- a/src/helpers/CommonCLI.cpp +++ b/src/helpers/CommonCLI.cpp @@ -164,12 +164,12 @@ void CommonCLI::savePrefs() { } uint8_t CommonCLI::buildAdvertData(uint8_t node_type, uint8_t* app_data) { - AdvertDataBuilder builder(node_type, _prefs->node_name); + AdvertDataBuilder builder(node_type, _prefs->node_name, _prefs->node_lat, _prefs->node_lon); - if (_prefs->advert_loc_policy == ADVERT_LOC_SHARE) { + if (_prefs->advert_loc_policy == ADVERT_LOC_NONE) { + builder = AdvertDataBuilder(node_type, _prefs->node_name); + } else if (_prefs->advert_loc_policy == ADVERT_LOC_SHARE) { builder = AdvertDataBuilder(node_type, _prefs->node_name, _sensors->node_lat, _sensors->node_lon); - } else if (_prefs->advert_loc_policy == ADVERT_LOC_PREFS) { - builder = AdvertDataBuilder(node_type, _prefs->node_name, _prefs->node_lat, _prefs->node_lon); } uint16_t batt_mv = _board->getBattMilliVolts();