[FL-2675] /int space reservation (#1448)
* storage: added global #defines for /int, /ext & /any * storage: introduced PATH_EXT, PATH_INT& PATH_ANY macros * core apps: moved hardcoded config files names to separate headers; prefixed them with "."; updater: added file name migration to new naming convention on backup extraction * storage: fixed storage_merge_recursive handling of complex directory structures; storage_move_to_sd: changed data migration logic to all non-dot files & all folders * core: added macro aliases for core record names * Bumped protobuf commit pointer * storage: reserved 5 pages in /int; denying write&creation of non-dot files when running out of free space Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
@@ -7,6 +7,8 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define RECORD_NOTIFICATION "notification"
|
||||
|
||||
typedef struct NotificationApp NotificationApp;
|
||||
typedef struct {
|
||||
float frequency;
|
||||
|
@@ -398,7 +398,7 @@ void notification_process_internal_message(NotificationApp* app, NotificationApp
|
||||
|
||||
static bool notification_load_settings(NotificationApp* app) {
|
||||
NotificationSettings settings;
|
||||
File* file = storage_file_alloc(furi_record_open("storage"));
|
||||
File* file = storage_file_alloc(furi_record_open(RECORD_STORAGE));
|
||||
const size_t settings_size = sizeof(NotificationSettings);
|
||||
|
||||
FURI_LOG_I(TAG, "loading settings from \"%s\"", NOTIFICATION_SETTINGS_PATH);
|
||||
@@ -430,14 +430,14 @@ static bool notification_load_settings(NotificationApp* app) {
|
||||
|
||||
storage_file_close(file);
|
||||
storage_file_free(file);
|
||||
furi_record_close("storage");
|
||||
furi_record_close(RECORD_STORAGE);
|
||||
|
||||
return fs_result;
|
||||
};
|
||||
|
||||
static bool notification_save_settings(NotificationApp* app) {
|
||||
NotificationSettings settings;
|
||||
File* file = storage_file_alloc(furi_record_open("storage"));
|
||||
File* file = storage_file_alloc(furi_record_open(RECORD_STORAGE));
|
||||
const size_t settings_size = sizeof(NotificationSettings);
|
||||
|
||||
FURI_LOG_I(TAG, "saving settings to \"%s\"", NOTIFICATION_SETTINGS_PATH);
|
||||
@@ -465,7 +465,7 @@ static bool notification_save_settings(NotificationApp* app) {
|
||||
|
||||
storage_file_close(file);
|
||||
storage_file_free(file);
|
||||
furi_record_close("storage");
|
||||
furi_record_close(RECORD_STORAGE);
|
||||
|
||||
return fs_result;
|
||||
};
|
||||
@@ -512,7 +512,7 @@ static NotificationApp* notification_app_alloc() {
|
||||
app->settings.version = NOTIFICATION_SETTINGS_VERSION;
|
||||
|
||||
// display backlight control
|
||||
app->event_record = furi_record_open("input_events");
|
||||
app->event_record = furi_record_open(RECORD_INPUT_EVENTS);
|
||||
furi_pubsub_subscribe(app->event_record, input_event_callback, app);
|
||||
notification_message(app, &sequence_display_backlight_on);
|
||||
|
||||
@@ -535,7 +535,7 @@ int32_t notification_srv(void* p) {
|
||||
notification_apply_internal_led_layer(&app->led[1], 0x00);
|
||||
notification_apply_internal_led_layer(&app->led[2], 0x00);
|
||||
|
||||
furi_record_create("notification", app);
|
||||
furi_record_create(RECORD_NOTIFICATION, app);
|
||||
|
||||
NotificationAppMessage message;
|
||||
while(1) {
|
||||
|
@@ -2,6 +2,7 @@
|
||||
#include <furi_hal.h>
|
||||
#include "notification.h"
|
||||
#include "notification_messages.h"
|
||||
#include "notification_settings_filename.h"
|
||||
|
||||
#define NOTIFICATION_LED_COUNT 3
|
||||
#define NOTIFICATION_EVENT_COMPLETE 0x00000001U
|
||||
@@ -32,7 +33,7 @@ typedef struct {
|
||||
} NotificationLedLayer;
|
||||
|
||||
#define NOTIFICATION_SETTINGS_VERSION 0x01
|
||||
#define NOTIFICATION_SETTINGS_PATH "/int/notification.settings"
|
||||
#define NOTIFICATION_SETTINGS_PATH INT_PATH(NOTIFICATION_SETTINGS_FILE_NAME)
|
||||
|
||||
typedef struct {
|
||||
uint8_t version;
|
||||
|
@@ -126,8 +126,8 @@ static uint32_t notification_app_settings_exit(void* context) {
|
||||
|
||||
static NotificationAppSettings* alloc_settings() {
|
||||
NotificationAppSettings* app = malloc(sizeof(NotificationAppSettings));
|
||||
app->notification = furi_record_open("notification");
|
||||
app->gui = furi_record_open("gui");
|
||||
app->notification = furi_record_open(RECORD_NOTIFICATION);
|
||||
app->gui = furi_record_open(RECORD_GUI);
|
||||
|
||||
app->variable_item_list = variable_item_list_alloc();
|
||||
View* view = variable_item_list_get_view(app->variable_item_list);
|
||||
@@ -184,8 +184,8 @@ static void free_settings(NotificationAppSettings* app) {
|
||||
variable_item_list_free(app->variable_item_list);
|
||||
view_dispatcher_free(app->view_dispatcher);
|
||||
|
||||
furi_record_close("gui");
|
||||
furi_record_close("notification");
|
||||
furi_record_close(RECORD_GUI);
|
||||
furi_record_close(RECORD_NOTIFICATION);
|
||||
free(app);
|
||||
}
|
||||
|
||||
|
@@ -0,0 +1,3 @@
|
||||
#pragma once
|
||||
|
||||
#define NOTIFICATION_SETTINGS_FILE_NAME ".notification.settings"
|
Reference in New Issue
Block a user