merge fixes [ci skip]

parsers will be fixed after
This commit is contained in:
MX
2024-02-15 14:08:10 +03:00
parent 62edabe9dd
commit 597d295743
9 changed files with 20 additions and 20 deletions
+3 -3
View File
@@ -48,7 +48,7 @@ void name_generator_make_auto_datetime(
char* name,
size_t max_name_size,
const char* prefix,
FuriHalRtcDateTime* custom_time) {
DateTime* custom_time) {
if(furi_hal_rtc_is_flag_set(FuriHalRtcFlagDetailedFilename)) {
name_generator_make_detailed_datetime(name, max_name_size, prefix, custom_time);
} else {
@@ -88,12 +88,12 @@ void name_generator_make_detailed_datetime(
char* name,
size_t max_name_size,
const char* prefix,
FuriHalRtcDateTime* custom_time) {
DateTime* custom_time) {
furi_assert(name);
furi_assert(max_name_size);
furi_assert(prefix);
FuriHalRtcDateTime dateTime;
DateTime dateTime;
if(custom_time) {
dateTime = *custom_time;
} else {
+2 -2
View File
@@ -19,7 +19,7 @@ void name_generator_make_auto_datetime(
char* name,
size_t max_name_size,
const char* prefix,
FuriHalRtcDateTime* custom_time);
DateTime* custom_time);
/** Generates random name
*
@@ -41,7 +41,7 @@ void name_generator_make_detailed_datetime(
char* name,
size_t max_name_size,
const char* prefix,
FuriHalRtcDateTime* custom_time);
DateTime* custom_time);
#ifdef __cplusplus
}