* FS-Api: removed datetime manipulation functions and most of the file flags * Filesystem: common proxy api * Filesystem: renamed to Storage. Work has begun on a glue layer. Added functions for reentrance. * Storage: sd mount and sd file open * Storage: sd file close * Storage: temporary test app * Storage: free filedata on close * Storage: sd file read and write * Storage: added internal storage (LittleFS) * Storage: renamed internal commands * Storage: seek, tell, truncate, size, sync, eof * Storage: error descriptions * Storage: directory management api (open, close, read, rewind) * Storage: common management api (stat, fs_stat, remove, rename, mkdir) * Dolphin app and Notifications app now use raw storage. * Storage: storage statuses renamed. Implemented sd card icon. * Storage: added raw sd-card api. * Storage settings: work started * Assets: use new icons approach * Storage settings: working storage settings * Storage: completely redesigned api, no longer sticking out FS_Api * Storage: more simplified api, getting error_id from file is hidden from user, pointer to api is hidden inside file * Storage: cli info and format commands * Storage-cli: file list * Storage: a simpler and more reliable api * FatFS: slightly lighter and faster config. Also disabled reentrancy and file locking functions. They moved to a storage service. * Storage-cli: accommodate to the new cli api. * Storage: filesystem api is separated into internal and common api. * Cli: added the ability to print the list of free heap blocks * Storage: uses a list instead of an array to store the StorageFile. Rewrote api calls to use semaphores instead of thread flags. * Storage settings: added the ability to benchmark the SD card. * Gui module file select: uses new storage api * Apps: removed deprecated sd_card_test application * Args lib: support for enquoted arguments * Dialogs: a new gui app for simple non-asynchronous apps * Dialogs: view holder for easy single view work * File worker: use new storage api * IButton and lfrrfid apps: save keys to any storage * Apps: fix ibutton and lfrfid stack, remove sd_card_test. * SD filesystem: app removed * File worker: fixed api pointer type * Subghz: loading assets using the new storage api * NFC: use the new storage api * Dialogs: the better api for the message element * Archive: use new storage api * Irda: changed assest path, changed app path * FileWorker: removed unused file_buf_cnt * Storage: copying and renaming files now works between storages * Storage cli: read, copy, remove, rename commands * Archive: removed commented code * Storage cli: write command * Applications: add SRV_STORAGE and SRV_DIALOGS * Internal-storage: removed * Storage: improved api * Storage app: changed api pointer from StorageApp to Storage * Storage: better file_id handling * Storage: more consistent errors * Loader: support for NULL icons * Storage: do nothing with the lfs file or directory if it is not open * Storage: fix typo * Storage: minor float usage cleanup, rename some symbols. * Storage: compact doxygen comments. Co-authored-by: あく <alleteam@gmail.com>
		
			
				
	
	
		
			96 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			96 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#include "storage.h"
 | 
						|
#include "storage-i.h"
 | 
						|
#include "storage-message.h"
 | 
						|
#include "storage-processing.h"
 | 
						|
#include "storages/storage-int.h"
 | 
						|
#include "storages/storage-ext.h"
 | 
						|
 | 
						|
#define STORAGE_TICK 1000
 | 
						|
 | 
						|
#define ICON_SD_MOUNTED &I_SDcardMounted_11x8
 | 
						|
#define ICON_SD_ERROR &I_SDcardFail_11x8
 | 
						|
 | 
						|
