From d88a512ce84d2199567ac702998a446835d73c89 Mon Sep 17 00:00:00 2001 From: jensonb Date: Sat, 2 Sep 2023 16:07:26 +0000 Subject: [PATCH 1/3] Disable unused workflows --- .github/workflows/{docker.yml => docker.yml.old} | 0 .github/workflows/{pr-comment.yml => pr-comment.yml.old} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{docker.yml => docker.yml.old} (100%) rename .github/workflows/{pr-comment.yml => pr-comment.yml.old} (100%) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml.old similarity index 100% rename from .github/workflows/docker.yml rename to .github/workflows/docker.yml.old diff --git a/.github/workflows/pr-comment.yml b/.github/workflows/pr-comment.yml.old similarity index 100% rename from .github/workflows/pr-comment.yml rename to .github/workflows/pr-comment.yml.old From 5928bb4cc9a219a0e81db48494ce4287e704ac6a Mon Sep 17 00:00:00 2001 From: jensonb Date: Sat, 2 Sep 2023 17:11:19 +0000 Subject: [PATCH 2/3] Update about page with special edition label --- src/displayapp/screens/SystemInfo.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp index eea7593800..1921780372 100644 --- a/src/displayapp/screens/SystemInfo.cpp +++ b/src/displayapp/screens/SystemInfo.cpp @@ -79,12 +79,13 @@ std::unique_ptr 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(), From e758b8f55a959b5146aa0f768e1560d65c45554b Mon Sep 17 00:00:00 2001 From: jensonb Date: Sat, 2 Sep 2023 18:33:52 +0000 Subject: [PATCH 3/3] test --- CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 83c6e98db8..e8e5708a3f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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")