From c30f8a5e89dc8b3c2dacbcea8b0de0daaa899ac8 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Sat, 2 Sep 2023 18:24:53 +0200 Subject: [PATCH] Change naming scheme setting name --- applications/settings/system/system_settings.c | 10 +++++----- firmware/targets/furi_hal_include/furi_hal_rtc.h | 2 +- lib/toolbox/name_generator.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/applications/settings/system/system_settings.c b/applications/settings/system/system_settings.c index a204db7d6..05b4b076e 100644 --- a/applications/settings/system/system_settings.c +++ b/applications/settings/system/system_settings.c @@ -139,17 +139,17 @@ static void sleep_method_changed(VariableItem* item) { } const char* const filename_scheme[] = { - "Timestamp", - "Simple", + "Time", + "Random", }; static void filename_scheme_changed(VariableItem* item) { uint8_t index = variable_item_get_current_value_index(item); variable_item_set_current_value_text(item, filename_scheme[index]); if(index) { - furi_hal_rtc_set_flag(FuriHalRtcFlagSimpleFilename); + furi_hal_rtc_set_flag(FuriHalRtcFlagRandomFilename); } else { - furi_hal_rtc_reset_flag(FuriHalRtcFlagSimpleFilename); + furi_hal_rtc_reset_flag(FuriHalRtcFlagRandomFilename); } } @@ -232,7 +232,7 @@ SystemSettings* system_settings_alloc() { item = variable_item_list_add( app->var_item_list, "File Naming", COUNT_OF(filename_scheme), filename_scheme_changed, app); - value_index = furi_hal_rtc_is_flag_set(FuriHalRtcFlagSimpleFilename) ? 1 : 0; + value_index = furi_hal_rtc_is_flag_set(FuriHalRtcFlagRandomFilename) ? 1 : 0; variable_item_set_current_value_index(item, value_index); variable_item_set_current_value_text(item, filename_scheme[value_index]); diff --git a/firmware/targets/furi_hal_include/furi_hal_rtc.h b/firmware/targets/furi_hal_include/furi_hal_rtc.h index a93bed486..cec811019 100644 --- a/firmware/targets/furi_hal_include/furi_hal_rtc.h +++ b/firmware/targets/furi_hal_include/furi_hal_rtc.h @@ -32,7 +32,7 @@ typedef enum { FuriHalRtcFlagHandOrient = (1 << 4), FuriHalRtcFlagLegacySleep = (1 << 5), FuriHalRtcFlagStealthMode = (1 << 6), - FuriHalRtcFlagSimpleFilename = (1 << 7), + FuriHalRtcFlagRandomFilename = (1 << 7), } FuriHalRtcFlag; typedef enum { diff --git a/lib/toolbox/name_generator.c b/lib/toolbox/name_generator.c index 4e7e96b3b..5b822630b 100644 --- a/lib/toolbox/name_generator.c +++ b/lib/toolbox/name_generator.c @@ -45,7 +45,7 @@ const char* const name_generator_right[] = { }; void name_generator_make_auto(char* name, size_t max_name_size, const char* prefix) { - if(!furi_hal_rtc_is_flag_set(FuriHalRtcFlagSimpleFilename)) { + if(!furi_hal_rtc_is_flag_set(FuriHalRtcFlagRandomFilename)) { name_generator_make_detailed(name, max_name_size, prefix); } else { name_generator_make_random(name, max_name_size);