Skip to content

make BLE device name and SSID the same #77

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
BluemarkInnovations wants to merge 1 commit into
base: master
Choose a base branch
from
Open

make BLE device name and SSID the same #77

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
19 changes: 13 additions & 6 deletions RemoteIDModule/parameters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,8 @@ void Parameters::load_defaults(void)
}
}

#define IMIN(a,b) ((a)<(b)?(a):(b))

void Parameters::init(void)
{
load_defaults();
Expand Down Expand Up @@ -339,13 +341,18 @@ void Parameters::init(void)
}
}
}

//fall back options for ssid. If the uas_id is not set, use the 4 chars from the MAC address instead
if (strlen(g.wifi_ssid) == 0) {
uint8_t mac[6] {};
esp_read_mac(mac, ESP_MAC_WIFI_STA);
snprintf(wifi_ssid, 20, "RID_%02x%02x%02x%02x%02x%02x",
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);

if (strlen(g.uas_id) == 0) {
uint8_t mac[6] {};
esp_read_mac(mac, ESP_MAC_WIFI_STA);
snprintf(wifi_ssid, 20, "RID_02x%02x",
mac[4], mac[5]);
} else {
const uint8_t ID_len = strlen(g.uas_id);
const uint8_t ID_tail = IMIN(4, ID_len);
snprintf(wifi_ssid, 20, "RID_%s", &g.uas_id[ID_len-ID_tail]);
}
}
if (g.to_factory_defaults == 1) {
//should not happen, but in case the parameter is still set to 1, erase flash and reboot
Expand Down