Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-06-07 19:01:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Allow empty prefix in name generator

Browse Source
This commit is contained in:
Willy-JL
2024-04-17 00:25:55 +01:00
parent 1e0bc2799f
commit 16654d3c90
1 changed files with 46 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/toolbox/name_generator.c
+46 -26
View File
@@ -74,22 +74,29 @@ void name_generator_make_random_prefixed(
uint8_t name_generator_left_i = rand() % COUNT_OF(name_generator_left);
uint8_t name_generator_right_i = rand() % COUNT_OF(name_generator_right);
if(prefix_after) {
snprintf(
name,
max_name_size,
"%s-%s%s%s",
name_generator_left[name_generator_left_i],
name_generator_right[name_generator_right_i],
prefix ? "_" : "",
prefix ? prefix : "");
if(prefix) {
if(prefix_after) {
snprintf(
name,
max_name_size,
"%s-%s_%s",
name_generator_left[name_generator_left_i],
name_generator_right[name_generator_right_i],
prefix);
} else {
snprintf(
name,
max_name_size,
"%s_%s-%s",
prefix,
name_generator_left[name_generator_left_i],
name_generator_right[name_generator_right_i]);
}
} else {
snprintf(
name,
max_name_size,
"%s%s%s-%s",
prefix ? prefix : "",
prefix ? "_" : "",
"%s-%s",
name_generator_left[name_generator_left_i],
name_generator_right[name_generator_right_i]);
}
@@ -119,24 +126,37 @@ void name_generator_make_detailed_datetime(
furi_hal_rtc_get_datetime(&dateTime);
}
if(prefix_after) {
snprintf(
name,
max_name_size,
"%.4d-%.2d-%.2d_%.2d,%.2d,%.2d_%s",
dateTime.year,
dateTime.month,
dateTime.day,
dateTime.hour,
dateTime.minute,
dateTime.second,
prefix);
if(prefix) {
if(prefix_after) {
snprintf(
name,
max_name_size,
"%.4d-%.2d-%.2d_%.2d,%.2d,%.2d_%s",
dateTime.year,
dateTime.month,
dateTime.day,
dateTime.hour,
dateTime.minute,
dateTime.second,
prefix);
} else {
snprintf(
name,
max_name_size,
"%s_%.4d-%.2d-%.2d_%.2d,%.2d,%.2d",
prefix,
dateTime.year,
dateTime.month,
dateTime.day,
dateTime.hour,
dateTime.minute,
dateTime.second);
}
} else {
snprintf(
name,
max_name_size,
"%s_%.4d-%.2d-%.2d_%.2d,%.2d,%.2d",
prefix,
"%.4d-%.2d-%.2d_%.2d,%.2d,%.2d",
dateTime.year,
dateTime.month,
dateTime.day,