From 9a19bb535ea0a3c24280acddff823dd273aea9b2 Mon Sep 17 00:00:00 2001 From: Sam Balana Date: Wed, 23 Feb 2022 16:50:47 -0800 Subject: [PATCH] fix: Respect keymap customization for split boards Fixes #1144, where building separate sides of the board does not respect the user-customized keymap generated by the setup script. --- app/cmake/zmk_config.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/cmake/zmk_config.cmake b/app/cmake/zmk_config.cmake index c8aa1a00..be31df1a 100644 --- a/app/cmake/zmk_config.cmake +++ b/app/cmake/zmk_config.cmake @@ -135,7 +135,9 @@ endif() if(NOT KEYMAP_FILE) foreach(keymap_dir ${KEYMAP_DIRS}) - foreach(keymap_prefix ${SHIELD} ${SHIELD_DIR} ${BOARD} ${BOARD_DIR_NAME}) + string(REPLACE "_left" "" SHIELD_WITHOUT_LEFT ${SHIELD}) + string(REPLACE "_right" "" SHIELD_WITHOUT_RIGHT ${SHIELD}) + foreach(keymap_prefix ${SHIELD} ${SHIELD_WITHOUT_LEFT} ${SHIELD_WITHOUT_RIGHT} ${SHIELD_DIR} ${BOARD} ${BOARD_DIR_NAME}) if (EXISTS ${keymap_dir}/${keymap_prefix}.keymap) set(KEYMAP_FILE "${keymap_dir}/${keymap_prefix}.keymap" CACHE STRING "Selected keymap file") message(STATUS "Using keymap file: ${KEYMAP_FILE}")