static void storage_app_sd_icon_draw_callback(Canvas* canvas, void* context) {
 | 
						|
    furi_assert(canvas);
 | 
						|
    furi_assert(context);
 | 
						|
    Storage* app = context;
 | 
						|
 | 
						|
    // here we don't care about thread race when reading / writing status
 | 
						|
    switch(app->storage[ST_EXT].status) {
 | 
						|
    case StorageStatusNotReady:
 | 
						|
        break;
 | 
						|
    case StorageStatusOK:
 | 
						|
        canvas_draw_icon(canvas, 0, 0, ICON_SD_MOUNTED);
 | 
						|
        break;
 | 
						|
    default:
 | 
						|
        canvas_draw_icon(canvas, 0, 0, ICON_SD_ERROR);
 | 
						|
        break;
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
Storage* storage_app_alloc() {
 | 
						|
    Storage* app = malloc(sizeof(Storage));
 | 
						|
    app->message_queue = osMessageQueueNew(8, sizeof(StorageMessage), NULL);
 | 
						|
 | 
						|
    for(uint8_t i = 0; i < STORAGE_COUNT; i++) {
 | 
						|
        storage_data_init(&app->storage[i]);
 | 
						|
    }
 | 
						|
 | 
						|
    storage_int_init(&app->storage[ST_INT]);
 | 
						|
    storage_ext_init(&app->storage[ST_EXT]);
 | 
						|
 | 
						|
    // sd icon gui
 | 
						|
    app->sd_gui.enabled = false;
 | 
						|
    app->sd_gui.view_port = view_port_alloc();
 | 
						|
    view_port_set_width(app->sd_gui.view_port, icon_get_width(ICON_SD_MOUNTED));
 | 
						|
    view_port_draw_callback_set(app->sd_gui.view_port, storage_app_sd_icon_draw_callback, app);
 | 
						|
    view_port_enabled_set(app->sd_gui.view_port, false);
 | 
						|
 | 
						|
    Gui* gui = furi_record_open("gui");
 | 
						|
    gui_add_view_port(gui, app->sd_gui.view_port, GuiLayerStatusBarLeft);
 | 
						|
    furi_record_close("gui");
 | 
						|
 | 
						|
    return app;
 | 
						|
}
 | 
						|
 | 
						|
void storage_tick(Storage* app) {
 | 
						|
    for(uint8_t i = 0; i < STORAGE_COUNT; i++) {
 | 
						|
        StorageApi api = app->storage[i].api;
 | 
						|
        if(api.tick != NULL) {
 | 
						|
            api.tick(&app->storage[i]);
 | 
						|
        }
 | 
						|
    }
 | 
						|
 | 
						|
    // storage not enabled but was enabled (sd card unmount)
 | 
						|
    if(app->storage[ST_EXT].status == StorageStatusNotReady && app->sd_gui.enabled == true) {
 | 
						|
        app->sd_gui.enabled = false;
 | 
						|
        view_port_enabled_set(app->sd_gui.view_port, false);
 | 
						|
    }
 | 
						|
 | 
						|
    // storage enabled (or in error state) but was not enabled (sd card mount)
 | 
						|
    if((app->storage[ST_EXT].status == StorageStatusOK ||
 | 
						|
        app->storage[ST_EXT].status == StorageStatusNotMounted ||
 | 
						|
        app->storage[ST_EXT].status == StorageStatusNoFS ||
 | 
						|
        app->storage[ST_EXT].status == StorageStatusNotAccessible ||
 | 
						|
        app->storage[ST_EXT].status == StorageStatusErrorInternal) &&
 | 
						|
       app->sd_gui.enabled == false) {
 | 
						|
        app->sd_gui.enabled = true;
 | 
						|
        view_port_enabled_set(app->sd_gui.view_port, true);
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
int32_t storage_app(void* p) {
 | 
						|
    Storage* app = storage_app_alloc();
 | 
						|
    furi_record_create("storage", app);
 | 
						|
 | 
						|
    StorageMessage message;
 | 
						|
    while(1) {
 | 
						|
        if(osMessageQueueGet(app->message_queue, &message, NULL, STORAGE_TICK) == osOK) {
 | 
						|
            storage_process_message(app, &message);
 | 
						|
        } else {
 | 
						|
            storage_tick(app);
 | 
						|
        }
 | 
						|
    }
 | 
						|
 | 
						|
    return 0;
 | 
						|
} |