From 951a93abb4fd7106fb54dda7d7e4f7b0b845d5e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Ma=C5=82ek?=
 <10601033+piotrmalek@users.noreply.github.com>
Date: Wed, 14 Jan 2026 11:32:04 +0100
Subject: [PATCH 1/2] Improve bootloader version parsing from GIT_VERSION

---
 Makefile | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index dba3c83..5af9ac4 100644
--- a/Makefile
+++ b/Makefile
@@ -326,8 +326,26 @@ CFLAGS += -DSOFTDEVICE_PRESENT
 CFLAGS += -DUF2_VERSION='"$(GIT_VERSION)"'
 CFLAGS += -DBLEDIS_FW_VERSION='"$(GIT_VERSION) $(SD_NAME) $(SD_VERSION)"'
 
-_VER = $(subst ., ,$(word 1, $(subst -, ,$(GIT_VERSION))))
-CFLAGS += -DMK_BOOTLOADER_VERSION='($(word 1,$(_VER)) << 16) + ($(word 2,$(_VER)) << 8) + $(word 3,$(_VER))'
+# Extract semantic version numbers (MAJOR.MINOR.PATCH) from GIT_VERSION.
+# Supports tags like:
+#   v1.2.3
+#   1.2.3
+#   1.2.3-147-gd71abcd
+# If the version string does not match MAJOR.MINOR.PATCH, defaults to 0.0.0.
+_VER3 := $(shell echo "$(GIT_VERSION)" | sed -E 's/^v?([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 \2 \3/; t; s/.*/0 0 0/')
+
+# Split extracted version into individual numeric components
+_VER_MAJ := $(word 1,$(_VER3))
+_VER_MIN := $(word 2,$(_VER3))
+_VER_PAT := $(word 3,$(_VER3))
+
+# Pack MAJOR.MINOR.PATCH into a single 32-bit integer:
+#   [31:16] MAJOR
+#   [15:8]  MINOR
+#   [7:0]   PATCH
+# This value is stored in the bootloader version register and must be a valid C integer constant.
+CFLAGS += -DMK_BOOTLOADER_VERSION='((($(_VER_MAJ)<<16)|($(_VER_MIN)<<8)|($(_VER_PAT))))'
+
 
 # Debug option use RTT for printf
 ifeq ($(DEBUG), 1)

From dc42c2a7c0fcecbf8d6e52b053457d94324665d1 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 21 May 2026 11:49:01 +0700
Subject: [PATCH 2/2] update cmake version as well

---
 CMakeLists.txt | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e17d10..58238bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -316,13 +316,22 @@ endif()
 execute_process(COMMAND git describe --dirty --always --tags OUTPUT_VARIABLE GIT_VERSION)
 string(STRIP ${GIT_VERSION} GIT_VERSION)
 
-string(REPLACE "-" ";" RELEASE_VERSION ${GIT_VERSION})
-list(GET RELEASE_VERSION 0 RELEASE_VERSION)
-string(REPLACE "." ";" RELEASE_VERSION ${RELEASE_VERSION})
-list(GET RELEASE_VERSION 0 RELEASE_VERSION_MAJOR)
-list(GET RELEASE_VERSION 1 RELEASE_VERSION_MINOR)
-list(GET RELEASE_VERSION 2 RELEASE_VERSION_PATCH)
-math(EXPR MK_BOOTLOADER_VERSION "(${RELEASE_VERSION_MAJOR} << 16) + (${RELEASE_VERSION_MINOR} << 8) + ${RELEASE_VERSION_PATCH}")
+# Extract semantic version numbers (MAJOR.MINOR.PATCH) from GIT_VERSION.
+# Supports tags like:
+#   v1.2.3
+#   1.2.3
+#   1.2.3-147-gd71abcd
+# If the version string does not match MAJOR.MINOR.PATCH, defaults to 0.0.0.
+if(GIT_VERSION MATCHES "^v?([0-9]+)\\.([0-9]+)\\.([0-9]+)")
+  set(RELEASE_VERSION_MAJOR ${CMAKE_MATCH_1})
+  set(RELEASE_VERSION_MINOR ${CMAKE_MATCH_2})
+  set(RELEASE_VERSION_PATCH ${CMAKE_MATCH_3})
+else()
+  set(RELEASE_VERSION_MAJOR 0)
+  set(RELEASE_VERSION_MINOR 0)
+  set(RELEASE_VERSION_PATCH 0)
+endif()
+math(EXPR MK_BOOTLOADER_VERSION "((${RELEASE_VERSION_MAJOR} << 16) | (${RELEASE_VERSION_MINOR} << 8) | ${RELEASE_VERSION_PATCH})")
 
 cmake_print_variables(GIT_VERSION MK_BOOTLOADER_VERSION)