mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-07-28 01:58:11 -07:00
merge fixes [ci skip]
parsers will be fixed after
This commit is contained in:
@@ -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 {
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user