Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ClusterM/flipperzero-firmware.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSG <who.just.the.doctor@gmail.com>2021-07-23 15:20:19 +0300
committerGitHub <noreply@github.com>2021-07-23 15:20:19 +0300
commitad421a81bc73c23a5d3c8355a4624cf489bb95f7 (patch)
tree9237226a9fb2a92860bad3c953d0b22f34c39655 /applications/applications.c
parenta81203941bf87da4abdd7e60c6ab65331b490921 (diff)
[FL-1191][FL-1524] Filesystem rework (#568)
* 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>
Diffstat (limited to 'applications/applications.c')
-rw-r--r--applications/applications.c59
1 files changed, 28 insertions, 31 deletions
diff --git a/applications/applications.c b/applications/applications.c
index 4ea627d6..c5850aa2 100644
--- a/applications/applications.c
+++ b/applications/applications.c
@@ -19,26 +19,26 @@ int32_t nfc_task(void* p);
int32_t dolphin_task(void* p);
int32_t power_task(void* p);
int32_t bt_task(void* p);
-int32_t sd_card_test(void* p);
int32_t application_vibro(void* p);
int32_t app_gpio_test(void* p);
int32_t app_ibutton(void* p);
int32_t cli_task(void* p);
int32_t music_player(void* p);
int32_t sdnfc(void* p);
-int32_t sd_filesystem(void* p);
int32_t subghz_app(void* p);
int32_t gui_test(void* p);
int32_t keypad_test(void* p);
int32_t scene_app(void* p);
int32_t passport(void* p);
int32_t app_accessor(void* p);
-int32_t internal_storage_task(void* p);
int32_t app_archive(void* p);
int32_t notification_app(void* p);
int32_t scened_app(void* p);
int32_t lfrfid_app(void* p);
int32_t lfrfid_debug_app(void* p);
+int32_t storage_app(void* p);
+int32_t storage_app_test(void* p);
+int32_t dialogs_app(void* p);
// On system start hooks declaration
void irda_cli_init();
@@ -47,9 +47,11 @@ void subghz_cli_init();
void bt_cli_init();
void lfrfid_cli_init();
void ibutton_cli_init();
+void storage_cli_init();
// Settings
int32_t notification_app_settings(void* p);
+int32_t storage_settings(void* p);
const FlipperApplication FLIPPER_SERVICES[] = {
#ifdef SRV_CLI
@@ -81,17 +83,6 @@ const FlipperApplication FLIPPER_SERVICES[] = {
{.app = loader, .name = "loader", .stack_size = 1024, .icon = &A_Plugins_14},
#endif
-#ifdef SRV_SD_FILESYSTEM
- {.app = sd_filesystem, .name = "sd_filesystem", .stack_size = 4096, .icon = &A_Plugins_14},
-#endif
-
-#ifdef SRV_INTERNAL_STORAGE
- {.app = internal_storage_task,
- .name = "internal_storage",
- .stack_size = 2048,
- .icon = &A_Plugins_14},
-#endif
-
#ifdef SRV_DOLPHIN
{.app = dolphin_task, .name = "dolphin_task", .stack_size = 1024, .icon = &A_Plugins_14},
#endif
@@ -105,8 +96,7 @@ const FlipperApplication FLIPPER_SERVICES[] = {
#endif
#ifdef SRV_LF_RFID
- // TODO: fix stack size when sd api will be in separate thread
- {.app = lfrfid_app, .name = "125 kHz RFID", .stack_size = 4096, .icon = &A_Plugins_14},
+ {.app = lfrfid_app, .name = "125 kHz RFID", .stack_size = 2048, .icon = &A_Plugins_14},
#endif
#ifdef SRV_IRDA
@@ -128,16 +118,12 @@ const FlipperApplication FLIPPER_SERVICES[] = {
.icon = &A_Plugins_14},
#endif
-#ifdef SRV_SD_TEST
- {.app = sd_card_test, .name = "sd_card_test", .stack_size = 4096, .icon = &A_Plugins_14},
-#endif
-
#ifdef SRV_MUSIC_PLAYER
{.app = music_player, .name = "music player", .stack_size = 1024, .icon = &A_Plugins_14},
#endif
#ifdef SRV_IBUTTON
- {.app = app_ibutton, .name = "ibutton", .stack_size = 4096, .icon = &A_Plugins_14},
+ {.app = app_ibutton, .name = "ibutton", .stack_size = 2048, .icon = &A_Plugins_14},
#endif
#ifdef SRV_GPIO_DEMO
@@ -164,6 +150,17 @@ const FlipperApplication FLIPPER_SERVICES[] = {
{.app = notification_app, .name = "notification", .stack_size = 1024, .icon = &A_Plugins_14},
#endif
+#ifdef SRV_STORAGE
+ {.app = storage_app, .name = "storage", .stack_size = 4096, .icon = &A_Plugins_14},
+#endif
+
+#ifdef SRV_STORAGE_TEST
+ {.app = storage_app_test, .name = "storage test", .stack_size = 1024, .icon = &A_Plugins_14},
+#endif
+
+#ifdef SRV_DIALOGS
+ {.app = dialogs_app, .name = "dialogs", .stack_size = 1024, .icon = &A_Plugins_14},
+#endif
};
const size_t FLIPPER_SERVICES_COUNT = sizeof(FLIPPER_SERVICES) / sizeof(FlipperApplication);
@@ -172,7 +169,7 @@ const size_t FLIPPER_SERVICES_COUNT = sizeof(FLIPPER_SERVICES) / sizeof(FlipperA
const FlipperApplication FLIPPER_APPS[] = {
#ifdef APP_IBUTTON
- {.app = app_ibutton, .name = "iButton", .stack_size = 4096, .icon = &A_iButton_14},
+ {.app = app_ibutton, .name = "iButton", .stack_size = 2048, .icon = &A_iButton_14},
#endif
#ifdef APP_NFC
@@ -186,7 +183,7 @@ const FlipperApplication FLIPPER_APPS[] = {
#ifdef APP_LF_RFID
// TODO: fix stack size when sd api will be in separate thread
- {.app = lfrfid_app, .name = "125 kHz RFID", .stack_size = 4096, .icon = &A_125khz_14},
+ {.app = lfrfid_app, .name = "125 kHz RFID", .stack_size = 2048, .icon = &A_125khz_14},
#endif
#ifdef APP_IRDA
@@ -219,6 +216,9 @@ const FlipperOnStartHook FLIPPER_ON_SYSTEM_START[] = {
#ifdef SRV_BT
bt_cli_init,
#endif
+#ifdef SRV_STORAGE
+ storage_cli_init,
+#endif
};
const size_t FLIPPER_ON_SYSTEM_START_COUNT =
@@ -255,10 +255,6 @@ const FlipperApplication FLIPPER_DEBUG_APPS[] = {
.icon = &A_Plugins_14},
#endif
-#ifdef APP_SD_TEST
- {.app = sd_card_test, .name = "sd_card_test", .stack_size = 4096, .icon = &A_Plugins_14},
-#endif
-
#ifdef APP_VIBRO_DEMO
{.app = application_vibro, .name = "vibro", .stack_size = 1024, .icon = &A_Plugins_14},
#endif
@@ -326,10 +322,11 @@ const size_t FLIPPER_SCENE_APPS_COUNT = sizeof(FLIPPER_SCENE_APPS) / sizeof(Flip
// Settings menu
const FlipperApplication FLIPPER_SETTINGS_APPS[] = {
#ifdef SRV_NOTIFICATION
- {.app = notification_app_settings,
- .name = "Notification",
- .stack_size = 1024,
- .icon = &A_Plugins_14},
+ {.app = notification_app_settings, .name = "Notification", .stack_size = 1024, .icon = NULL},
+#endif
+
+#ifdef SRV_STORAGE
+ {.app = storage_settings, .name = "Storage", .stack_size = 2048, .icon = NULL},
#endif
};