From 4a8bd7b9a523601911ba467588b2a6a0aa693db6 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 15 May 2022 21:27:01 +1000 Subject: [PATCH] Rename keymap_extras headers for consistency (#16939) --- docs/reference_keymap_extras.md | 50 +++++++++---------- keyboards/ai03/jp60/keymaps/default/keymap.c | 2 +- keyboards/ai03/jp60/keymaps/via/keymap.c | 2 +- keyboards/aozora/keymaps/default_all/keymap.c | 2 +- keyboards/aozora/keymaps/via/keymap.c | 2 +- keyboards/barracuda/keymaps/default/keymap.c | 2 +- keyboards/barracuda/keymaps/via/keymap.c | 2 +- .../slice/rev1/keymaps/2moons/keymap.c | 2 +- .../basekeys/slice/rev1/keymaps/via/keymap.c | 2 +- .../rev1_rgb/keymaps/2moons_rgb/keymap.c | 2 +- .../ergo42/keymaps/biacco-winjp/keymap.c | 4 +- .../biacco42/ergo42/keymaps/hdbx/keymap.c | 4 +- .../biacco42/ergo42/keymaps/koba/keymap.c | 2 +- keyboards/buzzard/keymaps/crehmann/keymap.c | 2 +- keyboards/crkbd/keymaps/vayashiko/keymap.c | 2 +- keyboards/dz60/keymaps/default_abnt2/keymap.c | 2 +- .../keymaps/nathanvercaemert/keymap.c | 6 +-- .../gh60/revc/keymaps/default_abnt2/keymap.c | 2 +- .../gl516/a52gl/keymaps/salicylic/keymap.c | 2 +- .../gl516/j73gl/keymaps/default/keymap.c | 2 +- keyboards/gl516/j73gl/keymaps/via/keymap.c | 2 +- .../j73gl/keymaps/via_rgb_matrix/keymap.c | 2 +- .../gl516/n51gl/keymaps/salicylic/keymap.c | 2 +- keyboards/halfcliff/keymaps/default/keymap.c | 2 +- keyboards/halfcliff/keymaps/via/keymap.c | 2 +- .../baredev/rev1/keymaps/default/keymap.c | 2 +- .../baredev/rev1/keymaps/manoshu/keymap.c | 4 +- .../baredev/rev1/keymaps/via/keymap.c | 2 +- .../helix/rev2/keymaps/five_rows_jis/keymap.c | 2 +- .../helix/rev2/keymaps/froggy_106/keymap.c | 2 +- .../hhkb/ansi/keymaps/shela/keymap_jis2us.h | 2 +- keyboards/jones/v03/keymaps/default/keymap.c | 2 +- .../jones/v03/keymaps/default_jp/keymap.c | 2 +- .../jones/v03_1/keymaps/default_jp/keymap.c | 2 +- keyboards/jones/v1/keymaps/via/keymap.c | 2 +- .../kbdfans/kbd67/rev1/keymaps/koba/keymap.c | 2 +- .../kbdfans/kbd67/rev2/keymaps/koba/keymap.c | 2 +- .../bm40hsrgb/keymaps/wolff_abnt2/keymap.c | 2 +- keyboards/kudox/rev1/keymaps/jis/keymap.c | 2 +- keyboards/kudox/rev2/keymaps/jis/keymap.c | 2 +- keyboards/kudox/rev3/keymaps/jis/keymap.c | 2 +- keyboards/kudox_full/keymaps/jis/keymap.c | 2 +- keyboards/majistic/keymaps/default/keymap.c | 2 +- .../treadstone32/keymaps/default/keymap.c | 2 +- .../treadstone32/keymaps/like_jis/keymap.c | 2 +- keyboards/numatreus/keymaps/hdbx/keymap.c | 4 +- keyboards/numatreus/keymaps/like_jis/keymap.c | 2 +- .../ergodash/rev1/keymaps/m47ch4n/keymap.c | 2 +- .../runner3680/5x6_5x8/keymaps/jis/keymap.c | 2 +- .../omkbd/runner3680/5x8/keymaps/JIS/keymap.c | 2 +- keyboards/pico/65keys/keymaps/jis/keymap.c | 2 +- keyboards/pico/70keys/keymaps/jis/keymap.c | 2 +- keyboards/pisces/keymaps/default/keymap.c | 2 +- keyboards/pisces/keymaps/via/keymap.c | 2 +- keyboards/planck/keymaps/rai-suta/keymap.c | 2 +- keyboards/planck/keymaps/sigul/keymap.c | 2 +- .../squishytkl/keymaps/jis/keymap.c | 2 +- .../ramonimbao/wete/v1/keymaps/jis/keymap.c | 2 +- .../rate/pistachio/keymaps/default/keymap.c | 2 +- .../rate/pistachio/keymaps/rate/keymap.c | 2 +- keyboards/rate/pistachio/keymaps/via/keymap.c | 2 +- .../pistachio_pro/keymaps/default/keymap.c | 2 +- .../rate/pistachio_pro/keymaps/rate/keymap.c | 2 +- .../rate/pistachio_pro/keymaps/via/keymap.c | 2 +- .../nomu30/keymaps/center_sprit/keymap.c | 2 +- .../nomu30/keymaps/like_jis/keymap.c | 2 +- .../reviung33/keymaps/default_jp/keymap.c | 2 +- .../reviung34/keymaps/default_jp/keymap.c | 2 +- .../7skb/keymaps/salicylic/keymap.c | 2 +- .../7splus/keymaps/salicylic/keymap.c | 2 +- .../ajisai74/keymaps/jis/keymap.c | 2 +- .../ajisai74/keymaps/salicylic/keymap.c | 2 +- .../ergoarrows/keymaps/salicylic/keymap.c | 2 +- .../getta25/keymaps/oled/keymap.c | 2 +- .../jisplit89/keymaps/default/keymap.c | 2 +- .../jisplit89/keymaps/salicylic/keymap.c | 2 +- .../jisplit89/keymaps/via/keymap.c | 2 +- .../naked48/keymaps/salicylic/keymap.c | 2 +- .../keymaps/salicylic_with_nafuda/keymap.c | 2 +- .../keymaps/salicylic_with_setta21/keymap.c | 2 +- .../naked60/keymaps/salicylic/keymap.c | 2 +- .../keymaps/salicylic_with_nafuda/keymap.c | 2 +- .../keymaps/salicylic_with_setta21/keymap.c | 2 +- .../keymaps/default_with_setta21/keymap.c | 2 +- .../naked64/keymaps/salicylic/keymap.c | 2 +- .../keymaps/salicylic_with_setta21/keymap.c | 2 +- .../nknl7en/keymaps/salicylic/keymap.c | 2 +- .../nknl7jp/keymaps/default/keymap.c | 2 +- .../nknl7jp/keymaps/salicylic/keymap.c | 2 +- .../nknl7jp/keymaps/via/keymap.c | 2 +- .../setta21/keymaps/salicylic/keymap.c | 2 +- keyboards/satt/comet46/keymaps/satt/keymap.c | 2 +- keyboards/satt/vision/keymaps/satt/keymap.c | 2 +- .../satt/vision/keymaps/satt/keymap_jis2us.h | 2 +- .../heavy_left/keymaps/default/keymap.c | 2 +- .../keymaps/takashicompany/keymap.c | 2 +- .../heavy_left/keymaps/via/keymap.c | 2 +- .../namecard2x4/keymaps/brainfuck/keymap.c | 2 +- .../minivan/keymaps/like_jis/keymap.c | 2 +- .../community/ergodox/ishigoya-jp/keymap.c | 2 +- layouts/community/ergodox/kristian/keymap.c | 4 +- layouts/community/ergodox/osx_de/keymap.c | 2 +- .../ergodox/osx_de_adnw_koy/keymap.c | 6 +-- .../ergodox/osx_de_experimental/keymap.c | 4 +- layouts/community/ergodox/osx_fr/keymap.c | 2 +- .../60_abnt2/default_60_abnt2/keymap.c | 2 +- ...ap_br_abnt2.h => keymap_brazilian_abnt2.h} | 0 ...eymap_dvp.h => keymap_dvorak_programmer.h} | 0 ...p_french_osx.h => keymap_french_mac_iso.h} | 0 ...p_german_osx.h => keymap_german_mac_iso.h} | 0 ...n_osx_ansi.h => keymap_italian_mac_ansi.h} | 0 ...ian_osx_iso.h => keymap_italian_mac_iso.h} | 0 .../{keymap_jp.h => keymap_japanese.h} | 0 ..._osx_iso.h => keymap_portuguese_mac_iso.h} | 0 ...h_osx_ansi.h => keymap_swedish_mac_ansi.h} | 0 ...ish_osx_iso.h => keymap_swedish_mac_iso.h} | 0 ...x_ansi.h => keymap_swedish_pro_mac_ansi.h} | 0 ...osx_iso.h => keymap_swedish_pro_mac_iso.h} | 0 .../{keymap_german_ch.h => keymap_swiss_de.h} | 0 .../{keymap_fr_ch.h => keymap_swiss_fr.h} | 0 ...r_abnt2.h => sendstring_brazilian_abnt2.h} | 2 +- ...g_dvp.h => sendstring_dvorak_programmer.h} | 2 +- ...ench_osx.h => sendstring_french_mac_iso.h} | 2 +- ...rman_osx.h => sendstring_german_mac_iso.h} | 2 +- ...x_ansi.h => sendstring_italian_mac_ansi.h} | 2 +- ...osx_iso.h => sendstring_italian_mac_iso.h} | 2 +- ...sendstring_jis.h => sendstring_japanese.h} | 2 +- ..._iso.h => sendstring_portuguese_mac_iso.h} | 2 +- ...ring_german_ch.h => sendstring_swiss_de.h} | 2 +- ...ndstring_fr_ch.h => sendstring_swiss_fr.h} | 2 +- users/sigul/sigul.c | 2 +- 131 files changed, 151 insertions(+), 151 deletions(-) rename quantum/keymap_extras/{keymap_br_abnt2.h => keymap_brazilian_abnt2.h} (100%) rename quantum/keymap_extras/{keymap_dvp.h => keymap_dvorak_programmer.h} (100%) rename quantum/keymap_extras/{keymap_french_osx.h => keymap_french_mac_iso.h} (100%) rename quantum/keymap_extras/{keymap_german_osx.h => keymap_german_mac_iso.h} (100%) rename quantum/keymap_extras/{keymap_italian_osx_ansi.h => keymap_italian_mac_ansi.h} (100%) rename quantum/keymap_extras/{keymap_italian_osx_iso.h => keymap_italian_mac_iso.h} (100%) rename quantum/keymap_extras/{keymap_jp.h => keymap_japanese.h} (100%) rename quantum/keymap_extras/{keymap_portuguese_osx_iso.h => keymap_portuguese_mac_iso.h} (100%) rename quantum/keymap_extras/{keymap_swedish_osx_ansi.h => keymap_swedish_mac_ansi.h} (100%) rename quantum/keymap_extras/{keymap_swedish_osx_iso.h => keymap_swedish_mac_iso.h} (100%) rename quantum/keymap_extras/{keymap_swedish_pro_osx_ansi.h => keymap_swedish_pro_mac_ansi.h} (100%) rename quantum/keymap_extras/{keymap_swedish_pro_osx_iso.h => keymap_swedish_pro_mac_iso.h} (100%) rename quantum/keymap_extras/{keymap_german_ch.h => keymap_swiss_de.h} (100%) rename quantum/keymap_extras/{keymap_fr_ch.h => keymap_swiss_fr.h} (100%) rename quantum/keymap_extras/{sendstring_br_abnt2.h => sendstring_brazilian_abnt2.h} (99%) rename quantum/keymap_extras/{sendstring_dvp.h => sendstring_dvorak_programmer.h} (99%) rename quantum/keymap_extras/{sendstring_french_osx.h => sendstring_french_mac_iso.h} (99%) rename quantum/keymap_extras/{sendstring_german_osx.h => sendstring_german_mac_iso.h} (99%) rename quantum/keymap_extras/{sendstring_italian_osx_ansi.h => sendstring_italian_mac_ansi.h} (99%) rename quantum/keymap_extras/{sendstring_italian_osx_iso.h => sendstring_italian_mac_iso.h} (99%) rename quantum/keymap_extras/{sendstring_jis.h => sendstring_japanese.h} (99%) rename quantum/keymap_extras/{sendstring_portuguese_osx_iso.h => sendstring_portuguese_mac_iso.h} (99%) rename quantum/keymap_extras/{sendstring_german_ch.h => sendstring_swiss_de.h} (99%) rename quantum/keymap_extras/{sendstring_fr_ch.h => sendstring_swiss_fr.h} (99%) diff --git a/docs/reference_keymap_extras.md b/docs/reference_keymap_extras.md index 98be5c3669..b70d505f1f 100644 --- a/docs/reference_keymap_extras.md +++ b/docs/reference_keymap_extras.md @@ -36,20 +36,20 @@ These headers are located in [`quantum/keymap_extras/`](https://github.com/qmk/q |French (AFNOR) |`keymap_french_afnor.h` |`sendstring_french_afnor.h` | |French (BÉPO) |`keymap_bepo.h` |`sendstring_bepo.h` | |French (Belgium) |`keymap_belgian.h` |`sendstring_belgian.h` | -|French (Switzerland) |`keymap_fr_ch.h` |`sendstring_fr_ch.h` | -|French (macOS, ISO) |`keymap_french_osx.h` |`sendstring_french_osx.h` | +|French (Switzerland) |`keymap_swiss_fr.h` |`sendstring_swiss_fr.h` | +|French (macOS, ISO) |`keymap_french_mac_iso.h` |`sendstring_french_mac_iso.h` | |German |`keymap_german.h` |`sendstring_german.h` | -|German (Switzerland) |`keymap_german_ch.h` |`sendstring_german_ch.h` | -|German (macOS) |`keymap_german_osx.h` |`sendstring_german_osx.h` | +|German (Switzerland) |`keymap_swiss_de.h` |`sendstring_swiss_de.h` | +|German (macOS) |`keymap_german_mac_iso.h` |`sendstring_german_mac_iso.h` | |German (Neo2) |`keymap_neo2.h` | | |Greek |`keymap_greek.h` | | |Hebrew |`keymap_hebrew.h` | | |Hungarian |`keymap_hungarian.h` |`sendstring_hungarian.h` | |Icelandic |`keymap_icelandic.h` |`sendstring_icelandic.h` | |Italian |`keymap_italian.h` |`sendstring_italian.h` | -|Italian (macOS, ANSI) |`keymap_italian_osx_ansi.h` |`sendstring_italian_osx_ansi.h` | -|Italian (macOS, ISO) |`keymap_italian_osx_iso.h` |`sendstring_italian_osx_iso.h` | -|Japanese |`keymap_jp.h` |`sendstring_jis.h` | +|Italian (macOS, ANSI) |`keymap_italian_mac_ansi.h` |`sendstring_italian_mac_ansi.h` | +|Italian (macOS, ISO) |`keymap_italian_mac_iso.h` |`sendstring_italian_mac_iso.h` | +|Japanese |`keymap_japanese.h` |`sendstring_japanese.h` | |Korean |`keymap_korean.h` | | |Latvian |`keymap_latvian.h` |`sendstring_latvian.h` | |Lithuanian (ĄŽERTY) |`keymap_lithuanian_azerty.h` |`sendstring_lithuanian_azerty.h` | @@ -57,8 +57,8 @@ These headers are located in [`quantum/keymap_extras/`](https://github.com/qmk/q |Norwegian |`keymap_norwegian.h` |`sendstring_norwegian.h` | |Polish |`keymap_polish.h` | | |Portuguese |`keymap_portuguese.h` |`sendstring_portuguese.h` | -|Portuguese (macOS, ISO) |`keymap_portuguese_osx_iso.h` |`sendstring_portuguese_osx_iso.h` | -|Portuguese (Brazil) |`keymap_br_abnt2.h` |`sendstring_br_abnt2.h` | +|Portuguese (macOS, ISO) |`keymap_portuguese_mac_iso.h` |`sendstring_portuguese_mac_iso.h` | +|Portuguese (Brazil) |`keymap_brazilian_abnt2.h` |`sendstring_brazilian_abnt2.h` | |Romanian |`keymap_romanian.h` |`sendstring_romanian.h` | |Russian |`keymap_russian.h` | | |Serbian |`keymap_serbian.h` | | @@ -68,25 +68,25 @@ These headers are located in [`quantum/keymap_extras/`](https://github.com/qmk/q |Spanish |`keymap_spanish.h` |`sendstring_spanish.h` | |Spanish (Dvorak) |`keymap_spanish_dvorak.h` |`sendstring_spanish_dvorak.h` | |Swedish |`keymap_swedish.h` |`sendstring_swedish.h` | -|Swedish (macOS, ANSI) |`keymap_swedish_osx_ansi.h` | | -|Swedish (macOS, ISO) |`keymap_swedish_osx_iso.h` | | -|Swedish Pro (macOS, ANSI) |`keymap_swedish_pro_osx_ansi.h` | | -|Swedish Pro (macOS, ISO) |`keymap_swedish_pro_osx_iso.h` | | +|Swedish (macOS, ANSI) |`keymap_swedish_mac_ansi.h` | | +|Swedish (macOS, ISO) |`keymap_swedish_mac_iso.h` | | +|Swedish Pro (macOS, ANSI) |`keymap_swedish_pro_mac_ansi.h` | | +|Swedish Pro (macOS, ISO) |`keymap_swedish_pro_mac_iso.h` | | |Turkish (F) |`keymap_turkish_f.h` |`sendstring_turkish_f.h` | |Turkish (Q) |`keymap_turkish_q.h` |`sendstring_turkish_q.h` | |Ukrainian |`keymap_ukrainian.h` | | There are also a few which are not quite language-specific, but useful if you are not using a QWERTY layout: -|Layout |Keycodes Header |Sendstring LUT Header | -|-------------------|------------------------|----------------------------| -|Colemak |`keymap_colemak.h` |`sendstring_colemak.h` | -|Dvorak |`keymap_dvorak.h` |`sendstring_dvorak.h` | -|Dvorak (French) |`keymap_dvorak_fr.h` |`sendstring_dvorak_fr.h` | -|Dvorak (Programmer)|`keymap_dvp.h` |`sendstring_dvp.h` | -|Norman |`keymap_norman.h` |`sendstring_norman.h` | -|Plover |`keymap_plover.h` | | -|Plover (Dvorak) |`keymap_plover_dvorak.h`| | -|Steno |`keymap_steno.h` | | -|Workman |`keymap_workman.h` |`sendstring_workman.h` | -|Workman (ZXCVM) |`keymap_workman_zxcvm.h`|`sendstring_workman_zxcvm.h`| +|Layout |Keycodes Header |Sendstring LUT Header | +|-------------------|----------------------------|--------------------------------| +|Colemak |`keymap_colemak.h` |`sendstring_colemak.h` | +|Dvorak |`keymap_dvorak.h` |`sendstring_dvorak.h` | +|Dvorak (French) |`keymap_dvorak_fr.h` |`sendstring_dvorak_fr.h` | +|Dvorak (Programmer)|`keymap_dvorak_programmer.h`|`sendstring_dvorak_programmer.h`| +|Norman |`keymap_norman.h` |`sendstring_norman.h` | +|Plover |`keymap_plover.h` | | +|Plover (Dvorak) |`keymap_plover_dvorak.h` | | +|Steno |`keymap_steno.h` | | +|Workman |`keymap_workman.h` |`sendstring_workman.h` | +|Workman (ZXCVM) |`keymap_workman_zxcvm.h` |`sendstring_workman_zxcvm.h` | diff --git a/keyboards/ai03/jp60/keymaps/default/keymap.c b/keyboards/ai03/jp60/keymaps/default/keymap.c index f26c2a9080..6b69dba9dd 100644 --- a/keyboards/ai03/jp60/keymaps/default/keymap.c +++ b/keyboards/ai03/jp60/keymaps/default/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Defines names for use in layer keycodes and the keymap enum layer_names { diff --git a/keyboards/ai03/jp60/keymaps/via/keymap.c b/keyboards/ai03/jp60/keymaps/via/keymap.c index 5c8f9ecf65..efce7acf3c 100644 --- a/keyboards/ai03/jp60/keymaps/via/keymap.c +++ b/keyboards/ai03/jp60/keymaps/via/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Defines names for use in layer keycodes and the keymap enum layer_names { diff --git a/keyboards/aozora/keymaps/default_all/keymap.c b/keyboards/aozora/keymaps/default_all/keymap.c index 3376f2e8cd..a6e20e0e4e 100644 --- a/keyboards/aozora/keymaps/default_all/keymap.c +++ b/keyboards/aozora/keymaps/default_all/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H -#include "sendstring_jis.h" // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避 +#include "sendstring_japanese.h" // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( diff --git a/keyboards/aozora/keymaps/via/keymap.c b/keyboards/aozora/keymaps/via/keymap.c index 3376f2e8cd..a6e20e0e4e 100644 --- a/keyboards/aozora/keymaps/via/keymap.c +++ b/keyboards/aozora/keymaps/via/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H -#include "sendstring_jis.h" // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避 +#include "sendstring_japanese.h" // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( diff --git a/keyboards/barracuda/keymaps/default/keymap.c b/keyboards/barracuda/keymaps/default/keymap.c index ebe2e8b4a5..a3170c1b44 100644 --- a/keyboards/barracuda/keymaps/default/keymap.c +++ b/keyboards/barracuda/keymaps/default/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" /* keymap layers */ enum _layers { diff --git a/keyboards/barracuda/keymaps/via/keymap.c b/keyboards/barracuda/keymaps/via/keymap.c index ebe2e8b4a5..a3170c1b44 100644 --- a/keyboards/barracuda/keymaps/via/keymap.c +++ b/keyboards/barracuda/keymaps/via/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" /* keymap layers */ enum _layers { diff --git a/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c index 97f7039a79..26ca151089 100644 --- a/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c +++ b/keyboards/basekeys/slice/rev1/keymaps/2moons/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" #ifdef RGBLIGHT_ENABLE //Following line allows macro to read current RGB settings diff --git a/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c b/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c index 900f1b3ba7..57b94c5bdf 100644 --- a/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c +++ b/keyboards/basekeys/slice/rev1/keymaps/via/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them diff --git a/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c b/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c index 375daaca95..05de0e42d0 100644 --- a/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c +++ b/keyboards/basekeys/slice/rev1_rgb/keymaps/2moons_rgb/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" #include "split_util.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. diff --git a/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c index 9d8284dbd2..8db73ab8bd 100644 --- a/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c +++ b/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c @@ -2,9 +2,9 @@ // hdbx から2行コピーさせて頂きました。 #include QMK_KEYBOARD_H -#include "keymap_jp.h" // qmk_firmware-master/quantum/keymap_extras/keymap_jp.h 日本語キーボード設定用 +#include "keymap_japanese.h" // qmk_firmware-master/quantum/keymap_extras/keymap_japanese.h 日本語キーボード設定用 // マクロが必要になったらコメントインすること -// #include // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避> +// #include "sendstring_japanese.h" // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避> extern keymap_config_t keymap_config; diff --git a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c index 0931ce86b4..bb3b6fac48 100644 --- a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c +++ b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c @@ -2,8 +2,8 @@ // @leopard_gecko さんがPlanck用に作成されたキーマップをかなり参考にしています。 #include QMK_KEYBOARD_H -#include "keymap_jp.h" // qmk_firmware-master/quantum/keymap_extras/keymap_jp.h 日本語キーボード設定用 -#include // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避 +#include "keymap_japanese.h" // qmk_firmware-master/quantum/keymap_extras/keymap_japanese.h 日本語キーボード設定用 +#include "sendstring_japanese.h" // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避 extern keymap_config_t keymap_config; diff --git a/keyboards/biacco42/ergo42/keymaps/koba/keymap.c b/keyboards/biacco42/ergo42/keymaps/koba/keymap.c index 091d7fb9af..5d7f337452 100644 --- a/keyboards/biacco42/ergo42/keymaps/koba/keymap.c +++ b/keyboards/biacco42/ergo42/keymaps/koba/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" enum { _WIN, diff --git a/keyboards/buzzard/keymaps/crehmann/keymap.c b/keyboards/buzzard/keymaps/crehmann/keymap.c index 842494c60a..5a6ae49d8b 100644 --- a/keyboards/buzzard/keymaps/crehmann/keymap.c +++ b/keyboards/buzzard/keymaps/crehmann/keymap.c @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H -#include "keymap_german_ch.h" +#include "keymap_swiss_de.h" #include "features/haptic_utils.h" #ifdef PS2_MOUSE_ENABLE diff --git a/keyboards/crkbd/keymaps/vayashiko/keymap.c b/keyboards/crkbd/keymaps/vayashiko/keymap.c index ecb629f30d..f3cf5cb2f6 100644 --- a/keyboards/crkbd/keymaps/vayashiko/keymap.c +++ b/keyboards/crkbd/keymaps/vayashiko/keymap.c @@ -17,7 +17,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" enum custom_layers { _QWERTY, diff --git a/keyboards/dz60/keymaps/default_abnt2/keymap.c b/keyboards/dz60/keymaps/default_abnt2/keymap.c index 3ed1484bd7..d27e42e390 100644 --- a/keyboards/dz60/keymaps/default_abnt2/keymap.c +++ b/keyboards/dz60/keymaps/default_abnt2/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H -#include "keymap_br_abnt2.h" +#include "keymap_brazilian_abnt2.h" /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * _______ can be used in place of KC_TRNS (transparent) * diff --git a/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c b/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c index 18d6e667cc..e31391a674 100644 --- a/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c +++ b/keyboards/ergodox_ez/keymaps/nathanvercaemert/keymap.c @@ -6,10 +6,10 @@ #include "keymap_spanish.h" #include "keymap_hungarian.h" #include "keymap_swedish.h" -#include "keymap_br_abnt2.h" +#include "keymap_brazilian_abnt2.h" #include "keymap_canadian_multilingual.h" -#include "keymap_german_ch.h" -#include "keymap_jp.h" +#include "keymap_swiss_de.h" +#include "keymap_japanese.h" #include "keymap_bepo.h" #define KC_MAC_UNDO LGUI(KC_Z) diff --git a/keyboards/gh60/revc/keymaps/default_abnt2/keymap.c b/keyboards/gh60/revc/keymaps/default_abnt2/keymap.c index 493bee1cd4..d28f028563 100644 --- a/keyboards/gh60/revc/keymaps/default_abnt2/keymap.c +++ b/keyboards/gh60/revc/keymaps/default_abnt2/keymap.c @@ -16,7 +16,7 @@ #include QMK_KEYBOARD_H -#include "keymap_br_abnt2.h" +#include "keymap_brazilian_abnt2.h" enum layer_names { _BL, diff --git a/keyboards/gl516/a52gl/keymaps/salicylic/keymap.c b/keyboards/gl516/a52gl/keymaps/salicylic/keymap.c index 4607d1dc50..4a2e09501d 100644 --- a/keyboards/gl516/a52gl/keymaps/salicylic/keymap.c +++ b/keyboards/gl516/a52gl/keymaps/salicylic/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them diff --git a/keyboards/gl516/j73gl/keymaps/default/keymap.c b/keyboards/gl516/j73gl/keymaps/default/keymap.c index 846df7d2b7..c549e6b574 100644 --- a/keyboards/gl516/j73gl/keymaps/default/keymap.c +++ b/keyboards/gl516/j73gl/keymaps/default/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them diff --git a/keyboards/gl516/j73gl/keymaps/via/keymap.c b/keyboards/gl516/j73gl/keymaps/via/keymap.c index 3e8fba928d..942775e4b0 100644 --- a/keyboards/gl516/j73gl/keymaps/via/keymap.c +++ b/keyboards/gl516/j73gl/keymaps/via/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( diff --git a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/keymap.c b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/keymap.c index 3e8fba928d..942775e4b0 100644 --- a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/keymap.c +++ b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( diff --git a/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c b/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c index 819ac94e37..fd0bc7f8e3 100644 --- a/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c +++ b/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. diff --git a/keyboards/halfcliff/keymaps/default/keymap.c b/keyboards/halfcliff/keymaps/default/keymap.c index 02743f5d49..aff1ffb1de 100644 --- a/keyboards/halfcliff/keymaps/default/keymap.c +++ b/keyboards/halfcliff/keymaps/default/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Defines names for use in layer keycodes and the keymap enum layer_names { diff --git a/keyboards/halfcliff/keymaps/via/keymap.c b/keyboards/halfcliff/keymaps/via/keymap.c index e0a825e7c3..424c56abe0 100644 --- a/keyboards/halfcliff/keymaps/via/keymap.c +++ b/keyboards/halfcliff/keymaps/via/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" #define RAISE FN_MO13 #define LOWER FN_MO23 diff --git a/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c b/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c index 6efed6ac1a..020c70fc21 100644 --- a/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c +++ b/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H -#include "keymap_br_abnt2.h" +#include "keymap_brazilian_abnt2.h" enum { LAYER_BASE, diff --git a/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c b/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c index 4bbf4c2cbc..73113385d3 100644 --- a/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c +++ b/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c @@ -15,8 +15,8 @@ */ #include QMK_KEYBOARD_H -#include "keymap_br_abnt2.h" -#include "sendstring_br_abnt2.h" +#include "keymap_brazilian_abnt2.h" +#include "sendstring_brazilian_abnt2.h" enum { LAYER_BASE, diff --git a/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c b/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c index a7b127f089..934ca4bed7 100644 --- a/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c +++ b/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H -#include "keymap_br_abnt2.h" +#include "keymap_brazilian_abnt2.h" enum { LAYER_BASE, diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c index 24b2a59012..23b45ef317 100644 --- a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c +++ b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" #include #include #ifdef SSD1306OLED diff --git a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c b/keyboards/helix/rev2/keymaps/froggy_106/keymap.c index a92b05566e..2e1464bedf 100644 --- a/keyboards/helix/rev2/keymaps/froggy_106/keymap.c +++ b/keyboards/helix/rev2/keymaps/froggy_106/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" #include #ifdef SSD1306OLED #include "ssd1306.h" diff --git a/keyboards/hhkb/ansi/keymaps/shela/keymap_jis2us.h b/keyboards/hhkb/ansi/keymaps/shela/keymap_jis2us.h index 0b811fd03a..163ae84fb4 100644 --- a/keyboards/hhkb/ansi/keymaps/shela/keymap_jis2us.h +++ b/keyboards/hhkb/ansi/keymaps/shela/keymap_jis2us.h @@ -16,7 +16,7 @@ #pragma once -#include "keymap_jp.h" +#include "keymap_japanese.h" // clang-format off /* Keymap for converting JIS to US */ diff --git a/keyboards/jones/v03/keymaps/default/keymap.c b/keyboards/jones/v03/keymaps/default/keymap.c index 05545c5373..4d408b5e19 100644 --- a/keyboards/jones/v03/keymaps/default/keymap.c +++ b/keyboards/jones/v03/keymaps/default/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_all( diff --git a/keyboards/jones/v03/keymaps/default_jp/keymap.c b/keyboards/jones/v03/keymaps/default_jp/keymap.c index 54f90c3e57..1cf67fbedd 100644 --- a/keyboards/jones/v03/keymaps/default_jp/keymap.c +++ b/keyboards/jones/v03/keymaps/default_jp/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Defines names for use in layer keycodes and the keymap enum layer_number { diff --git a/keyboards/jones/v03_1/keymaps/default_jp/keymap.c b/keyboards/jones/v03_1/keymaps/default_jp/keymap.c index ba68b3dcf7..efe23f8237 100644 --- a/keyboards/jones/v03_1/keymaps/default_jp/keymap.c +++ b/keyboards/jones/v03_1/keymaps/default_jp/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Defines names for use in layer keycodes and the keymap enum layer_number { diff --git a/keyboards/jones/v1/keymaps/via/keymap.c b/keyboards/jones/v1/keymaps/via/keymap.c index 7cd1434bbc..a326a78233 100644 --- a/keyboards/jones/v1/keymaps/via/keymap.c +++ b/keyboards/jones/v1/keymaps/via/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Defines names for use in layer keycodes and the keymap enum layer_number { diff --git a/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c b/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c index 3ce6afce21..15e995bb1c 100644 --- a/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c +++ b/keyboards/kbdfans/kbd67/rev1/keymaps/koba/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" #define RGB_RMO RGB_RMOD diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c index 3ce6afce21..15e995bb1c 100644 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c +++ b/keyboards/kbdfans/kbd67/rev2/keymaps/koba/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" #define RGB_RMO RGB_RMOD diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c b/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c index daffb61e76..e72d83f9d0 100644 --- a/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c +++ b/keyboards/kprepublic/bm40hsrgb/keymaps/wolff_abnt2/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H -#include "keymap_br_abnt2.h" +#include "keymap_brazilian_abnt2.h" enum layers { _WORKMAN, diff --git a/keyboards/kudox/rev1/keymaps/jis/keymap.c b/keyboards/kudox/rev1/keymaps/jis/keymap.c index 5de27ff8d4..d6f06828cc 100644 --- a/keyboards/kudox/rev1/keymaps/jis/keymap.c +++ b/keyboards/kudox/rev1/keymaps/jis/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include"keymap_jp.h" +#include"keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. diff --git a/keyboards/kudox/rev2/keymaps/jis/keymap.c b/keyboards/kudox/rev2/keymaps/jis/keymap.c index c78cea2331..40173a8cd3 100644 --- a/keyboards/kudox/rev2/keymaps/jis/keymap.c +++ b/keyboards/kudox/rev2/keymaps/jis/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include"keymap_jp.h" +#include"keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. diff --git a/keyboards/kudox/rev3/keymaps/jis/keymap.c b/keyboards/kudox/rev3/keymaps/jis/keymap.c index 28ee3f9214..41b6fca1f2 100644 --- a/keyboards/kudox/rev3/keymaps/jis/keymap.c +++ b/keyboards/kudox/rev3/keymaps/jis/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include"keymap_jp.h" +#include"keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. diff --git a/keyboards/kudox_full/keymaps/jis/keymap.c b/keyboards/kudox_full/keymaps/jis/keymap.c index 5baa7d14d4..aa55fa50a4 100644 --- a/keyboards/kudox_full/keymaps/jis/keymap.c +++ b/keyboards/kudox_full/keymaps/jis/keymap.c @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0+ #include QMK_KEYBOARD_H -#include"keymap_jp.h" +#include"keymap_japanese.h" enum layer_number { diff --git a/keyboards/majistic/keymaps/default/keymap.c b/keyboards/majistic/keymaps/default/keymap.c index 409c94d891..925657d2fe 100644 --- a/keyboards/majistic/keymaps/default/keymap.c +++ b/keyboards/majistic/keymaps/default/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Defines names for use in layer keycodes and the keymap enum layer_names { diff --git a/keyboards/marksard/treadstone32/keymaps/default/keymap.c b/keyboards/marksard/treadstone32/keymaps/default/keymap.c index 791fed059b..0f3e5e9e12 100644 --- a/keyboards/marksard/treadstone32/keymaps/default/keymap.c +++ b/keyboards/marksard/treadstone32/keymaps/default/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c b/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c index 92518b11a7..49c1870fa9 100644 --- a/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c +++ b/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" extern keymap_config_t keymap_config; diff --git a/keyboards/numatreus/keymaps/hdbx/keymap.c b/keyboards/numatreus/keymaps/hdbx/keymap.c index 44b3fffe24..5bc8c4d0e6 100644 --- a/keyboards/numatreus/keymaps/hdbx/keymap.c +++ b/keyboards/numatreus/keymaps/hdbx/keymap.c @@ -4,8 +4,8 @@ // ・Muhenkan(入力文字なし/直接入力)に「IMEを無効化」を割り当て #include QMK_KEYBOARD_H -#include "keymap_jp.h" // qmk_firmware-master/quantum/keymap_extras/keymap_jp.h 日本語キーボード設定用 -#include // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避 +#include "keymap_japanese.h" // qmk_firmware-master/quantum/keymap_extras/keymap_japanese.h 日本語キーボード設定用 +#include "sendstring_japanese.h" // macro sendstring for jis keyboard マクロ文字列送信時に日本語キーボード設定での文字化け回避 // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. diff --git a/keyboards/numatreus/keymaps/like_jis/keymap.c b/keyboards/numatreus/keymaps/like_jis/keymap.c index eb9e9230d7..4189373e46 100644 --- a/keyboards/numatreus/keymaps/like_jis/keymap.c +++ b/keyboards/numatreus/keymaps/like_jis/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c index 4b102157d5..8cfc5a8385 100644 --- a/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c +++ b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // clang-format off enum layers { _QWERTY, _LOWER, _RAISE, _ADJUST }; diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/jis/keymap.c b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/jis/keymap.c index 463d847639..ac6b4f49c5 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/keymaps/jis/keymap.c +++ b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/jis/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" enum layer_number { _QWERTY = 0, diff --git a/keyboards/omkbd/runner3680/5x8/keymaps/JIS/keymap.c b/keyboards/omkbd/runner3680/5x8/keymaps/JIS/keymap.c index 75ff755651..515a6fcb07 100644 --- a/keyboards/omkbd/runner3680/5x8/keymaps/JIS/keymap.c +++ b/keyboards/omkbd/runner3680/5x8/keymaps/JIS/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" extern keymap_config_t keymap_config; diff --git a/keyboards/pico/65keys/keymaps/jis/keymap.c b/keyboards/pico/65keys/keymaps/jis/keymap.c index a3d2606613..35b01bbba4 100644 --- a/keyboards/pico/65keys/keymaps/jis/keymap.c +++ b/keyboards/pico/65keys/keymaps/jis/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include"keymap_jp.h" +#include"keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. diff --git a/keyboards/pico/70keys/keymaps/jis/keymap.c b/keyboards/pico/70keys/keymaps/jis/keymap.c index 73109245e9..67d082d189 100644 --- a/keyboards/pico/70keys/keymaps/jis/keymap.c +++ b/keyboards/pico/70keys/keymaps/jis/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include"keymap_jp.h" +#include"keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. diff --git a/keyboards/pisces/keymaps/default/keymap.c b/keyboards/pisces/keymaps/default/keymap.c index 39226d2f05..a347a2e779 100644 --- a/keyboards/pisces/keymaps/default/keymap.c +++ b/keyboards/pisces/keymaps/default/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" /* keymap layers */ enum _layers { diff --git a/keyboards/pisces/keymaps/via/keymap.c b/keyboards/pisces/keymaps/via/keymap.c index 39226d2f05..a347a2e779 100644 --- a/keyboards/pisces/keymaps/via/keymap.c +++ b/keyboards/pisces/keymaps/via/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" /* keymap layers */ enum _layers { diff --git a/keyboards/planck/keymaps/rai-suta/keymap.c b/keyboards/planck/keymaps/rai-suta/keymap.c index 8cc37dc651..07dae2b2ab 100644 --- a/keyboards/planck/keymaps/rai-suta/keymap.c +++ b/keyboards/planck/keymaps/rai-suta/keymap.c @@ -3,7 +3,7 @@ #include QMK_KEYBOARD_H #include "version.h" -#include "sendstring_jis.h" +#include "sendstring_japanese.h" // JIS keyboard #define JK_CIRC KC_EQL // ^ diff --git a/keyboards/planck/keymaps/sigul/keymap.c b/keyboards/planck/keymaps/sigul/keymap.c index 622e9f29cd..2b100509b9 100644 --- a/keyboards/planck/keymaps/sigul/keymap.c +++ b/keyboards/planck/keymaps/sigul/keymap.c @@ -13,7 +13,7 @@ #include QMK_KEYBOARD_H #include "muse.h" -#include "keymap_italian_osx_ansi.h" +#include "keymap_italian_mac_ansi.h" #include "sigul.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c b/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c index d8debc9cc0..7396c2b9d7 100644 --- a/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c +++ b/keyboards/ramonimbao/squishytkl/keymaps/jis/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_jis( diff --git a/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c b/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c index 8d65932219..e83f88dc1d 100644 --- a/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c +++ b/keyboards/ramonimbao/wete/v1/keymaps/jis/keymap.c @@ -17,7 +17,7 @@ along with this program. If not, see . #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_jis_rhnp( diff --git a/keyboards/rate/pistachio/keymaps/default/keymap.c b/keyboards/rate/pistachio/keymaps/default/keymap.c index 585807abdd..e58042de9c 100644 --- a/keyboards/rate/pistachio/keymaps/default/keymap.c +++ b/keyboards/rate/pistachio/keymaps/default/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" extern rgblight_config_t rgblight_config; diff --git a/keyboards/rate/pistachio/keymaps/rate/keymap.c b/keyboards/rate/pistachio/keymaps/rate/keymap.c index 34e1324aed..b4d8d03982 100644 --- a/keyboards/rate/pistachio/keymaps/rate/keymap.c +++ b/keyboards/rate/pistachio/keymaps/rate/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" enum layer_names { diff --git a/keyboards/rate/pistachio/keymaps/via/keymap.c b/keyboards/rate/pistachio/keymaps/via/keymap.c index 357253ac2d..376a9b37c7 100644 --- a/keyboards/rate/pistachio/keymaps/via/keymap.c +++ b/keyboards/rate/pistachio/keymaps/via/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" enum layer_names { diff --git a/keyboards/rate/pistachio_pro/keymaps/default/keymap.c b/keyboards/rate/pistachio_pro/keymaps/default/keymap.c index 3fe6e8a5f5..7140d92361 100644 --- a/keyboards/rate/pistachio_pro/keymaps/default/keymap.c +++ b/keyboards/rate/pistachio_pro/keymaps/default/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H #include -#include "keymap_jp.h" +#include "keymap_japanese.h" #include "lib/bme280.h" // Defines names for use in layer keycodes and the keymap diff --git a/keyboards/rate/pistachio_pro/keymaps/rate/keymap.c b/keyboards/rate/pistachio_pro/keymaps/rate/keymap.c index 7aa70c51d1..47851f0d6a 100644 --- a/keyboards/rate/pistachio_pro/keymaps/rate/keymap.c +++ b/keyboards/rate/pistachio_pro/keymaps/rate/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H #include -#include "keymap_jp.h" +#include "keymap_japanese.h" #include "lib/bme280.h" // Defines names for use in layer keycodes and the keymap diff --git a/keyboards/rate/pistachio_pro/keymaps/via/keymap.c b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c index f30254320b..62e6dc96dc 100644 --- a/keyboards/rate/pistachio_pro/keymaps/via/keymap.c +++ b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c @@ -15,7 +15,7 @@ */ #include QMK_KEYBOARD_H #include -#include "keymap_jp.h" +#include "keymap_japanese.h" #include "lib/bme280.h" // Defines names for use in layer keycodes and the keymap diff --git a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c index cc540b891f..45a1b8a566 100644 --- a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c +++ b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" extern keymap_config_t keymap_config; diff --git a/keyboards/recompile_keys/nomu30/keymaps/like_jis/keymap.c b/keyboards/recompile_keys/nomu30/keymaps/like_jis/keymap.c index fc2d26ad7a..efdf01b2e7 100644 --- a/keyboards/recompile_keys/nomu30/keymaps/like_jis/keymap.c +++ b/keyboards/recompile_keys/nomu30/keymaps/like_jis/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" extern keymap_config_t keymap_config; diff --git a/keyboards/reviung/reviung33/keymaps/default_jp/keymap.c b/keyboards/reviung/reviung33/keymaps/default_jp/keymap.c index 1265a301ed..738915ce34 100644 --- a/keyboards/reviung/reviung33/keymaps/default_jp/keymap.c +++ b/keyboards/reviung/reviung33/keymaps/default_jp/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" enum layer_names { _BASE, diff --git a/keyboards/reviung/reviung34/keymaps/default_jp/keymap.c b/keyboards/reviung/reviung34/keymaps/default_jp/keymap.c index c37d87662c..3faff2e368 100755 --- a/keyboards/reviung/reviung34/keymaps/default_jp/keymap.c +++ b/keyboards/reviung/reviung34/keymaps/default_jp/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" enum layer_names { _BASE, diff --git a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c index ad12f49d5b..4e1f2acd05 100644 --- a/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c +++ b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c index cbe4e57dcf..06d7972a2e 100644 --- a/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c +++ b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c index b0d31b03bd..95ba7fc9eb 100644 --- a/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c +++ b/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them diff --git a/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c index f8b430af1c..978a63ab35 100644 --- a/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c +++ b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them diff --git a/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c index c841371dba..8f2c4151f8 100644 --- a/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c +++ b/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. diff --git a/keyboards/salicylic_acid3/getta25/keymaps/oled/keymap.c b/keyboards/salicylic_acid3/getta25/keymaps/oled/keymap.c index 7d8151b86d..0ee669ce84 100644 --- a/keyboards/salicylic_acid3/getta25/keymaps/oled/keymap.c +++ b/keyboards/salicylic_acid3/getta25/keymaps/oled/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" #ifdef OLED_ENABLE static uint32_t oled_timer = 0; diff --git a/keyboards/salicylic_acid3/jisplit89/keymaps/default/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/default/keymap.c index e782a4b451..cedad726dd 100644 --- a/keyboards/salicylic_acid3/jisplit89/keymaps/default/keymap.c +++ b/keyboards/salicylic_acid3/jisplit89/keymaps/default/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them diff --git a/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c index ffd3b853b5..4e8addf6b7 100644 --- a/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c +++ b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them diff --git a/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c index b2ceacb0e6..41f90afe44 100644 --- a/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c +++ b/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c index dddb6c0432..3807d9b6f3 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c +++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" extern keymap_config_t keymap_config; diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c index 7566d4c00a..d2abe704c6 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c +++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" extern keymap_config_t keymap_config; diff --git a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c index 1925067d22..d22f9ecb2f 100644 --- a/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c +++ b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" extern keymap_config_t keymap_config; diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c index 9be4bcb422..8a2dbf051f 100644 --- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c +++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" extern keymap_config_t keymap_config; diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c index 8fb0ce26f1..4201d79a2e 100644 --- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c +++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" extern keymap_config_t keymap_config; diff --git a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c index 7f50e89f3c..23786da915 100644 --- a/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c +++ b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" extern keymap_config_t keymap_config; diff --git a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c index 01039aaecc..cc30e5332d 100644 --- a/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c +++ b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c index 40e92393da..db46075c8f 100644 --- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c +++ b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c index df80e0772b..c91716cdd4 100644 --- a/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c +++ b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c index e7de4e50f0..5944c00fc5 100644 --- a/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c +++ b/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/default/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/default/keymap.c index 0f90eb883c..38552c8dbd 100644 --- a/keyboards/salicylic_acid3/nknl7jp/keymaps/default/keymap.c +++ b/keyboards/salicylic_acid3/nknl7jp/keymaps/default/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c index 65f95f0173..e6004ba111 100644 --- a/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c +++ b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" diff --git a/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c index 660fb2a159..35c78c71fd 100644 --- a/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c +++ b/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" extern uint8_t is_master; diff --git a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c index 06fa89c9c7..3dc7faa394 100644 --- a/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c +++ b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/satt/comet46/keymaps/satt/keymap.c b/keyboards/satt/comet46/keymaps/satt/keymap.c index 57aa635934..cdd094f747 100644 --- a/keyboards/satt/comet46/keymaps/satt/keymap.c +++ b/keyboards/satt/comet46/keymaps/satt/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H #include "keymap_jis2us.h" #include "action_pseudo_lut.h" -#include "keymap_jp.h" +#include "keymap_japanese.h" #ifdef SSD1306OLED #include "ssd1306.h" #endif diff --git a/keyboards/satt/vision/keymaps/satt/keymap.c b/keyboards/satt/vision/keymaps/satt/keymap.c index 9529653408..4289fbc20a 100644 --- a/keyboards/satt/vision/keymaps/satt/keymap.c +++ b/keyboards/satt/vision/keymaps/satt/keymap.c @@ -18,7 +18,7 @@ along with this program. If not, see . #include QMK_KEYBOARD_H #include "keymap_jis2us.h" #include "action_pseudo.h" -#include "keymap_jp.h" +#include "keymap_japanese.h" enum custom_keycodes { JIS2US = SAFE_RANGE, /* JIS2US keycode */ diff --git a/keyboards/satt/vision/keymaps/satt/keymap_jis2us.h b/keyboards/satt/vision/keymaps/satt/keymap_jis2us.h index 0b811fd03a..163ae84fb4 100644 --- a/keyboards/satt/vision/keymaps/satt/keymap_jis2us.h +++ b/keyboards/satt/vision/keymaps/satt/keymap_jis2us.h @@ -16,7 +16,7 @@ #pragma once -#include "keymap_jp.h" +#include "keymap_japanese.h" // clang-format off /* Keymap for converting JIS to US */ diff --git a/keyboards/takashicompany/heavy_left/keymaps/default/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/default/keymap.c index 31ac47c047..768c5f7875 100644 --- a/keyboards/takashicompany/heavy_left/keymaps/default/keymap.c +++ b/keyboards/takashicompany/heavy_left/keymaps/default/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { diff --git a/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c index 11beb28ca0..1833206af3 100644 --- a/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c +++ b/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { diff --git a/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c index 796d27914d..b351d57c82 100644 --- a/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c +++ b/keyboards/takashicompany/heavy_left/keymaps/via/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { diff --git a/keyboards/takashiski/namecard2x4/keymaps/brainfuck/keymap.c b/keyboards/takashiski/namecard2x4/keymaps/brainfuck/keymap.c index 28640db0fd..494c06bd73 100644 --- a/keyboards/takashiski/namecard2x4/keymaps/brainfuck/keymap.c +++ b/keyboards/takashiski/namecard2x4/keymaps/brainfuck/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" enum Layer { diff --git a/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c index 509b497802..1332367f85 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/like_jis/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "keymap_jp.h" +#include "keymap_japanese.h" extern keymap_config_t keymap_config; diff --git a/layouts/community/ergodox/ishigoya-jp/keymap.c b/layouts/community/ergodox/ishigoya-jp/keymap.c index c70cbba819..e9d89d1bbc 100644 --- a/layouts/community/ergodox/ishigoya-jp/keymap.c +++ b/layouts/community/ergodox/ishigoya-jp/keymap.c @@ -1,7 +1,7 @@ #include QMK_KEYBOARD_H #include "debug.h" #include "action_layer.h" -#include "keymap_jp.h" +#include "keymap_japanese.h" static uint16_t start; diff --git a/layouts/community/ergodox/kristian/keymap.c b/layouts/community/ergodox/kristian/keymap.c index c3bb9e047a..3fdccb790a 100644 --- a/layouts/community/ergodox/kristian/keymap.c +++ b/layouts/community/ergodox/kristian/keymap.c @@ -2,10 +2,10 @@ #include "debug.h" #include "action_layer.h" #include "version.h" -#include "keymap_fr_ch.h" +#include "keymap_swiss_fr.h" #include "keymap_french.h" #include "keymap_german.h" -#include "keymap_german_ch.h" +#include "keymap_swiss_de.h" #include "keymap_nordic.h" #include "keymap_norwegian.h" #include "keymap_spanish.h" diff --git a/layouts/community/ergodox/osx_de/keymap.c b/layouts/community/ergodox/osx_de/keymap.c index 581aecf2d3..5c3d7e49ea 100644 --- a/layouts/community/ergodox/osx_de/keymap.c +++ b/layouts/community/ergodox/osx_de/keymap.c @@ -1,7 +1,7 @@ #include QMK_KEYBOARD_H #include "debug.h" #include "action_layer.h" -#include "keymap_german_osx.h" +#include "keymap_german_mac_iso.h" #define BASE 0 #define SYMB 1 diff --git a/layouts/community/ergodox/osx_de_adnw_koy/keymap.c b/layouts/community/ergodox/osx_de_adnw_koy/keymap.c index 18335652ff..b8ffc2e51f 100644 --- a/layouts/community/ergodox/osx_de_adnw_koy/keymap.c +++ b/layouts/community/ergodox/osx_de_adnw_koy/keymap.c @@ -5,13 +5,13 @@ #include "keymap_neo2.h" #include "keymap_uk.h" #include "keymap_colemak.h" -#include "keymap_french_osx.h" +#include "keymap_french_mac_iso.h" #include "keymap_nordic.h" #include "keymap_dvorak.h" #include "keymap_german.h" #include "keymap_norwegian.h" -#include "keymap_fr_ch.h" -#include "keymap_german_osx.h" +#include "keymap_swiss_fr.h" +#include "keymap_german_mac_iso.h" #include "keymap_spanish.h" #include "keymap_bepo.h" diff --git a/layouts/community/ergodox/osx_de_experimental/keymap.c b/layouts/community/ergodox/osx_de_experimental/keymap.c index 17ca4362e6..8228b5e371 100644 --- a/layouts/community/ergodox/osx_de_experimental/keymap.c +++ b/layouts/community/ergodox/osx_de_experimental/keymap.c @@ -8,8 +8,8 @@ #include "keymap_dvorak.h" #include "keymap_german.h" #include "keymap_norwegian.h" -#include "keymap_fr_ch.h" -#include "keymap_german_osx.h" +#include "keymap_swiss_fr.h" +#include "keymap_german_mac_iso.h" #include "keymap_spanish.h" #include "keymap_bepo.h" diff --git a/layouts/community/ergodox/osx_fr/keymap.c b/layouts/community/ergodox/osx_fr/keymap.c index 924e9ee8ae..886e54208a 100644 --- a/layouts/community/ergodox/osx_fr/keymap.c +++ b/layouts/community/ergodox/osx_fr/keymap.c @@ -2,7 +2,7 @@ #include QMK_KEYBOARD_H #include "debug.h" #include "action_layer.h" -#include "keymap_french_osx.h" +#include "keymap_french_mac_iso.h" #define BASE 0 // default layer #define SYMB 1 // symbols diff --git a/layouts/default/60_abnt2/default_60_abnt2/keymap.c b/layouts/default/60_abnt2/default_60_abnt2/keymap.c index 00b9a8de26..2d64fc2dfc 100644 --- a/layouts/default/60_abnt2/default_60_abnt2/keymap.c +++ b/layouts/default/60_abnt2/default_60_abnt2/keymap.c @@ -1,6 +1,6 @@ #include QMK_KEYBOARD_H -#include "keymap_br_abnt2.h" +#include "keymap_brazilian_abnt2.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* diff --git a/quantum/keymap_extras/keymap_br_abnt2.h b/quantum/keymap_extras/keymap_brazilian_abnt2.h similarity index 100% rename from quantum/keymap_extras/keymap_br_abnt2.h rename to quantum/keymap_extras/keymap_brazilian_abnt2.h diff --git a/quantum/keymap_extras/keymap_dvp.h b/quantum/keymap_extras/keymap_dvorak_programmer.h similarity index 100% rename from quantum/keymap_extras/keymap_dvp.h rename to quantum/keymap_extras/keymap_dvorak_programmer.h diff --git a/quantum/keymap_extras/keymap_french_osx.h b/quantum/keymap_extras/keymap_french_mac_iso.h similarity index 100% rename from quantum/keymap_extras/keymap_french_osx.h rename to quantum/keymap_extras/keymap_french_mac_iso.h diff --git a/quantum/keymap_extras/keymap_german_osx.h b/quantum/keymap_extras/keymap_german_mac_iso.h similarity index 100% rename from quantum/keymap_extras/keymap_german_osx.h rename to quantum/keymap_extras/keymap_german_mac_iso.h diff --git a/quantum/keymap_extras/keymap_italian_osx_ansi.h b/quantum/keymap_extras/keymap_italian_mac_ansi.h similarity index 100% rename from quantum/keymap_extras/keymap_italian_osx_ansi.h rename to quantum/keymap_extras/keymap_italian_mac_ansi.h diff --git a/quantum/keymap_extras/keymap_italian_osx_iso.h b/quantum/keymap_extras/keymap_italian_mac_iso.h similarity index 100% rename from quantum/keymap_extras/keymap_italian_osx_iso.h rename to quantum/keymap_extras/keymap_italian_mac_iso.h diff --git a/quantum/keymap_extras/keymap_jp.h b/quantum/keymap_extras/keymap_japanese.h similarity index 100% rename from quantum/keymap_extras/keymap_jp.h rename to quantum/keymap_extras/keymap_japanese.h diff --git a/quantum/keymap_extras/keymap_portuguese_osx_iso.h b/quantum/keymap_extras/keymap_portuguese_mac_iso.h similarity index 100% rename from quantum/keymap_extras/keymap_portuguese_osx_iso.h rename to quantum/keymap_extras/keymap_portuguese_mac_iso.h diff --git a/quantum/keymap_extras/keymap_swedish_osx_ansi.h b/quantum/keymap_extras/keymap_swedish_mac_ansi.h similarity index 100% rename from quantum/keymap_extras/keymap_swedish_osx_ansi.h rename to quantum/keymap_extras/keymap_swedish_mac_ansi.h diff --git a/quantum/keymap_extras/keymap_swedish_osx_iso.h b/quantum/keymap_extras/keymap_swedish_mac_iso.h similarity index 100% rename from quantum/keymap_extras/keymap_swedish_osx_iso.h rename to quantum/keymap_extras/keymap_swedish_mac_iso.h diff --git a/quantum/keymap_extras/keymap_swedish_pro_osx_ansi.h b/quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h similarity index 100% rename from quantum/keymap_extras/keymap_swedish_pro_osx_ansi.h rename to quantum/keymap_extras/keymap_swedish_pro_mac_ansi.h diff --git a/quantum/keymap_extras/keymap_swedish_pro_osx_iso.h b/quantum/keymap_extras/keymap_swedish_pro_mac_iso.h similarity index 100% rename from quantum/keymap_extras/keymap_swedish_pro_osx_iso.h rename to quantum/keymap_extras/keymap_swedish_pro_mac_iso.h diff --git a/quantum/keymap_extras/keymap_german_ch.h b/quantum/keymap_extras/keymap_swiss_de.h similarity index 100% rename from quantum/keymap_extras/keymap_german_ch.h rename to quantum/keymap_extras/keymap_swiss_de.h diff --git a/quantum/keymap_extras/keymap_fr_ch.h b/quantum/keymap_extras/keymap_swiss_fr.h similarity index 100% rename from quantum/keymap_extras/keymap_fr_ch.h rename to quantum/keymap_extras/keymap_swiss_fr.h diff --git a/quantum/keymap_extras/sendstring_br_abnt2.h b/quantum/keymap_extras/sendstring_brazilian_abnt2.h similarity index 99% rename from quantum/keymap_extras/sendstring_br_abnt2.h rename to quantum/keymap_extras/sendstring_brazilian_abnt2.h index 1ca2d28592..b52ce4958a 100644 --- a/quantum/keymap_extras/sendstring_br_abnt2.h +++ b/quantum/keymap_extras/sendstring_brazilian_abnt2.h @@ -18,7 +18,7 @@ #pragma once -#include "keymap_br_abnt2.h" +#include "keymap_brazilian_abnt2.h" #include "quantum.h" // clang-format off diff --git a/quantum/keymap_extras/sendstring_dvp.h b/quantum/keymap_extras/sendstring_dvorak_programmer.h similarity index 99% rename from quantum/keymap_extras/sendstring_dvp.h rename to quantum/keymap_extras/sendstring_dvorak_programmer.h index 74b595524d..f19bb6f4b2 100644 --- a/quantum/keymap_extras/sendstring_dvp.h +++ b/quantum/keymap_extras/sendstring_dvorak_programmer.h @@ -18,7 +18,7 @@ #pragma once -#include "keymap_dvp.h" +#include "keymap_dvorak_programmer.h" #include "quantum.h" // clang-format off diff --git a/quantum/keymap_extras/sendstring_french_osx.h b/quantum/keymap_extras/sendstring_french_mac_iso.h similarity index 99% rename from quantum/keymap_extras/sendstring_french_osx.h rename to quantum/keymap_extras/sendstring_french_mac_iso.h index cc9b857cd0..1033c3991f 100644 --- a/quantum/keymap_extras/sendstring_french_osx.h +++ b/quantum/keymap_extras/sendstring_french_mac_iso.h @@ -18,7 +18,7 @@ #pragma once -#include "keymap_french_osx.h" +#include "keymap_french_mac_iso.h" #include "quantum.h" // clang-format off diff --git a/quantum/keymap_extras/sendstring_german_osx.h b/quantum/keymap_extras/sendstring_german_mac_iso.h similarity index 99% rename from quantum/keymap_extras/sendstring_german_osx.h rename to quantum/keymap_extras/sendstring_german_mac_iso.h index d25c8c0995..8345dbaaa1 100644 --- a/quantum/keymap_extras/sendstring_german_osx.h +++ b/quantum/keymap_extras/sendstring_german_mac_iso.h @@ -18,7 +18,7 @@ #pragma once -#include "keymap_german_osx.h" +#include "keymap_german_mac_iso.h" #include "quantum.h" // clang-format off diff --git a/quantum/keymap_extras/sendstring_italian_osx_ansi.h b/quantum/keymap_extras/sendstring_italian_mac_ansi.h similarity index 99% rename from quantum/keymap_extras/sendstring_italian_osx_ansi.h rename to quantum/keymap_extras/sendstring_italian_mac_ansi.h index c61874015f..97b5164e23 100644 --- a/quantum/keymap_extras/sendstring_italian_osx_ansi.h +++ b/quantum/keymap_extras/sendstring_italian_mac_ansi.h @@ -18,7 +18,7 @@ #pragma once -#include "keymap_italian_osx_ansi.h" +#include "keymap_italian_mac_ansi.h" #include "quantum.h" // clang-format off diff --git a/quantum/keymap_extras/sendstring_italian_osx_iso.h b/quantum/keymap_extras/sendstring_italian_mac_iso.h similarity index 99% rename from quantum/keymap_extras/sendstring_italian_osx_iso.h rename to quantum/keymap_extras/sendstring_italian_mac_iso.h index eb5853b006..d82e8bbddf 100644 --- a/quantum/keymap_extras/sendstring_italian_osx_iso.h +++ b/quantum/keymap_extras/sendstring_italian_mac_iso.h @@ -18,7 +18,7 @@ #pragma once -#include "keymap_italian_osx_iso.h" +#include "keymap_italian_mac_iso.h" #include "quantum.h" // clang-format off diff --git a/quantum/keymap_extras/sendstring_jis.h b/quantum/keymap_extras/sendstring_japanese.h similarity index 99% rename from quantum/keymap_extras/sendstring_jis.h rename to quantum/keymap_extras/sendstring_japanese.h index 58335ad41d..13628d7023 100644 --- a/quantum/keymap_extras/sendstring_jis.h +++ b/quantum/keymap_extras/sendstring_japanese.h @@ -18,7 +18,7 @@ #pragma once -#include "keymap_jp.h" +#include "keymap_japanese.h" #include "quantum.h" // clang-format off diff --git a/quantum/keymap_extras/sendstring_portuguese_osx_iso.h b/quantum/keymap_extras/sendstring_portuguese_mac_iso.h similarity index 99% rename from quantum/keymap_extras/sendstring_portuguese_osx_iso.h rename to quantum/keymap_extras/sendstring_portuguese_mac_iso.h index f4ac1b37af..5d43c66279 100644 --- a/quantum/keymap_extras/sendstring_portuguese_osx_iso.h +++ b/quantum/keymap_extras/sendstring_portuguese_mac_iso.h @@ -18,7 +18,7 @@ #pragma once -#include "keymap_portuguese_osx_iso.h" +#include "keymap_portuguese_mac_iso.h" #include "quantum.h" // clang-format off diff --git a/quantum/keymap_extras/sendstring_german_ch.h b/quantum/keymap_extras/sendstring_swiss_de.h similarity index 99% rename from quantum/keymap_extras/sendstring_german_ch.h rename to quantum/keymap_extras/sendstring_swiss_de.h index b8f7471247..f6aa19210c 100644 --- a/quantum/keymap_extras/sendstring_german_ch.h +++ b/quantum/keymap_extras/sendstring_swiss_de.h @@ -18,7 +18,7 @@ #pragma once -#include "keymap_german_ch.h" +#include "keymap_swiss_de.h" #include "quantum.h" // clang-format off diff --git a/quantum/keymap_extras/sendstring_fr_ch.h b/quantum/keymap_extras/sendstring_swiss_fr.h similarity index 99% rename from quantum/keymap_extras/sendstring_fr_ch.h rename to quantum/keymap_extras/sendstring_swiss_fr.h index 160a2efb05..665be6d7b4 100644 --- a/quantum/keymap_extras/sendstring_fr_ch.h +++ b/quantum/keymap_extras/sendstring_swiss_fr.h @@ -18,7 +18,7 @@ #pragma once -#include "keymap_fr_ch.h" +#include "keymap_swiss_fr.h" #include "quantum.h" // clang-format off diff --git a/users/sigul/sigul.c b/users/sigul/sigul.c index 16bcd411d9..725881ad8a 100644 --- a/users/sigul/sigul.c +++ b/users/sigul/sigul.c @@ -1,4 +1,4 @@ -#include "keymap_italian_osx_ansi.h" +#include "keymap_italian_mac_ansi.h" #include "sigul.h" __attribute__ ((weak))