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

applications/services/dolphin/dolphin.c

@@ -1,6 +1,7 @@
 #include "dolphin_i.h"
 
 #include <furi_hal.h>
+#include <storage/storage.h>
 #include <momentum/momentum.h>
 
 #define TAG "Dolphin"
@@ -226,6 +227,10 @@ static bool dolphin_process_event(FuriMessageQueue* queue, void* context) {
         dolphin_state_increase_level(dolphin->state);
         furi_event_loop_timer_start(dolphin->flush_timer, FLUSH_TIMEOUT_TICKS);
 
+    } else if(event.type == DolphinEventTypeReloadState) {
+        dolphin_state_load(dolphin->state);
+        furi_event_loop_timer_start(dolphin->butthurt_timer, BUTTHURT_INCREASE_PERIOD_TICKS);
+
     } else {
         furi_crash();
     }
@@ -235,6 +240,32 @@ static bool dolphin_process_event(FuriMessageQueue* queue, void* context) {
     return true;
 }
 
+static void dolphin_storage_callback(const void* message, void* context) {
+    furi_assert(context);
+    Dolphin* dolphin = context;
+    const StorageEvent* event = message;
+
+    if(event->type == StorageEventTypeCardMount) {
+        DolphinEvent event = {
+            .type = DolphinEventTypeReloadState,
+        };
+
+        dolphin_event_send_async(dolphin, &event);
+    }
+}
+
+static void dolphin_init_state(Dolphin* dolphin) {
+    Storage* storage = furi_record_open(RECORD_STORAGE);
+    furi_pubsub_subscribe(storage_get_pubsub(storage), dolphin_storage_callback, dolphin);
+
+    if(storage_sd_status(storage) != FSE_OK) {
+        FURI_LOG_D(TAG, "SD Card not ready, skipping state");
+        return;
+    }
+
+    dolphin_state_load(dolphin->state);
+}
+
 // Application thread
 
 int32_t dolphin_srv(void* p) {
@@ -250,7 +281,7 @@ int32_t dolphin_srv(void* p) {
     Dolphin* dolphin = dolphin_alloc();
     furi_record_create(RECORD_DOLPHIN, dolphin);
 
-    dolphin_state_load(dolphin->state);
+    dolphin_init_state(dolphin);
 
     furi_event_loop_message_queue_subscribe(
         dolphin->event_loop,

applications/services/dolphin/dolphin_i.h

@@ -12,6 +12,7 @@ typedef enum {
     DolphinEventTypeStats,
     DolphinEventTypeFlush,
     DolphinEventTypeLevel,
+    DolphinEventTypeReloadState,
 } DolphinEventType;
 
 typedef struct {

applications/services/dolphin/helpers/dolphin_state.c

@@ -1,10 +1,10 @@
 #include "dolphin_state.h"
-#include "dolphin/helpers/dolphin_deed.h"
+#include "dolphin_state_filename.h"
 
-#include <stdint.h>
-#include <storage/storage.h>
 #include <furi.h>
 #include <furi_hal.h>
+
+#include <storage/storage.h>
 #include <toolbox/saved_struct.h>
 
 #define TAG "DolphinState"
@@ -25,29 +25,28 @@ void dolphin_state_free(DolphinState* dolphin_state) {
     free(dolphin_state);
 }
 
-bool dolphin_state_save(DolphinState* dolphin_state) {
+void dolphin_state_save(DolphinState* dolphin_state) {
     if(!dolphin_state->dirty) {
-        return true;
+        return;
     }
 
-    bool result = saved_struct_save(
+    bool success = saved_struct_save(
         DOLPHIN_STATE_PATH,
         &dolphin_state->data,
         sizeof(DolphinStoreData),
         DOLPHIN_STATE_HEADER_MAGIC,
         DOLPHIN_STATE_HEADER_VERSION);
 
-    if(result) {
+    if(success) {
         FURI_LOG_I(TAG, "State saved");
         dolphin_state->dirty = false;
+
     } else {
         FURI_LOG_E(TAG, "Failed to save state");
     }
-
-    return result;
 }
 
-bool dolphin_state_load(DolphinState* dolphin_state) {
+void dolphin_state_load(DolphinState* dolphin_state) {
     bool success = saved_struct_load(
         DOLPHIN_STATE_PATH,
         &dolphin_state->data,
@@ -63,12 +62,12 @@ bool dolphin_state_load(DolphinState* dolphin_state) {
     }
 
     if(!success) {
-        FURI_LOG_W(TAG, "Reset dolphin-state");
-        memset(dolphin_state, 0, sizeof(*dolphin_state));
-        dolphin_state->dirty = true;
-    }
+        FURI_LOG_W(TAG, "Reset Dolphin state");
+        memset(dolphin_state, 0, sizeof(DolphinState));
 
-    return success;
+        dolphin_state->dirty = true;
+        dolphin_state_save(dolphin_state);
+    }
 }
 
 uint64_t dolphin_state_timestamp(void) {

applications/services/dolphin/helpers/dolphin_state.h

@@ -1,21 +1,9 @@
 #pragma once
 
-#include "dolphin_deed.h"
 #include <stdbool.h>
 #include <stdint.h>
-#include <stddef.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define DOLPHIN_STATE_PATH CFG_PATH("dolphin.state")
-
-extern const uint32_t DOLPHIN_LEVELS[];
-extern const size_t DOLPHIN_LEVEL_COUNT;
-
-#define BUTTHURT_MAX 14
-#define BUTTHURT_MIN 0
+#include "dolphin_deed.h"
 
 typedef struct DolphinState DolphinState;
 typedef struct {
@@ -37,9 +25,9 @@ DolphinState* dolphin_state_alloc(void);
 
 void dolphin_state_free(DolphinState* dolphin_state);
 
-bool dolphin_state_save(DolphinState* dolphin_state);
+void dolphin_state_save(DolphinState* dolphin_state);
 
-bool dolphin_state_load(DolphinState* dolphin_state);
+void dolphin_state_load(DolphinState* dolphin_state);
 
 void dolphin_state_clear_limits(DolphinState* dolphin_state);