Skip to content

Honour advert location policy in builds without GPS #3391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jbrazio wants to merge 1 commit into
base: dev
Choose a base branch
from
+11 −0
Open

Honour advert location policy in builds without GPS #3391

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/helpers/CommonCLI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ void CommonCLI::savePrefs() {
}

uint8_t CommonCLI::buildAdvertData(uint8_t node_type, uint8_t* app_data) {
#if ENV_INCLUDE_GPS == 1
if (_prefs->advert_loc_policy == ADVERT_LOC_NONE) {
AdvertDataBuilder builder(node_type, _prefs->node_name);
return builder.encodeTo(app_data);
Expand All @@ -178,6 +179,16 @@ uint8_t CommonCLI::buildAdvertData(uint8_t node_type, uint8_t* app_data) {
AdvertDataBuilder builder(node_type, _prefs->node_name, _prefs->node_lat, _prefs->node_lon);

@oltaco oltaco Sep 14, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you dropped the else and moved the guard to here I think it would achieve the same outcome but you could drop the duplicated if (_prefs->advert_loc_policy == ADVERT_LOC_NONE) branch in the #else below?

return builder.encodeTo(app_data);
}
#else
// No GPS support: sensed coordinates are never populated, so honour
// ADVERT_LOC_NONE and otherwise fall back to the configured position.
if (_prefs->advert_loc_policy == ADVERT_LOC_NONE) {
AdvertDataBuilder builder(node_type, _prefs->node_name);
return builder.encodeTo(app_data);
}
AdvertDataBuilder builder(node_type, _prefs->node_name, _prefs->node_lat, _prefs->node_lon);
return builder.encodeTo(app_data);
#endif
}

void CommonCLI::handleCommand(uint32_t sender_timestamp, char* command, char* reply) {
Expand Down