From b6d46cdc47d420d80c2c15e62c2b70c771166687 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 9 Feb 2026 00:59:34 +0000 Subject: Allow json keymaps to include a user provided keymap.h (#25987) --- lib/python/qmk/cli/generate/keymap_h.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/python/qmk/cli/generate/keymap_h.py b/lib/python/qmk/cli/generate/keymap_h.py index a3aaa405c0..10be16391a 100644 --- a/lib/python/qmk/cli/generate/keymap_h.py +++ b/lib/python/qmk/cli/generate/keymap_h.py @@ -43,6 +43,13 @@ def generate_keymap_h(cli): keymap_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once', '// clang-format off'] + # Allow a potential keymap level keymap.h for items like user defined keycode aliases used within a keymap.json keymap + keymap_h_lines += [ + '#if __has_include_next("keymap.h")', + '# include_next "keymap.h"', + '#endif', + ] + keymap_json = parse_configurator_json(cli.args.filename) if 'keycodes' in keymap_json and keymap_json['keycodes'] is not None: -- cgit v1.2.3