Skip to content

Commit e552bb0

Browse files
zvecrcoquizen
authored andcommitted
Remove some use of keymap.h (qmk#19980)
1 parent 7b4e321 commit e552bb0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+75
-69
lines changed

lib/python/qmk/cli/generate/keycodes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def generate_keycode_extras(cli):
143143
"""
144144

145145
# Build the header file.
146-
keycodes_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once', '#include "keymap.h"', '// clang-format off']
146+
keycodes_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once', '#include "keycodes.h"', '// clang-format off']
147147

148148
keycodes = load_spec(cli.args.version, cli.args.lang)
149149

quantum/keymap.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3030

3131
#include "quantum_keycodes.h"
3232

33-
// translates key to keycode
34-
uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
33+
#include "keymap_common.h"
3534

3635
#ifdef ENCODER_MAP_ENABLE
3736
// Ensure we have a forward declaration for the encoder map

quantum/keymap_common.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Copyright 2023 QMK
2+
// SPDX-License-Identifier: GPL-2.0-or-later
3+
4+
#pragma once
5+
6+
// translates key to keycode
7+
uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);

quantum/keymap_extras/keymap_belgian.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*******************************************************************************/
2525

2626
#pragma once
27-
#include "keymap.h"
27+
#include "keycodes.h"
2828
// clang-format off
2929

3030
// Aliases

quantum/keymap_extras/keymap_bepo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*******************************************************************************/
2525

2626
#pragma once
27-
#include "keymap.h"
27+
#include "keycodes.h"
2828
// clang-format off
2929

3030
// Aliases

quantum/keymap_extras/keymap_brazilian_abnt2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*******************************************************************************/
2525

2626
#pragma once
27-
#include "keymap.h"
27+
#include "keycodes.h"
2828
// clang-format off
2929

3030
// Aliases

quantum/keymap_extras/keymap_canadian_multilingual.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*******************************************************************************/
2525

2626
#pragma once
27-
#include "keymap.h"
27+
#include "keycodes.h"
2828
// clang-format off
2929

3030
// Aliases

quantum/keymap_extras/keymap_colemak.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*******************************************************************************/
2525

2626
#pragma once
27-
#include "keymap.h"
27+
#include "keycodes.h"
2828
// clang-format off
2929

3030
// Aliases

quantum/keymap_extras/keymap_croatian.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*******************************************************************************/
2525

2626
#pragma once
27-
#include "keymap.h"
27+
#include "keycodes.h"
2828
// clang-format off
2929

3030
// Aliases

quantum/keymap_extras/keymap_czech.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*******************************************************************************/
2525

2626
#pragma once
27-
#include "keymap.h"
27+
#include "keycodes.h"
2828
// clang-format off
2929

3030
// Aliases

0 commit comments

Comments
 (0)