From bbcff4851761765a7013c305c32f872a7944f5f6 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Fri, 26 Jan 2024 23:03:25 +0000
Subject: [PATCH] Default expansion UART listen to off for now

---
 applications/services/expansion/expansion.c      |  5 ++---
 .../services/expansion/expansion_settings.c      | 16 ++++++++++------
 .../expansion_settings_app.c                     |  4 +---
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/applications/services/expansion/expansion.c b/applications/services/expansion/expansion.c
index ca3b71444..ae69db18a 100644
--- a/applications/services/expansion/expansion.c
+++ b/applications/services/expansion/expansion.c
@@ -395,9 +395,8 @@ void expansion_on_system_start(void* arg) {
     furi_record_create(RECORD_EXPANSION, instance);
 
     ExpansionSettings settings = {};
-    if(!expansion_settings_load(&settings)) {
-        expansion_settings_save(&settings);
-    } else if(settings.uart_index < FuriHalSerialIdMax) {
+    expansion_settings_load(&settings);
+    if(settings.uart_index < FuriHalSerialIdMax) {
         expansion_enable(instance, settings.uart_index);
     }
 }
diff --git a/applications/services/expansion/expansion_settings.c b/applications/services/expansion/expansion_settings.c
index 2ac36222d..39bd5fa1f 100644
--- a/applications/services/expansion/expansion_settings.c
+++ b/applications/services/expansion/expansion_settings.c
@@ -2,6 +2,7 @@
 
 #include <storage/storage.h>
 #include <toolbox/saved_struct.h>
+#include <furi_hal_serial.h>
 
 #include "expansion_settings_filename.h"
 
@@ -10,12 +11,15 @@
 
 bool expansion_settings_load(ExpansionSettings* settings) {
     furi_assert(settings);
-    return saved_struct_load(
-        EXPANSION_SETTINGS_PATH,
-        settings,
-        sizeof(ExpansionSettings),
-        EXPANSION_SETTINGS_MAGIC,
-        EXPANSION_SETTINGS_VERSION);
+    if(!saved_struct_load(
+           EXPANSION_SETTINGS_PATH,
+           settings,
+           sizeof(ExpansionSettings),
+           EXPANSION_SETTINGS_MAGIC,
+           EXPANSION_SETTINGS_VERSION)) {
+        settings->uart_index = FuriHalSerialIdMax;
+    }
+    return true;
 }
 
 bool expansion_settings_save(ExpansionSettings* settings) {
diff --git a/applications/settings/expansion_settings_app/expansion_settings_app.c b/applications/settings/expansion_settings_app/expansion_settings_app.c
index 894015712..353fab611 100644
--- a/applications/settings/expansion_settings_app/expansion_settings_app.c
+++ b/applications/settings/expansion_settings_app/expansion_settings_app.c
@@ -27,9 +27,7 @@ static uint32_t expansion_settings_app_exit(void* context) {
 static ExpansionSettingsApp* expansion_settings_app_alloc() {
     ExpansionSettingsApp* app = malloc(sizeof(ExpansionSettingsApp));
 
-    if(!expansion_settings_load(&app->settings)) {
-        expansion_settings_save(&app->settings);
-    }
+    expansion_settings_load(&app->settings);
 
     app->gui = furi_record_open(RECORD_GUI);
     app->expansion = furi_record_open(RECORD_EXPANSION);