git: show git short ref hash on SystemInfo(first screen) and FirmwareValidation screen alongside other information
This commit is contained in:
parent
e04c8ee95e
commit
a4de61e1f5
|
@ -27,6 +27,17 @@ FirmwareValidation::FirmwareValidation(Pinetime::Applications::DisplayApp* app,
|
||||||
sprintf(version, "%ld.%ld.%ld", Version::Major(), Version::Minor(), Version::Patch());
|
sprintf(version, "%ld.%ld.%ld", Version::Major(), Version::Minor(), Version::Patch());
|
||||||
lv_label_set_text(labelVersionValue, version);
|
lv_label_set_text(labelVersionValue, version);
|
||||||
|
|
||||||
|
labelShortRefInfo = lv_label_create(lv_scr_act(), nullptr);
|
||||||
|
lv_obj_align(labelShortRefInfo, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 25);
|
||||||
|
lv_label_set_text(labelShortRefInfo, "ShortRef : ");
|
||||||
|
lv_label_set_align(labelShortRefInfo, LV_LABEL_ALIGN_LEFT);
|
||||||
|
|
||||||
|
labelShortRefValue = lv_label_create(lv_scr_act(), nullptr);
|
||||||
|
lv_obj_align(labelShortRefValue, labelShortRefInfo, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
|
||||||
|
lv_label_set_recolor(labelShortRefValue, true);
|
||||||
|
sprintf(shortref, "%s", Version::GitCommitHash());
|
||||||
|
lv_label_set_text(labelShortRefValue, shortref);
|
||||||
|
|
||||||
labelIsValidated = lv_label_create(lv_scr_act(), nullptr);
|
labelIsValidated = lv_label_create(lv_scr_act(), nullptr);
|
||||||
lv_obj_align(labelIsValidated, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 50);
|
lv_obj_align(labelIsValidated, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 50);
|
||||||
lv_label_set_recolor(labelIsValidated, true);
|
lv_label_set_recolor(labelIsValidated, true);
|
||||||
|
|
|
@ -25,7 +25,10 @@ namespace Pinetime {
|
||||||
|
|
||||||
lv_obj_t* labelVersionInfo;
|
lv_obj_t* labelVersionInfo;
|
||||||
lv_obj_t* labelVersionValue;
|
lv_obj_t* labelVersionValue;
|
||||||
|
lv_obj_t* labelShortRefInfo;
|
||||||
|
lv_obj_t* labelShortRefValue;
|
||||||
char version[9];
|
char version[9];
|
||||||
|
char shortref[9];
|
||||||
lv_obj_t* labelIsValidated;
|
lv_obj_t* labelIsValidated;
|
||||||
lv_obj_t* buttonValidate;
|
lv_obj_t* buttonValidate;
|
||||||
lv_obj_t* labelButtonValidate;
|
lv_obj_t* labelButtonValidate;
|
||||||
|
|
|
@ -69,12 +69,14 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen1() {
|
||||||
lv_label_set_text_fmt(label,
|
lv_label_set_text_fmt(label,
|
||||||
"#FFFF00 InfiniTime#\n\n"
|
"#FFFF00 InfiniTime#\n\n"
|
||||||
"#444444 Version# %ld.%ld.%ld\n\n"
|
"#444444 Version# %ld.%ld.%ld\n\n"
|
||||||
|
"#444444 Short Ref# %s\n\n"
|
||||||
"#444444 Build date#\n"
|
"#444444 Build date#\n"
|
||||||
"%s\n"
|
"%s\n"
|
||||||
"%s\n",
|
"%s\n",
|
||||||
Version::Major(),
|
Version::Major(),
|
||||||
Version::Minor(),
|
Version::Minor(),
|
||||||
Version::Patch(),
|
Version::Patch(),
|
||||||
|
Version::GitCommitHash(),
|
||||||
__DATE__,
|
__DATE__,
|
||||||
__TIME__);
|
__TIME__);
|
||||||
lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
|
lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user