pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-01 11:25:44 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Change to a different logic

Browse Source
This commit is contained in:
Thomas Göttgens 2022-06-16 20:54:50 +02:00 committed by GitHub
parent 9d8f9613d4
commit 3d3511ceeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.cpp
View File

@ -101,15 +101,14 @@ const char *getDeviceName()
getMacAddr(dmac);
// Meshtastic_ab3c
static char name[30];
// If we have an owner shortname and it is short.
if (owner.short_name != NULL
&& strlen(owner.short_name) >= 2
&& strlen(owner.short_name) < 10) {
sprintf(name, "Meshtastic_%s", owner.short_name);
// Meshtastic_ab3c or Shortname_abcd
static char name[20];
sprintf(name, "%02x%02x", dmac[4], dmac[5]);
// if the shortname exists and is NOT the new default of ab3c, use it for BLE name.
if ((owner.short_name != NULL) && (owner.short_name != name)) {
sprintf(name, "%s_%02x%02x", owner.short_name, dmac[4], dmac[5]);
} else {
sprintf(name, "Meshtastic_%02x%02x", dmac[4], dmac[5]);
sprintf(name, "Meshtastic_%02x%02x", dmac[4], dmac[5]);
}
return name;
}