Add configurable Companion Bluetooth addresses
This commit is contained in:
1 parent
b25005f52f
commit
4b400ea56b
26 files changed
+2723
-1966
No files matched your search
@@ -602,6 +602,9 @@ bool DataStore::loadPrefsInt(const char *filename,
|
||||
159 + sizeof(loaded_prefs.bluetooth_name),
|
||||
161 + sizeof(loaded_prefs.bluetooth_name),
|
||||
168 + sizeof(loaded_prefs.bluetooth_name),
|
||||
168 + sizeof(loaded_prefs.bluetooth_name)
|
||||
+ sizeof(loaded_prefs.bluetooth_mac_mode)
|
||||
+ sizeof(loaded_prefs.bluetooth_mac),
|
||||
};
|
||||
const uint32_t prefs_size = file.size();
|
||||
bool known_size = false;
|
||||
@@ -706,6 +709,10 @@ bool DataStore::loadPrefsInt(const char *filename,
|
||||
sizeof(loaded_prefs.cad_retry_delay_ms)); // 196
|
||||
readOptionalField(&loaded_prefs.cad_max_duration_ms,
|
||||
sizeof(loaded_prefs.cad_max_duration_ms)); // 198
|
||||
readOptionalField(&loaded_prefs.bluetooth_mac_mode,
|
||||
sizeof(loaded_prefs.bluetooth_mac_mode)); // 200
|
||||
readOptionalField(loaded_prefs.bluetooth_mac,
|
||||
sizeof(loaded_prefs.bluetooth_mac)); // 201
|
||||
|
||||
// Any bytes left over form only part of a historically appended field.
|
||||
// Preserve the file and defaults rather than treating that tail as EOF.
|
||||
@@ -805,6 +812,11 @@ bool DataStore::savePrefs(const CompanionNodePrefs& _prefs, double node_lat, dou
|
||||
success = success && file.write((uint8_t *)&_prefs.cad_max_duration_ms,
|
||||
sizeof(_prefs.cad_max_duration_ms))
|
||||
== sizeof(_prefs.cad_max_duration_ms);
|
||||
success = success && file.write((uint8_t *)&_prefs.bluetooth_mac_mode,
|
||||
sizeof(_prefs.bluetooth_mac_mode))
|
||||
== sizeof(_prefs.bluetooth_mac_mode);
|
||||
success = success && file.write((uint8_t *)_prefs.bluetooth_mac,
|
||||
sizeof(_prefs.bluetooth_mac)) == sizeof(_prefs.bluetooth_mac);
|
||||
|
||||
#if defined(NRF52_PLATFORM)
|
||||
success = file.commit(success);
|
||||
|
||||
Reference in new issue
Block a user