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.
This commit is contained in:
Sam Balana 2022-02-23 16:50:47 -08:00
parent 1d5b48cb52
commit 9a19bb535e

View file

@ -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}")