summaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
Diffstat (limited to 'quantum')
-rw-r--r--quantum/bootmagic/magic.c2
-rw-r--r--quantum/command.c1
-rw-r--r--quantum/dynamic_keymap.c2
-rw-r--r--quantum/keymap.h3
-rw-r--r--quantum/keymap_common.h9
-rw-r--r--quantum/keymap_extras/keymap_belgian.h2
-rw-r--r--quantum/keymap_extras/keymap_bepo.h2
-rw-r--r--quantum/keymap_extras/keymap_brazilian_abnt2.h2
-rw-r--r--quantum/keymap_extras/keymap_canadian_multilingual.h2
-rw-r--r--quantum/keymap_extras/keymap_colemak.h2
-rw-r--r--quantum/keymap_extras/keymap_croatian.h2
-rw-r--r--quantum/keymap_extras/keymap_czech.h2
-rw-r--r--quantum/keymap_extras/keymap_danish.h2
-rw-r--r--quantum/keymap_extras/keymap_dvorak.h2
-rw-r--r--quantum/keymap_extras/keymap_dvorak_fr.h2
-rw-r--r--quantum/keymap_extras/keymap_dvorak_programmer.h2
-rw-r--r--quantum/keymap_extras/keymap_estonian.h2
-rw-r--r--quantum/keymap_extras/keymap_finnish.h2
-rw-r--r--quantum/keymap_extras/keymap_french.h2
-rw-r--r--quantum/keymap_extras/keymap_french_afnor.h2
-rw-r--r--quantum/keymap_extras/keymap_french_mac_iso.h2
-rw-r--r--quantum/keymap_extras/keymap_german.h2
-rw-r--r--quantum/keymap_extras/keymap_german_mac_iso.h2
-rw-r--r--quantum/keymap_extras/keymap_greek.h2
-rw-r--r--quantum/keymap_extras/keymap_hebrew.h2
-rw-r--r--quantum/keymap_extras/keymap_hungarian.h2
-rw-r--r--quantum/keymap_extras/keymap_icelandic.h2
-rw-r--r--quantum/keymap_extras/keymap_irish.h2
-rw-r--r--quantum/keymap_extras/keymap_italian.h2
-rw-r--r--quantum/keymap_extras/keymap_italian_mac_ansi.h2
-rw-r--r--quantum/keymap_extras/keymap_italian_mac_iso.h2
-rw-r--r--quantum/keymap_extras/keymap_japanese.h2
-rw-r--r--quantum/keymap_extras/keymap_korean.h2
-rw-r--r--quantum/keymap_extras/keymap_latvian.h2
-rw-r--r--quantum/keymap_extras/keymap_lithuanian_azerty.h2
-rw-r--r--quantum/keymap_extras/keymap_lithuanian_qwerty.h2
-rw-r--r--quantum/keymap_extras/keymap_neo2.h2
-rw-r--r--quantum/keymap_extras/keymap_nordic.h2
-rw-r--r--quantum/keymap_extras/keymap_norman.h2
-rw-r--r--quantum/keymap_extras/keymap_norwegian.h2
-rw-r--r--quantum/keymap_extras/keymap_plover.h2
-rw-r--r--quantum/keymap_extras/keymap_plover_dvorak.h2
-rw-r--r--quantum/keymap_extras/keymap_polish.h2
-rw-r--r--quantum/keymap_extras/keymap_portuguese.h2
-rw-r--r--quantum/keymap_extras/keymap_portuguese_mac_iso.h2
-rw-r--r--quantum/keymap_extras/keymap_romanian.h2
-rw-r--r--quantum/keymap_extras/keymap_russian.h2
-rw-r--r--quantum/keymap_extras/keymap_serbian.h2
-rw-r--r--quantum/keymap_extras/keymap_serbian_latin.h2
-rw-r--r--quantum/keymap_extras/keymap_slovak.h2
-rw-r--r--quantum/keymap_extras/keymap_slovenian.h2
-rw-r--r--quantum/keymap_extras/keymap_spanish.h2
-rw-r--r--quantum/keymap_extras/keymap_spanish_dvorak.h2
-rw-r--r--quantum/keymap_extras/keymap_steno.h2
-rw-r--r--quantum/keymap_extras/keymap_swedish.h2
-rw-r--r--quantum/keymap_extras/keymap_swedish_mac_ansi.h2
-rw-r--r--quantum/keymap_extras/keymap_swedish_mac_iso.h2
-rw-r--r--quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h2
-rw-r--r--quantum/keymap_extras/keymap_swedish_pro_mac_iso.h2
-rw-r--r--quantum/keymap_extras/keymap_swiss_de.h2
-rw-r--r--quantum/keymap_extras/keymap_swiss_fr.h2
-rw-r--r--quantum/keymap_extras/keymap_turkish_f.h2
-rw-r--r--quantum/keymap_extras/keymap_turkish_q.h2
-rw-r--r--quantum/keymap_extras/keymap_uk.h2
-rw-r--r--quantum/keymap_extras/keymap_ukrainian.h2
-rw-r--r--quantum/keymap_extras/keymap_us.h2
-rw-r--r--quantum/keymap_extras/keymap_us_extended.h2
-rw-r--r--quantum/keymap_extras/keymap_us_international.h2
-rw-r--r--quantum/keymap_extras/keymap_us_international_linux.h2
-rw-r--r--quantum/keymap_extras/keymap_workman.h2
-rw-r--r--quantum/keymap_extras/keymap_workman_zxcvm.h2
-rw-r--r--quantum/keymap_introspection.h1
72 files changed, 79 insertions, 71 deletions
diff --git a/quantum/bootmagic/magic.c b/quantum/bootmagic/magic.c
index f1cb11c395..d68df3fa58 100644
--- a/quantum/bootmagic/magic.c
+++ b/quantum/bootmagic/magic.c
@@ -19,7 +19,7 @@
#include "matrix.h"
#include "bootloader.h"
#include "debug.h"
-#include "keymap.h"
+#include "keycode_config.h"
#include "host.h"
#include "action_layer.h"
#include "eeconfig.h"
diff --git a/quantum/command.c b/quantum/command.c
index 84757b9b01..aa64b75064 100644
--- a/quantum/command.c
+++ b/quantum/command.c
@@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "wait.h"
#include "keycode.h"
#include "host.h"
-#include "keymap.h"
#include "print.h"
#include "debug.h"
#include "util.h"
diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index c406be4585..90a0f20838 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "keymap.h" // to get keymaps[][][]
+#include "keymap_introspection.h" // to get keymaps[][][]
#include "eeprom.h"
#include "progmem.h" // to read default from flash
#include "quantum.h" // for send_string()
diff --git a/quantum/keymap.h b/quantum/keymap.h
index 0225f53362..1263ef188b 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -30,8 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "quantum_keycodes.h"
-// translates key to keycode
-uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
+#include "keymap_common.h"
#ifdef ENCODER_MAP_ENABLE
// Ensure we have a forward declaration for the encoder map
diff --git a/quantum/keymap_common.h b/quantum/keymap_common.h
new file mode 100644
index 0000000000..20e70263f3
--- /dev/null
+++ b/quantum/keymap_common.h
@@ -0,0 +1,9 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+
+// translates key to keycode
+uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
diff --git a/quantum/keymap_extras/keymap_belgian.h b/quantum/keymap_extras/keymap_belgian.h
index 1bf9549c5a..6851c6b4e8 100644
--- a/quantum/keymap_extras/keymap_belgian.h
+++ b/quantum/keymap_extras/keymap_belgian.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_bepo.h b/quantum/keymap_extras/keymap_bepo.h
index 12026ce649..448727dece 100644
--- a/quantum/keymap_extras/keymap_bepo.h
+++ b/quantum/keymap_extras/keymap_bepo.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_brazilian_abnt2.h b/quantum/keymap_extras/keymap_brazilian_abnt2.h
index 70a09a52be..8fac7666c2 100644
--- a/quantum/keymap_extras/keymap_brazilian_abnt2.h
+++ b/quantum/keymap_extras/keymap_brazilian_abnt2.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_canadian_multilingual.h b/quantum/keymap_extras/keymap_canadian_multilingual.h
index 44009f3aa2..5b9b03babb 100644
--- a/quantum/keymap_extras/keymap_canadian_multilingual.h
+++ b/quantum/keymap_extras/keymap_canadian_multilingual.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_colemak.h b/quantum/keymap_extras/keymap_colemak.h
index 5cb86bf441..d63309f010 100644
--- a/quantum/keymap_extras/keymap_colemak.h
+++ b/quantum/keymap_extras/keymap_colemak.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_croatian.h b/quantum/keymap_extras/keymap_croatian.h
index 1115592e17..3e7c681ced 100644
--- a/quantum/keymap_extras/keymap_croatian.h
+++ b/quantum/keymap_extras/keymap_croatian.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_czech.h b/quantum/keymap_extras/keymap_czech.h
index 02692002e3..351c51ad41 100644
--- a/quantum/keymap_extras/keymap_czech.h
+++ b/quantum/keymap_extras/keymap_czech.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_danish.h b/quantum/keymap_extras/keymap_danish.h
index 18107ccd53..cea9444896 100644
--- a/quantum/keymap_extras/keymap_danish.h
+++ b/quantum/keymap_extras/keymap_danish.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_dvorak.h b/quantum/keymap_extras/keymap_dvorak.h
index 5767530b3b..9205a72057 100644
--- a/quantum/keymap_extras/keymap_dvorak.h
+++ b/quantum/keymap_extras/keymap_dvorak.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_dvorak_fr.h b/quantum/keymap_extras/keymap_dvorak_fr.h
index 60675fbf13..b206767614 100644
--- a/quantum/keymap_extras/keymap_dvorak_fr.h
+++ b/quantum/keymap_extras/keymap_dvorak_fr.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_dvorak_programmer.h b/quantum/keymap_extras/keymap_dvorak_programmer.h
index 6e1ae17807..19187ed13b 100644
--- a/quantum/keymap_extras/keymap_dvorak_programmer.h
+++ b/quantum/keymap_extras/keymap_dvorak_programmer.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_estonian.h b/quantum/keymap_extras/keymap_estonian.h
index 462bcde429..ea9c56c12a 100644
--- a/quantum/keymap_extras/keymap_estonian.h
+++ b/quantum/keymap_extras/keymap_estonian.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_finnish.h b/quantum/keymap_extras/keymap_finnish.h
index 7e94896e2e..c0dc1af81e 100644
--- a/quantum/keymap_extras/keymap_finnish.h
+++ b/quantum/keymap_extras/keymap_finnish.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_french.h b/quantum/keymap_extras/keymap_french.h
index da9467a475..03dbb7bc40 100644
--- a/quantum/keymap_extras/keymap_french.h
+++ b/quantum/keymap_extras/keymap_french.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_french_afnor.h b/quantum/keymap_extras/keymap_french_afnor.h
index 259e0a30f4..869984c4d2 100644
--- a/quantum/keymap_extras/keymap_french_afnor.h
+++ b/quantum/keymap_extras/keymap_french_afnor.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_french_mac_iso.h b/quantum/keymap_extras/keymap_french_mac_iso.h
index 9a8ed72604..e5f7514a80 100644
--- a/quantum/keymap_extras/keymap_french_mac_iso.h
+++ b/quantum/keymap_extras/keymap_french_mac_iso.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_german.h b/quantum/keymap_extras/keymap_german.h
index 251491fb81..38b0c685ba 100644
--- a/quantum/keymap_extras/keymap_german.h
+++ b/quantum/keymap_extras/keymap_german.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_german_mac_iso.h b/quantum/keymap_extras/keymap_german_mac_iso.h
index de7b60546b..efa9099f20 100644
--- a/quantum/keymap_extras/keymap_german_mac_iso.h
+++ b/quantum/keymap_extras/keymap_german_mac_iso.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_greek.h b/quantum/keymap_extras/keymap_greek.h
index b4f5b5c5b3..01779cf2e8 100644
--- a/quantum/keymap_extras/keymap_greek.h
+++ b/quantum/keymap_extras/keymap_greek.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_hebrew.h b/quantum/keymap_extras/keymap_hebrew.h
index 372d7f2e93..284562072d 100644
--- a/quantum/keymap_extras/keymap_hebrew.h
+++ b/quantum/keymap_extras/keymap_hebrew.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_hungarian.h b/quantum/keymap_extras/keymap_hungarian.h
index 591d71c09c..fbc31ed155 100644
--- a/quantum/keymap_extras/keymap_hungarian.h
+++ b/quantum/keymap_extras/keymap_hungarian.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_icelandic.h b/quantum/keymap_extras/keymap_icelandic.h
index 800899b515..3bd71c19f2 100644
--- a/quantum/keymap_extras/keymap_icelandic.h
+++ b/quantum/keymap_extras/keymap_icelandic.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_irish.h b/quantum/keymap_extras/keymap_irish.h
index 2cd63a48e3..6e161628c8 100644
--- a/quantum/keymap_extras/keymap_irish.h
+++ b/quantum/keymap_extras/keymap_irish.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"
+#include "keycodes.h"
// clang-format off
// Aliases
diff --git a/quantum/keymap_extras/keymap_italian.h b/quantum/keymap_extras/keymap_italian.h
index 95f3348f63..8092dc1301 100644
--- a/quantum/keymap_extras/keymap_italian.h
+++ b/quantum/keymap_extras/keymap_italian.h
@@ -24,7 +24,7 @@
*******************************************************************************/
#pragma once
-#include "keymap.h"</