mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-12 10:08:36 -07:00
Consistent version/branch info, fix gitorigin
- Dev dist: mntm-(branch)-(commit) - Dev version: mntm-dev - Dev gitbranch: (branch) - Tag dist: mntm-(ver) - Tag version: mntm-(ver) - Tag gitbranch: mntm-(ver) - Consistent between CI and local - Gitorigin falls back based on context - MNTM settings header won't clip with custom branch names - About fw info page shows dirty flag and branch when custom, in same layout as OFW
This commit is contained in:
@@ -171,21 +171,24 @@ static DialogMessageButton about_screen_fw_version(DialogsApp* dialogs, DialogMe
|
||||
} else {
|
||||
uint16_t api_major, api_minor;
|
||||
furi_hal_info_get_api_version(&api_major, &api_minor);
|
||||
furi_string_set(buffer, version_get_version(ver));
|
||||
size_t sha_pos = furi_string_search_char(buffer, '-', strlen("mntm-"));
|
||||
if(sha_pos != FURI_STRING_FAILURE) {
|
||||
// Strip commit sha if present (non-release)
|
||||
furi_string_left(buffer, sha_pos);
|
||||
}
|
||||
furi_string_cat_printf(
|
||||
buffer,
|
||||
" %s\n%s F%d:%d.%d %s\nmomentum-fw.dev",
|
||||
"%s [%s]\n%s%s [%d.%d] %s\n[%d] ",
|
||||
version_get_version(ver),
|
||||
version_get_builddate(ver),
|
||||
version_get_dirty_flag(ver) ? "[!] " : "",
|
||||
version_get_githash(ver),
|
||||
version_get_target(ver),
|
||||
api_major,
|
||||
api_minor,
|
||||
c2_ver ? c2_ver->StackTypeString : "<none>");
|
||||
c2_ver ? c2_ver->StackTypeString : "<none>",
|
||||
version_get_target(ver));
|
||||
if(!strcmp(version_get_version(ver), "mntm-dev") &&
|
||||
strcmp(version_get_gitbranch(ver), "dev")) {
|
||||
// Not a tag but not dev branch, show custom branch
|
||||
furi_string_cat(buffer, version_get_gitbranch(ver));
|
||||
} else {
|
||||
furi_string_cat(buffer, "momentum-fw.dev");
|
||||
}
|
||||
}
|
||||
|
||||
dialog_message_set_header(message, "Firmware Info:", 0, 0, AlignLeft, AlignTop);
|
||||
|
||||
Reference in New Issue
Block a user