pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: Fixed conf file loading.

Browse source 
* Properly locate conf files for the shield dir name.
This commit is contained in:
Peter Johanson 2022-06-05 03:34:07 +00:00 committed by Pete Johanson
parent 1e8224c296
commit 505c481f6a
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/cmake/ZephyrBuildConfig.cmake
View file

@ -121,11 +121,11 @@ if(DEFINED SHIELD)
list(LENGTH S_PIECES S_PIECES_LEN) list(LENGTH S_PIECES S_PIECES_LEN)
while(NOT S_PIECES STREQUAL "") while(NOT S_PIECES STREQUAL "")
list(POP_BACK S_PIECES) list(POP_BACK S_PIECES)
list(JOIN S_PIECES "_" S_SUBSTR) list(JOIN S_PIECES "_" s_substr)
if (S_SUBSTR STREQUAL ${shield_dir_name}) if ("%{s_substr}" STREQUAL "" OR "${s_substr}" STREQUAL ${shield_dir_name})
break() break()
endif() endif()
list(APPEND shield_candidate_names ${S_SUBSTR}) list(APPEND shield_candidate_names ${s_substr})
endwhile() endwhile()
endforeach() endforeach()
endif() endif()
@ -133,12 +133,11 @@ endif()
if (ZMK_CONFIG) if (ZMK_CONFIG)
if (EXISTS ${ZMK_CONFIG}) if (EXISTS ${ZMK_CONFIG})
message(STATUS "ZMK Config directory: ${ZMK_CONFIG}") message(STATUS "ZMK Config directory: ${ZMK_CONFIG}")
list(APPEND DTS_ROOT ${ZMK_CONFIG})
list(PREPEND KEYMAP_DIRS "${ZMK_CONFIG}") list(PREPEND KEYMAP_DIRS "${ZMK_CONFIG}")
if (DEFINED SHIELD) if (DEFINED SHIELD)
foreach (s ${shield_candidate_names}) foreach (s ${shield_candidate_names} ${SHIELD_AS_LIST})
if (DEFINED $SHIELD_DIR_${s}) if (DEFINED ${SHIELD_DIR_${s}})
get_filename_component(shield_dir_name ${SHIELD_DIR_${s}} NAME) get_filename_component(shield_dir_name ${SHIELD_DIR_${s}} NAME)
endif() endif()
list(APPEND overlay_candidates "${ZMK_CONFIG}/${s}_${BOARD}.overlay") list(APPEND overlay_candidates "${ZMK_CONFIG}/${s}_${BOARD}.overlay")