From bce6f867f1dfacee59fa56e1b1810935185725b7 Mon Sep 17 00:00:00 2001 From: coreglitch Date: Fri, 6 Nov 2020 15:31:06 +0600 Subject: [PATCH] show target version, date, commit hash and branch (#221) --- applications/irukagotchi/irukagotchi.c | 10 ++++++---- .../icons/IrukaGotchi/Flipper_young_80x60.png | Bin 2653 -> 3671 bytes bootloader/Makefile | 1 + firmware/Makefile | 1 + make/git.mk | 7 +++++++ 5 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 make/git.mk diff --git a/applications/irukagotchi/irukagotchi.c b/applications/irukagotchi/irukagotchi.c index 16d6e734..3ca6ad20 100644 --- a/applications/irukagotchi/irukagotchi.c +++ b/applications/irukagotchi/irukagotchi.c @@ -20,10 +20,12 @@ void irukagotchi_draw_callback(CanvasApi* canvas, void* context) { canvas->clear(canvas); canvas->set_color(canvas, ColorBlack); - canvas->set_font(canvas, FontPrimary); - canvas->draw_icon(canvas, 0, 0, irukagotchi->icon); - canvas->draw_str(canvas, 80, 30, "111001"); - canvas->draw_str(canvas, 80, 42, "011010"); + canvas->draw_icon(canvas, 128 - 80, 0, irukagotchi->icon); + canvas->set_font(canvas, FontSecondary); + canvas->draw_str(canvas, 2, 10, TARGET " " BUILD_DATE); + canvas->draw_str(canvas, 2, 22, GIT_BRANCH); + canvas->draw_str(canvas, 2, 34, GIT_BRANCH_NUM); + canvas->draw_str(canvas, 2, 46, GIT_COMMIT); } void irukagotchi_input_callback(InputEvent* event, void* context) { diff --git a/assets/icons/IrukaGotchi/Flipper_young_80x60.png b/assets/icons/IrukaGotchi/Flipper_young_80x60.png index e031154dfded6fe916c168ac0f4ed742a94f2231..2d81ca51c9116918b856b5b89bc398cad7d7d6ea 100644 GIT binary patch literal 3671 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 diff --git a/bootloader/Makefile b/bootloader/Makefile index a9ba868c..06e42627 100644 --- a/bootloader/Makefile +++ b/bootloader/Makefile @@ -12,5 +12,6 @@ TARGET ?= f2 TARGET_DIR = targets/$(TARGET) include $(TARGET_DIR)/target.mk +include $(PROJECT_ROOT)/make/git.mk include $(PROJECT_ROOT)/make/toolchain.mk include $(PROJECT_ROOT)/make/rules.mk diff --git a/firmware/Makefile b/firmware/Makefile index dafd3af6..3e23684c 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -14,5 +14,6 @@ TARGET ?= f2 TARGET_DIR = targets/$(TARGET) include $(TARGET_DIR)/target.mk +include $(PROJECT_ROOT)/make/git.mk include $(PROJECT_ROOT)/make/toolchain.mk include $(PROJECT_ROOT)/make/rules.mk diff --git a/make/git.mk b/make/git.mk new file mode 100644 index 00000000..ff49e48a --- /dev/null +++ b/make/git.mk @@ -0,0 +1,7 @@ +GIT_COMMIT = $(shell git describe --always --exclude '*' || echo 'unknown') +GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD || echo 'unknown') +GIT_BRANCH_NUM = $(shell git rev-list --count $(GIT_BRANCH) || echo 'nan') +BUILD_DATE = $(shell date '+%d-%m-%Y' || echo 'unknown') + +CFLAGS += -DGIT_COMMIT="\"$(GIT_COMMIT)\"" -DGIT_BRANCH="\"$(GIT_BRANCH)\"" -DGIT_BRANCH_NUM="\"$(GIT_BRANCH_NUM)\"" +CFLAGS += -DBUILD_DATE="\"$(BUILD_DATE)\"" -DTARGET="\"$(TARGET)\"" \ No newline at end of file