benkyd/meshtastic-firmware
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

If the phone writes our user settings, only broadcast if actually changed

Browse Source
This commit is contained in:
geeksville
2020-02-16 18:14:04 -08:00
parent f34c29a323
commit 5c0b20e43c
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/MeshBluetoothService.cpp
View File

@@ -116,14 +116,26 @@ public:
static User o; // if the phone doesn't set ID we are careful to keep ours, we also always keep our macaddr
if (writeToDest(c, &o))
{
if (*o.long_name)
strcpy(owner.long_name, o.long_name);
if (*o.short_name)
strcpy(owner.short_name, o.short_name);
if (*o.id)
strcpy(owner.id, o.id);
int changed = 0;
service.reloadOwner();
if (*o.long_name)
{
changed |= strcmp(owner.long_name, o.long_name);
strcpy(owner.long_name, o.long_name);
}
if (*o.short_name)
{
changed |= strcmp(owner.short_name, o.short_name);
strcpy(owner.short_name, o.short_name);
}
if (*o.id)
{
changed |= strcmp(owner.id, o.id);
strcpy(owner.id, o.id);
}
if (changed) // If nothing really changed, don't broadcast on the network or write to flash
service.reloadOwner();
}
}
};