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

Default expansion UART listen to off for now

Browse Source
This commit is contained in:
Willy-JL
2024-01-26 23:03:25 +00:00
parent 76f1374436
commit bbcff48517
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/services/expansion/expansion.c
View File

@@ -395,9 +395,8 @@ void expansion_on_system_start(void* arg) {
furi_record_create(RECORD_EXPANSION, instance); furi_record_create(RECORD_EXPANSION, instance);
ExpansionSettings settings = {}; ExpansionSettings settings = {};
if(!expansion_settings_load(&settings)) { expansion_settings_load(&settings);
expansion_settings_save(&settings); if(settings.uart_index < FuriHalSerialIdMax) {
} else if(settings.uart_index < FuriHalSerialIdMax) {
expansion_enable(instance, settings.uart_index); expansion_enable(instance, settings.uart_index);
} }
} }

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

@@ -2,6 +2,7 @@
#include <storage/storage.h> #include <storage/storage.h>
#include <toolbox/saved_struct.h> #include <toolbox/saved_struct.h>
#include <furi_hal_serial.h>
#include "expansion_settings_filename.h" #include "expansion_settings_filename.h"
@@ -10,12 +11,15 @@
bool expansion_settings_load(ExpansionSettings* settings) { bool expansion_settings_load(ExpansionSettings* settings) {
furi_assert(settings); furi_assert(settings);
return saved_struct_load( if(!saved_struct_load(
EXPANSION_SETTINGS_PATH, EXPANSION_SETTINGS_PATH,
settings, settings,
sizeof(ExpansionSettings), sizeof(ExpansionSettings),
EXPANSION_SETTINGS_MAGIC, EXPANSION_SETTINGS_MAGIC,
EXPANSION_SETTINGS_VERSION); EXPANSION_SETTINGS_VERSION)) {
settings->uart_index = FuriHalSerialIdMax;
}
return true;
} }
bool expansion_settings_save(ExpansionSettings* settings) { bool expansion_settings_save(ExpansionSettings* settings) {

4
applications/settings/expansion_settings_app/expansion_settings_app.c
View File

@@ -27,9 +27,7 @@ static uint32_t expansion_settings_app_exit(void* context) {
static ExpansionSettingsApp* expansion_settings_app_alloc() { static ExpansionSettingsApp* expansion_settings_app_alloc() {
ExpansionSettingsApp* app = malloc(sizeof(ExpansionSettingsApp)); ExpansionSettingsApp* app = malloc(sizeof(ExpansionSettingsApp));
if(!expansion_settings_load(&app->settings)) { expansion_settings_load(&app->settings);
expansion_settings_save(&app->settings);
}
app->gui = furi_record_open(RECORD_GUI); app->gui = furi_record_open(RECORD_GUI);
app->expansion = furi_record_open(RECORD_EXPANSION); app->expansion = furi_record_open(RECORD_EXPANSION);