Revert some settings handling to how they work in OFW

applications/services/expansion/application.fam

@@ -5,7 +5,6 @@ App(
     cdefines=["SRV_EXPANSION"],
     sdk_headers=[
         "expansion.h",
-        "expansion_i.h",
         "expansion_settings.h",
     ],
     requires=["rpc_start"],

applications/services/expansion/expansion.c

@@ -1,5 +1,4 @@
 #include "expansion.h"
-#include "expansion_i.h"
 
 #include <furi_hal_serial_control.h>
 
@@ -34,10 +33,8 @@ typedef enum {
 } ExpansionMessageType;
 
 typedef union {
-    union {
-        FuriHalSerialId serial_id;
-        bool* is_connected;
-    };
+    FuriHalSerialId serial_id;
+    bool* is_connected;
 } ExpansionMessageData;
 
 typedef struct {
@@ -52,8 +49,6 @@ struct Expansion {
     FuriHalSerialId serial_id;
     ExpansionWorker* worker;
     ExpansionState state;
-
-    ExpansionSettings settings;
 };
 
 static const char* const expansion_uart_names[] = {
@@ -110,7 +105,7 @@ static void
 
     if(settings.uart_index < FuriHalSerialIdMax) {
         instance->state = ExpansionStateEnabled;
-        instance->serial_id = instance->settings.uart_index;
+        instance->serial_id = settings.uart_index;
         furi_hal_serial_control_set_expansion_callback(
             instance->serial_id, expansion_detect_callback, instance);
 
@@ -307,7 +302,6 @@ void expansion_on_system_start(void* arg) {
         return;
     }
 
-    expansion_settings_load(&instance->settings);
     expansion_enable(instance);
 }
 
@@ -366,7 +360,3 @@ void expansion_set_listen_serial(Expansion* instance, FuriHalSerialId serial_id)
     furi_message_queue_put(instance->queue, &message, FuriWaitForever);
     api_lock_wait_unlock_and_free(message.api_lock);
 }
-
-ExpansionSettings* expansion_get_settings(Expansion* instance) {
-    return &instance->settings;
-}

applications/services/expansion/expansion_i.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#include "expansion_settings.h"
-#include "expansion.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-ExpansionSettings* expansion_get_settings(Expansion* instance);
-
-#ifdef __cplusplus
-}
-#endif

applications/services/expansion/expansion_settings_filename.h

@@ -6,4 +6,6 @@
 /**
  * @brief File name used for expansion settings.
  */
-#define EXPANSION_SETTINGS_PATH CFG_PATH("expansion.settings")
+#define EXPANSION_SETTINGS_FILE_NAME ".expansion.settings"
+
+#define EXPANSION_SETTINGS_PATH INT_PATH(EXPANSION_SETTINGS_FILE_NAME)