Skip to content

fix(keymap): restore no_init param dropped in refil #3047 cherry-pick #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheRickyZhang wants to merge 2 commits into
base: adv360-z3.5-2
Choose a base branch
from
Open

fix(keymap): restore no_init param dropped in refil #3047 cherry-pick #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
162f65a
fix(keymap): restore no_init param dropped in refil #3047 cherry-pick
TheRickyZhang Jul 18, 2026
3d3db87
fix(keymap): call reload_from_stock_keymap in keymap_init for Studio …
TheRickyZhang Jul 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/src/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,16 @@ static uint8_t keymap_layer_orders[ZMK_KEYMAP_LAYERS_LEN];

#endif // IS_ENABLED(CONFIG_ZMK_KEYMAP_LAYER_REORDERING)

#define KEYMAP_VAR(_name, _opts) \
#define KEYMAP_VAR(_name, _opts, no_init) \
static _opts struct zmk_behavior_binding _name[ZMK_KEYMAP_LAYERS_LEN][ZMK_KEYMAP_LEN] = { \
COND_CODE_0(no_init, (ZMK_KEYMAP_LAYERS_FOREACH_SEP(TRANSFORMED_LAYER, (, ))), (0))};

KEYMAP_VAR(zmk_keymap, COND_CODE_1(IS_ENABLED(CONFIG_ZMK_KEYMAP_SETTINGS_STORAGE), (), (const)))
KEYMAP_VAR(zmk_keymap, COND_CODE_1(IS_ENABLED(CONFIG_ZMK_KEYMAP_SETTINGS_STORAGE), (), (const)),
IS_ENABLED(CONFIG_ZMK_STUDIO))

#if IS_ENABLED(CONFIG_ZMK_KEYMAP_SETTINGS_STORAGE)

KEYMAP_VAR(zmk_stock_keymap, const)
KEYMAP_VAR(zmk_stock_keymap, const, 0)

static char zmk_keymap_layer_names[ZMK_KEYMAP_LAYERS_LEN][CONFIG_ZMK_KEYMAP_LAYER_NAME_MAX_LEN] = {
ZMK_KEYMAP_LAYERS_FOREACH_SEP(LAYER_NAME, (, ))};
Expand Down Expand Up @@ -953,6 +954,9 @@ int keymap_init(void) {
#if IS_ENABLED(CONFIG_ZMK_KEYMAP_LAYER_REORDERING)
load_stock_keymap_layer_ordering();
#endif
#if IS_ENABLED(CONFIG_ZMK_STUDIO)
reload_from_stock_keymap();
#endif

return 0;
}
Expand Down