Merge remote-tracking branch 'origin/develop' into xap

2024-12-04 17:05:17 +00:00 · 2023-03-03 11:27:28 +00:00 · 2023-03-03 11:27:28 +00:00 · 578b3981be
commit 578b3981be
parent aa6881b8c6 c3c40dfda8
69 changed files with 75 additions and 69 deletions
--- a/lib/python/qmk/cli/generate/keycodes.py
+++ b/lib/python/qmk/cli/generate/keycodes.py
@ -143,7 +143,7 @@ def generate_keycode_extras(cli):
    """
    # Build the header file.
-    keycodes_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once', '#include "keymap.h"', '// clang-format off']
+    keycodes_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once', '#include "keycodes.h"', '// clang-format off']
    keycodes = load_spec(cli.args.version, cli.args.lang)
--- 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
+#include "keymap_common.h"
 uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
 #ifdef ENCODER_MAP_ENABLE
 // Ensure we have a forward declaration for the encoder map
--- a/quantum/keymap_common.h
+++ b/quantum/keymap_common.h
@ -0,0 +1,7 @@
 // Copyright 2023 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 // translates key to keycode
 uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/quantum/keymap_extras/keymap_italian.h
+++ b/quantum/keymap_extras/keymap_italian.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_italian_mac_ansi.h
+++ b/quantum/keymap_extras/keymap_italian_mac_ansi.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_italian_mac_iso.h
+++ b/quantum/keymap_extras/keymap_italian_mac_iso.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_japanese.h
+++ b/quantum/keymap_extras/keymap_japanese.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_korean.h
+++ b/quantum/keymap_extras/keymap_korean.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_latvian.h
+++ b/quantum/keymap_extras/keymap_latvian.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_lithuanian_azerty.h
+++ b/quantum/keymap_extras/keymap_lithuanian_azerty.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_lithuanian_qwerty.h
+++ b/quantum/keymap_extras/keymap_lithuanian_qwerty.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_neo2.h
+++ b/quantum/keymap_extras/keymap_neo2.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_nordic.h
+++ b/quantum/keymap_extras/keymap_nordic.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_norman.h
+++ b/quantum/keymap_extras/keymap_norman.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_norwegian.h
+++ b/quantum/keymap_extras/keymap_norwegian.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_plover.h
+++ b/quantum/keymap_extras/keymap_plover.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_plover_dvorak.h
+++ b/quantum/keymap_extras/keymap_plover_dvorak.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_polish.h
+++ b/quantum/keymap_extras/keymap_polish.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_portuguese.h
+++ b/quantum/keymap_extras/keymap_portuguese.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_portuguese_mac_iso.h
+++ b/quantum/keymap_extras/keymap_portuguese_mac_iso.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_romanian.h
+++ b/quantum/keymap_extras/keymap_romanian.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_russian.h
+++ b/quantum/keymap_extras/keymap_russian.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_serbian.h
+++ b/quantum/keymap_extras/keymap_serbian.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_serbian_latin.h
+++ b/quantum/keymap_extras/keymap_serbian_latin.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_slovak.h
+++ b/quantum/keymap_extras/keymap_slovak.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_slovenian.h
+++ b/quantum/keymap_extras/keymap_slovenian.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_spanish.h
+++ b/quantum/keymap_extras/keymap_spanish.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_spanish_dvorak.h
+++ b/quantum/keymap_extras/keymap_spanish_dvorak.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_steno.h
+++ b/quantum/keymap_extras/keymap_steno.h
@ -16,7 +16,7 @@
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // List of keycodes for the steno keyboard. To prevent
 // errors, this must be <= 42 total entries in order to
--- a/quantum/keymap_extras/keymap_swedish.h
+++ b/quantum/keymap_extras/keymap_swedish.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_swedish_mac_ansi.h
+++ b/quantum/keymap_extras/keymap_swedish_mac_ansi.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_swedish_mac_iso.h
+++ b/quantum/keymap_extras/keymap_swedish_mac_iso.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h
+++ b/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h
+++ b/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_swiss_de.h
+++ b/quantum/keymap_extras/keymap_swiss_de.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_swiss_fr.h
+++ b/quantum/keymap_extras/keymap_swiss_fr.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_turkish_f.h
+++ b/quantum/keymap_extras/keymap_turkish_f.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_turkish_q.h
+++ b/quantum/keymap_extras/keymap_turkish_q.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_uk.h
+++ b/quantum/keymap_extras/keymap_uk.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_ukrainian.h
+++ b/quantum/keymap_extras/keymap_ukrainian.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_us.h
+++ b/quantum/keymap_extras/keymap_us.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_us_extended.h
+++ b/quantum/keymap_extras/keymap_us_extended.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_us_international.h
+++ b/quantum/keymap_extras/keymap_us_international.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_us_international_linux.h
+++ b/quantum/keymap_extras/keymap_us_international_linux.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_workman.h
+++ b/quantum/keymap_extras/keymap_workman.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases
--- a/quantum/keymap_extras/keymap_workman_zxcvm.h
+++ b/quantum/keymap_extras/keymap_workman_zxcvm.h
@ -24,7 +24,7 @@
 *******************************************************************************/
 #pragma once
-#include "keymap.h"
+#include "keycodes.h"
 // clang-format off
 // Aliases