From 7b882d3ac8c0b3079d1941b2738938882b47d8ec Mon Sep 17 00:00:00 2001
From: Megamind <68985133+megamind4089@users.noreply.github.com>
Date: Thu, 4 Nov 2021 23:31:44 +0800
Subject: [PATCH] Strip board revision so keymap file use only board name

---
 app/cmake/zmk_config.cmake | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/cmake/zmk_config.cmake b/app/cmake/zmk_config.cmake
index dec31104..0c57582e 100644
--- a/app/cmake/zmk_config.cmake
+++ b/app/cmake/zmk_config.cmake
@@ -45,6 +45,16 @@ endif()
 # Store the selected user_config in the cache
 set(CACHED_ZMK_CONFIG ${ZMK_CONFIG} CACHE STRING "Selected user ZMK config")
 
+string(FIND "${BOARD}" "@" REVISION_SEPARATOR_INDEX)
+if(NOT (REVISION_SEPARATOR_INDEX EQUAL -1))
+  message(STATUS "Board with revision: ${BOARD}")
+  math(EXPR BOARD_REVISION_INDEX "${REVISION_SEPARATOR_INDEX} + 1")
+  string(SUBSTRING ${BOARD} ${BOARD_REVISION_INDEX} -1 BOARD_REVISION)
+  string(SUBSTRING ${BOARD} 0 ${REVISION_SEPARATOR_INDEX} BOARD)
+  message(STATUS "Board without revision: ${BOARD}")
+endif()
+
+
 if (ZMK_CONFIG)
 	set(ENV{ZMK_CONFIG} "${ZMK_CONFIG}")
 	if(EXISTS ${ZMK_CONFIG}/boards)