zmkfirmware
/
zmk
mirror of https://github.com/zmkfirmware/zmk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: move boot_magic_combo to boot folder

This commit is contained in:
Ryan Adolf 2026-02-01 16:19:14 -06:00
parent 8b1eb38bed
commit f9eb39d561
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/CMakeLists.txt
View File

@ -105,7 +105,6 @@ target_sources_ifdef(CONFIG_ZMK_USB app PRIVATE src/usb_hid.c)
target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/rgb_underglow.c)
target_sources_ifdef(CONFIG_ZMK_BACKLIGHT app PRIVATE src/backlight.c)
target_sources_ifdef(CONFIG_ZMK_LOW_PRIORITY_WORK_QUEUE app PRIVATE src/workqueue.c)
target_sources_ifdef(CONFIG_ZMK_BOOT_MAGIC_COMBO app PRIVATE src/boot_magic_combo.c)
target_sources(app PRIVATE src/main.c)
add_subdirectory(src/display/)

1
app/src/boot/CMakeLists.txt
View File

@ -2,3 +2,4 @@
target_sources_ifdef(CONFIG_ZMK_BOOTMODE_TO_MAGIC_VALUE_MAPPER app PRIVATE bootmode_to_magic_mapper.c)
target_sources_ifdef(CONFIG_ZMK_DBL_TAP_BOOTLOADER app PRIVATE dbl_tap_bootloader.c)
target_sources_ifdef(CONFIG_ZMK_BOOT_STM32_ENFORCE_NBOOT_SEL app PRIVATE stm32_enforce_nboot_sel.c)
target_sources_ifdef(CONFIG_ZMK_BOOT_MAGIC_COMBO app PRIVATE boot_magic_combo.c)

5
app/src/boot_magic_combo.c → app/src/boot/boot_magic_combo.c
View File

@ -41,9 +41,8 @@ struct boot_key_config {
static const uint16_t boot_key_combo_positions_##n[] = DT_INST_PROP(n, combo_positions);
#define BOOT_KEY_CONFIG(n) \
BOOT_KEY_COMBO_POSITIONS(n) \
{ \
.combo_positions = boot_key_combo_positions_##n, \
BOOT_KEY_COMBO_POSITIONS(n){ \
.combo_positions = boot_key_combo_positions_##n, \
.combo_positions_len = DT_INST_PROP_LEN(n, combo_positions), \
.jump_to_bootloader = DT_INST_PROP_OR(n, jump_to_bootloader, false), \
.reset_settings = DT_INST_PROP_OR(n, reset_settings, false), \