mirror of
https://github.com/zmkfirmware/zmk.git
synced 2026-03-19 20:45:18 -05:00
refactor(core): Adjust our approach for upstream Zephyr boards Move to using proper HWMv2 board extensions https://docs.zephyrproject.org/4.1.0/hardware/porting/board_porting.html#board-extensions for extending upstream Zephyr boards for use with ZMK. With this change, using upstream Zephyr board IDs directly, e.g. `seeeduino_xiao` will be stock versions as found upstream. To use a board variant that is tuned for ZMK use, use the `zmk` variant, e.g. `seeeduino_xiao//zmk` which is shorthand for `seeeduino_xiao/samd21g18a/zmk`. refactor(boards): Move to ZMK specific variants for the nRFMicro board For consistency, adjust the nRFMicro board definition to offer a "vanilla" Zephyr board, and then ZMK variants, e.g. `nrfmicro/nrf52840/zmk`. refactor(boards): Move to ZMK specific variant for the bluemicro840 board For consistency, adjust the bluemicro840 board definition to offer a "vanilla" Zephyr board, and then ZMK variant, e.g. `bluemicro840//zmk`. refactor(boards): Make tofu65 to ZMK variant by default Make the standard Tofu65 board ID be `tofu65/rp2040/zmk` or `tofu65//zmk` by shorthand. refactor(boards): Move BDN9 to ZMK variant by default Make the standard BDN9 board ID be `bdn9/stm32f072xb/zmk` or `bdn9//zmk` by shorthand. refactor(boards): Move Puchi BLE to ZMK variant by default Make the standard Puchi BLE board ID be `puchi_ble/nrf52840/zmk` or `puchi_ble//zmk` by shorthand. refactor(boards): Move Adv360 Pro to ZMK variant by default Make the standard Adv360 Pro board ID be `adv360pro_left/nrf52840/zmk` or `adv360pro_left//zmk` by shorthand and for right as well. refactor(boards): Move nRF52840 M2 to ZMK variant by default Make the standard nRF52840 M2 board ID be `nrf52840_m2/nrf52840/zmk` or `nrf52840_m2//zmk` by shorthand. refactor(boards): Move Pillbug to ZMK variant by default Make the standard Pillbug board ID be `pillbug/nrf52840/zmk` or `pillbug//zmk` by shorthand. refactor(boards): Move s40nc to ZMK variant by default Make the standard s40nc board ID be `s40nc/nrf52840/zmk` or `s40nc//zmk` by shorthand. refactor(boards): Move nice!60 to ZMK variant by default Make the standard nice!60 board ID be `nice60/nrf52840/zmk` or `nice60//zmk` by shorthand. refactor(boards): Move planck to ZMK variant by default Make the standard planck board ID be `planck/stm32f303xc/zmk` or `planck//zmk` by shorthand. refactor(boards): Move preonic to ZMK variant by default Make the standard preonic board ID be `preonic/stm32f303xc/zmk` or `preonic//zmk` by shorthand. refactor(boards): Move ferris to ZMK variant by default Make the standard ferris board ID be `ferris/stm32f072xb/zmk` or `ferris//zmk` by shorthand. refactor(boards): Move Proton-C to ZMK variant by default Make the standard Proton-C board ID be `proton_c/stm32f303xc/zmk` or `proton_c//zmk` by shorthand. refactor(boards): Move Corneish Zen to ZMK variant by default Make the standard Corneish Zen board ID be `corneish_zen_left/nrf52840/zmk` or `corneish_zen_left//zmk` by shorthand and for right as well. refactor(boards): Move nice!nano to ZMK variant by default Make the standard nice!nano board ID be `nice_nano/nrf52840/zmk` or `nice_nano//zmk` by shorthand. refactor(boards): Move mikoto to ZMK variant by default Make the standard mikoto board ID be `mikoto/nrf52840/zmk` or `mikoto//zmk` by shorthand. refactor(boards): Move Polarity Works boards to ZMK variants Make the standard Polarity Works board IDs be `zmk` variants. doc: Update docs/blog post to reference ZMK variants * Update Zephyr 4.1 blog post to mention ZMK variants * Add note to hardware support page about variants docs: Fix up shield board overlays for new board IDs Adjust our documentation to properly use the correct qualified board overlay file names that match our new board conventions.
101 lines
4.2 KiB
CMake
101 lines
4.2 KiB
CMake
# TODO: Check for env or command line "ZMK_CONFIG" setting.
|
|
# * That directory should load
|
|
# * defconfigs,
|
|
# * .conf file,
|
|
# * single overlay,
|
|
# * or per board/shield.
|
|
|
|
list(APPEND KEYMAP_DIRS "${BOARD_DIRECTORIES}")
|
|
get_filename_component(BOARD_DIR_NAME ${BOARD_DIR} NAME)
|
|
# Give a shield like `kyria_rev2_left` we want to use `kyria_rev2` and `kyria` as candidate names for
|
|
# overlay/conf/keymap files.
|
|
if(DEFINED SHIELD)
|
|
list(APPEND KEYMAP_DIRS ${SHIELD_DIRS})
|
|
foreach(s ${SHIELD_AS_LIST})
|
|
if (DEFINED SHIELD_DIR_${s})
|
|
get_filename_component(shield_dir_name ${SHIELD_DIR_${s}} NAME)
|
|
list(APPEND shield_candidate_names ${shield_dir_name})
|
|
endif()
|
|
string(REPLACE "_" ";" S_PIECES ${s})
|
|
list(LENGTH S_PIECES S_PIECES_LEN)
|
|
while(NOT S_PIECES STREQUAL "")
|
|
list(POP_BACK S_PIECES)
|
|
list(JOIN S_PIECES "_" s_substr)
|
|
if ("${s_substr}" STREQUAL "" OR "${s_substr}" STREQUAL "${shield_dir_name}")
|
|
break()
|
|
endif()
|
|
list(APPEND shield_candidate_names ${s_substr})
|
|
endwhile()
|
|
endforeach()
|
|
endif()
|
|
|
|
if (ZMK_CONFIG)
|
|
if (EXISTS ${ZMK_CONFIG})
|
|
message(STATUS "ZMK Config directory: ${ZMK_CONFIG}")
|
|
list(PREPEND KEYMAP_DIRS "${ZMK_CONFIG}")
|
|
|
|
if (DEFINED SHIELD)
|
|
foreach (s ${shield_candidate_names} ${SHIELD_AS_LIST})
|
|
if (DEFINED ${SHIELD_DIR_${s}})
|
|
get_filename_component(shield_dir_name ${SHIELD_DIR_${s}} NAME)
|
|
endif()
|
|
list(APPEND overlay_candidates "${ZMK_CONFIG}/${s}_${BOARD}.overlay")
|
|
list(APPEND overlay_candidates "${ZMK_CONFIG}/${s}.overlay")
|
|
if (NOT "${shield_dir_name}" STREQUAL "${s}")
|
|
list(APPEND config_candidates "${ZMK_CONFIG}/${shield_dir_name}_${BOARD}.conf")
|
|
list(APPEND config_candidates "${ZMK_CONFIG}/${shield_dir_name}.conf")
|
|
endif()
|
|
list(APPEND config_candidates "${ZMK_CONFIG}/${s}_${BOARD}.conf")
|
|
list(APPEND config_candidates "${ZMK_CONFIG}/${s}.conf")
|
|
endforeach()
|
|
endif()
|
|
|
|
# TODO: Board revisions?
|
|
list(APPEND overlay_candidates "${ZMK_CONFIG}/${BOARD_DIR_NAME}.overlay")
|
|
list(APPEND overlay_candidates "${ZMK_CONFIG}/${BOARD}.overlay")
|
|
list(APPEND overlay_candidates "${ZMK_CONFIG}/default.overlay")
|
|
list(APPEND config_candidates "${ZMK_CONFIG}/${BOARD_DIR_NAME}.conf")
|
|
list(APPEND config_candidates "${ZMK_CONFIG}/${BOARD}.conf")
|
|
list(APPEND config_candidates "${ZMK_CONFIG}/default.conf")
|
|
|
|
foreach(overlay ${overlay_candidates})
|
|
if (EXISTS "${overlay}")
|
|
message(STATUS "ZMK Config devicetree overlay: ${overlay}")
|
|
list(APPEND shield_dts_files "${overlay}")
|
|
break()
|
|
endif()
|
|
endforeach()
|
|
|
|
foreach(conf ${config_candidates})
|
|
if (EXISTS "${conf}")
|
|
message(STATUS "ZMK Config Kconfig: ${conf}")
|
|
list(APPEND shield_conf_files "${conf}")
|
|
endif()
|
|
endforeach()
|
|
else()
|
|
message(WARNING "Unable to locate ZMK config at: ${ZMK_CONFIG}")
|
|
endif()
|
|
endif()
|
|
|
|
|
|
if(NOT KEYMAP_FILE)
|
|
message("${NORMALIZED_BOARD_TARGET} for ${NORMALIZED_BOARD_QUALIFIERS} for ${BOARD} with version ${BOARD_REVISION}")
|
|
foreach(keymap_dir ${KEYMAP_DIRS})
|
|
foreach(keymap_prefix ${shield_candidate_names} ${SHIELD_AS_LIST} ${SHIELD_DIR} "${NORMALIZED_BOARD_TARGET}" "${BOARD}_${BOARD_REVISION_STRING}" ${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}")
|
|
set(EXTRA_DTC_OVERLAY_FILE ${KEYMAP_FILE})
|
|
break()
|
|
endif()
|
|
endforeach()
|
|
endforeach()
|
|
else()
|
|
message(STATUS "Using keymap file: ${KEYMAP_FILE}")
|
|
set(EXTRA_DTC_OVERLAY_FILE ${KEYMAP_FILE})
|
|
endif()
|
|
|
|
if (NOT KEYMAP_FILE)
|
|
message(WARNING "Failed to locate keymap file!")
|
|
endif()
|