pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-25 09:42:35 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

never let phone override macadddr, only override fields the phone has set

Browse Source
This commit is contained in:
geeksville 2020-02-14 04:32:08 -08:00
parent a7b5da5dd2
commit e16d5c7e39
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/MeshBluetoothService.cpp
View File

@ -36,14 +36,20 @@ public:
} }
void onWrite(BLECharacteristic *c) void onWrite(BLECharacteristic *c)
{
writeToDest(c, my_struct);
}
protected:
/// like onWrite, but we provide an different destination to write to, for use by subclasses that
/// want to optionally ignore parts of writes.
/// returns true for success
bool writeToDest(BLECharacteristic *c, void *dest)
{ {
// dumpCharacteristic(pCharacteristic); // dumpCharacteristic(pCharacteristic);
DEBUG_MSG("Got on proto write\n"); DEBUG_MSG("Got on proto write\n");
std::string src = c->getValue(); std::string src = c->getValue();
if (pb_decode_from_bytes((const uint8_t *)src.c_str(), src.length(), fields, my_struct)) return pb_decode_from_bytes((const uint8_t *)src.c_str(), src.length(), fields, dest);
{
// Success, the bytes are now in our struct - do nothing else
}
} }
}; };
@ -107,8 +113,18 @@ public:
void onWrite(BLECharacteristic *c) void onWrite(BLECharacteristic *c)
{ {
ProtobufCharacteristic::onWrite(c); static User o; // if the phone doesn't set ID we are careful to keep ours, we also always keep our macaddr
service.reloadOwner(); 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);
service.reloadOwner();
}
} }
}; };