Merge remote-tracking branch 'ofw/dev' into mntm-dev

applications/services/expansion/expansion.c

@@ -4,6 +4,7 @@
 #include <furi_hal_serial_control.h>
 
 #include <furi.h>
+#include <storage/storage.h>
 #include <toolbox/api_lock.h>
 
 #include "expansion_worker.h"
@@ -25,6 +26,7 @@ typedef enum {
     ExpansionMessageTypeEnable,
     ExpansionMessageTypeDisable,
     ExpansionMessageTypeSetListenSerial,
+    ExpansionMessageTypeReloadSettings,
     ExpansionMessageTypeModuleConnected,
     ExpansionMessageTypeModuleDisconnected,
     ExpansionMessageTypeConnectionEstablished,
@@ -103,7 +105,10 @@ static void
         return;
     }
 
-    if(instance->settings.uart_index < FuriHalSerialIdMax) {
+    ExpansionSettings settings;
+    expansion_settings_load(&settings);
+
+    if(settings.uart_index < FuriHalSerialIdMax) {
         instance->state = ExpansionStateEnabled;
         instance->serial_id = instance->settings.uart_index;
         furi_hal_serial_control_set_expansion_callback(
@@ -116,7 +121,6 @@ static void
 static void
     expansion_control_handler_disable(Expansion* instance, const ExpansionMessageData* data) {
     UNUSED(data);
-
     if(instance->state == ExpansionStateDisabled) {
         return;
     } else if(
@@ -136,10 +140,12 @@ static void
 static void expansion_control_handler_set_listen_serial(
     Expansion* instance,
     const ExpansionMessageData* data) {
-    furi_check(data->serial_id < FuriHalSerialIdMax);
+    if(instance->state != ExpansionStateDisabled && instance->serial_id == data->serial_id) {
+        return;
 
-    if(instance->state == ExpansionStateRunning ||
-       instance->state == ExpansionStateConnectionEstablished) {
+    } else if(
+        instance->state == ExpansionStateRunning ||
+        instance->state == ExpansionStateConnectionEstablished) {
         expansion_worker_stop(instance->worker);
         expansion_worker_free(instance->worker);
 
@@ -156,6 +162,26 @@ static void expansion_control_handler_set_listen_serial(
     FURI_LOG_D(TAG, "Listen serial changed to %s", expansion_uart_names[instance->serial_id]);
 }
 
+static void expansion_control_handler_reload_settings(
+    Expansion* instance,
+    const ExpansionMessageData* data) {
+    UNUSED(data);
+
+    ExpansionSettings settings;
+    expansion_settings_load(&settings);
+
+    if(settings.uart_index < FuriHalSerialIdMax) {
+        const ExpansionMessageData data = {
+            .serial_id = settings.uart_index,
+        };
+
+        expansion_control_handler_set_listen_serial(instance, &data);
+
+    } else {
+        expansion_control_handler_disable(instance, NULL);
+    }
+}
+
 static void expansion_control_handler_module_connected(
     Expansion* instance,
     const ExpansionMessageData* data) {
@@ -211,6 +237,7 @@ static const ExpansionControlHandler expansion_control_handlers[] = {
     [ExpansionMessageTypeEnable] = expansion_control_handler_enable,
     [ExpansionMessageTypeDisable] = expansion_control_handler_disable,
     [ExpansionMessageTypeSetListenSerial] = expansion_control_handler_set_listen_serial,
+    [ExpansionMessageTypeReloadSettings] = expansion_control_handler_reload_settings,
     [ExpansionMessageTypeModuleConnected] = expansion_control_handler_module_connected,
     [ExpansionMessageTypeModuleDisconnected] = expansion_control_handler_module_disconnected,
     [ExpansionMessageTypeConnectionEstablished] = expansion_control_handler_connection_established,
@@ -249,6 +276,22 @@ static Expansion* expansion_alloc(void) {
     return instance;
 }
 
+static void expansion_storage_callback(const void* message, void* context) {
+    furi_assert(context);
+
+    const StorageEvent* event = message;
+    Expansion* instance = context;
+
+    if(event->type == StorageEventTypeCardMount) {
+        ExpansionMessage em = {
+            .type = ExpansionMessageTypeReloadSettings,
+            .api_lock = NULL,
+        };
+
+        furi_check(furi_message_queue_put(instance->queue, &em, FuriWaitForever) == FuriStatusOk);
+    }
+}
+
 void expansion_on_system_start(void* arg) {
     UNUSED(arg);
 
@@ -256,6 +299,14 @@ void expansion_on_system_start(void* arg) {
     furi_record_create(RECORD_EXPANSION, instance);
     furi_thread_start(instance->thread);
 
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    furi_pubsub_subscribe(storage_get_pubsub(storage), expansion_storage_callback, instance);
+
+    if(storage_sd_status(storage) != FSE_OK) {
+        FURI_LOG_D(TAG, "SD Card not ready, skipping settings");
+        return;
+    }
+
     expansion_settings_load(&instance->settings);
     expansion_enable(instance);
 }

applications/services/expansion/expansion_settings.c

@@ -5,25 +5,39 @@
 
 #include "expansion_settings_filename.h"
 
+#define TAG "ExpansionSettings"
+
 #define EXPANSION_SETTINGS_VERSION (0)
 #define EXPANSION_SETTINGS_MAGIC   (0xEA)
 
-bool expansion_settings_load(ExpansionSettings* settings) {
+void expansion_settings_load(ExpansionSettings* settings) {
     furi_assert(settings);
-    return saved_struct_load(
+
+    const bool success = saved_struct_load(
         EXPANSION_SETTINGS_PATH,
         settings,
         sizeof(ExpansionSettings),
         EXPANSION_SETTINGS_MAGIC,
         EXPANSION_SETTINGS_VERSION);
+
+    if(!success) {
+        FURI_LOG_W(TAG, "Failed to load file, using defaults");
+        memset(settings, 0, sizeof(ExpansionSettings));
+        expansion_settings_save(settings);
+    }
 }
 
-bool expansion_settings_save(const ExpansionSettings* settings) {
+void expansion_settings_save(const ExpansionSettings* settings) {
     furi_assert(settings);
-    return saved_struct_save(
+
+    const bool success = saved_struct_save(
         EXPANSION_SETTINGS_PATH,
         settings,
         sizeof(ExpansionSettings),
         EXPANSION_SETTINGS_MAGIC,
         EXPANSION_SETTINGS_VERSION);
+
+    if(!success) {
+        FURI_LOG_E(TAG, "Failed to save file");
+    }
 }

applications/services/expansion/expansion_settings.h

@@ -25,18 +25,16 @@ typedef struct {
 /**
  * @brief Load expansion module support settings from file.
  *
- * @param[out] settings pointer to an ExpansionSettings instance to load settings into.
- * @returns true if the settings were successfully loaded, false otherwise.
+ * @param[in,out] settings pointer to an ExpansionSettings instance to load settings into.
  */
-bool expansion_settings_load(ExpansionSettings* settings);
+void expansion_settings_load(ExpansionSettings* settings);
 
 /**
  * @brief Save expansion module support settings to file.
  *
  * @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(const ExpansionSettings* settings);
+void expansion_settings_save(const ExpansionSettings* settings);
 
 #ifdef __cplusplus
 }