Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*deleted* #1848

Closed
wants to merge 3 commits into from
Closed

*deleted* #1848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d88a512
Disable unused workflows
jensonb Sep 2, 2023
5928bb4
Update about page with special edition label
jensonb Sep 2, 2023
e758b8f
test
jensonb Sep 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 .github/workflows/docker.yml → .github/workflows/docker.yml.old
View file
Open in desktop
File renamed without changes.
0 .github/workflows/pr-comment.yml → .github/workflows/pr-comment.yml.old
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,15 @@ execute_process(COMMAND git rev-parse --short HEAD
string(STRIP "${PROJECT_GIT_COMMIT_HASH}" PROJECT_GIT_COMMIT_HASH)

message("PROJECT_GIT_COMMIT_HASH_SUCCESS? " ${PROJECT_GIT_COMMIT_HASH_SUCCESS})
message("Git command output: ${PROJECT_GIT_COMMIT_HASH}")
message("Git command result: ${PROJECT_GIT_COMMIT_HASH_SUCCESS}")

execute_process(COMMAND git status
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE DEBUG_OUTPUT
RESULT_VARIABLE DEBUG_RESULT)
message("DEBUG OUTPUT: ${DEBUG_OUT}")
message("DEBUG RESULT: ${DEBUG_RESULT}")

message("")
message("BUILD CONFIGURATION")
Expand Down
5 changes: 3 additions & 2 deletions src/displayapp/screens/SystemInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,13 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen1() {
lv_obj_t* label = lv_label_create(lv_scr_act(), nullptr);
lv_label_set_recolor(label, true);
lv_label_set_text_fmt(label,
"#FFFF00 InfiniTime#\n\n"
"#FFFF00 InfiniTime#\n"
"#808080 Version# %ld.%ld.%ld\n"
"#FC03B6 JENSON edition#\n"
"#808080 Short Ref# %s\n"
"#808080 Build date#\n"
"%s\n"
"%s\n\n"
"%s\n"
"#808080 Bootloader# %s",
Version::Major(),
Version::Minor(),
Expand Down