Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-09 05:49:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'OFW/dev' into dev

Browse Source
This commit is contained in:
MX
2024-03-25 23:20:10 +03:00
parent fda8370255 8ec1c74baf
commit ae84992f25
14 changed files with 184 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
applications/services/bt/bt_service/bt_keys_storage.c
View File

@@ -72,16 +72,19 @@ bool bt_keys_storage_load(BtKeysStorage* instance) {
bool loaded = false;
do {
// Get payload size
uint8_t magic = 0, version = 0;
size_t payload_size = 0;
if(!saved_struct_get_payload_size(
furi_string_get_cstr(instance->file_path),
BT_KEYS_STORAGE_MAGIC,
BT_KEYS_STORAGE_VERSION,
&payload_size)) {
if(!saved_struct_get_metadata(
furi_string_get_cstr(instance->file_path), &magic, &version, &payload_size)) {
FURI_LOG_E(TAG, "Failed to read payload size");
break;
}
if(magic != BT_KEYS_STORAGE_MAGIC || version != BT_KEYS_STORAGE_VERSION) {
FURI_LOG_E(TAG, "Saved data version is mismatched");
break;
}
if(payload_size > instance->nvm_sram_buff_size) {
FURI_LOG_E(TAG, "Saved data doesn't fit ram buffer");
break;

2
applications/services/bt/bt_settings.c
View File

@@ -15,7 +15,7 @@ bool bt_settings_load(BtSettings* bt_settings) {
BT_SETTINGS_PATH, bt_settings, sizeof(BtSettings), BT_SETTINGS_MAGIC, BT_SETTINGS_VERSION);
}
bool bt_settings_save(BtSettings* bt_settings) {
bool bt_settings_save(const BtSettings* bt_settings) {
furi_assert(bt_settings);
return saved_struct_save(

2
applications/services/bt/bt_settings.h
View File

@@ -15,7 +15,7 @@ typedef struct {
bool bt_settings_load(BtSettings* bt_settings);
bool bt_settings_save(BtSettings* bt_settings);
bool bt_settings_save(const BtSettings* bt_settings);
#ifdef __cplusplus
}

2
applications/services/expansion/expansion_settings.c
View File

@@ -23,7 +23,7 @@ bool expansion_settings_load(ExpansionSettings* settings) {
return true;
}
bool expansion_settings_save(ExpansionSettings* settings) {
bool expansion_settings_save(const ExpansionSettings* settings) {
furi_assert(settings);
return saved_struct_save(
EXPANSION_SETTINGS_PATH,

2
applications/services/expansion/expansion_settings.h
View File

@@ -36,7 +36,7 @@ bool expansion_settings_load(ExpansionSettings* settings);
* @param[in] settings pointer to an ExpansionSettings instance to save settings from.
* @returns true if the settings were successfully saved, false otherwise.
*/
bool expansion_settings_save(ExpansionSettings* settings);
bool expansion_settings_save(const ExpansionSettings* settings);
#ifdef __cplusplus
}