From d71f64899d076d8fba36213c0ddb8698d56cc446 Mon Sep 17 00:00:00 2001 From: chenyf <1343619937@qq.com> Date: Mon, 1 Jul 2024 08:36:50 +0800 Subject: [PATCH] fix: 1 --- applications/git.c | 4 +++- applications/gitrev_RTT.exe | Bin 61414 -> 61414 bytes applications/revision.h | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/applications/git.c b/applications/git.c index ee5b807..9a52ce6 100644 --- a/applications/git.c +++ b/applications/git.c @@ -191,13 +191,15 @@ int write_targeted_file(int version_number, char *version_hash, char sta) } fprintf(fp, "\""); fprintf(fp, "\n"); - fprintf(fp, "#define FIRMWARE_VER_MULTI \"%c\"\n", sta); + if (sta == '\0') { + fprintf(fp, "#define FIRMWARE_VER_MULTI \"\"\n"); fprintf(fp, "#define FIRMWARE_BUILD_INFO \"r\"FIRMWARE_VER_REV_STR\"-\"FIRMWARE_VER_HASH_STR\" \"FIRMWARE_TARGET_STR\" \"\" built on \"__DATE__\" \"__TIME__\n"); } else { + fprintf(fp, "#define FIRMWARE_VER_MULTI \"%c\"\n", sta); fprintf(fp, "#define FIRMWARE_BUILD_INFO \"r\"FIRMWARE_VER_REV_STR\"-\"FIRMWARE_VER_HASH_STR\"-\"FIRMWARE_VER_MULTI\" \"FIRMWARE_TARGET_STR\" \"\" built on \"__DATE__\" \"__TIME__\n"); } fprintf(fp, "#define FIRMWARE_SUBMODULE_REV \\\n"); diff --git a/applications/gitrev_RTT.exe b/applications/gitrev_RTT.exe index c94ea7a083af85b2107205a1ba0ee22aba8092f9..afeb84424a9cb44f339dd791e88fd58b53c67489 100644 GIT binary patch delta 6409 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 HHl+O@3K=t8 diff --git a/applications/revision.h b/applications/revision.h index 57ff404..a5c0d73 100644 --- a/applications/revision.h +++ b/applications/revision.h @@ -15,8 +15,8 @@ #else #define FIRMWARE_TARGET_STR "release" #endif -#define FIRMWARE_VER_REV 3 -#define FIRMWARE_VER_REV_STR "3" +#define FIRMWARE_VER_REV 4 +#define FIRMWARE_VER_REV_STR "4" #define FIRMWARE_VER_HASH_STR "698c62f0" #define FIRMWARE_VER_MULTI "M" #define FIRMWARE_BUILD_INFO "r"FIRMWARE_VER_REV_STR"-"FIRMWARE_VER_HASH_STR"-"FIRMWARE_VER_MULTI" "FIRMWARE_TARGET_STR" "" built on "__DATE__" "__TIME__