diff options
| author | QMK Bot <hello@qmk.fm> | 2023-06-24 18:53:18 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2023-06-24 18:53:18 +0000 |
| commit | 1e5f2f517b0f1fbc2d2703f49fbd62dc7046b722 (patch) | |
| tree | 2ce198630bd4c0e34933dc1f5f33fef2f86b3d79 /keyboards | |
| parent | d18fc1cb9214726adf4de2d8760f8fc7dfbcea01 (diff) | |
| parent | 3bf2b966ec705cc69c0c0240336a28b547d38e36 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/kibou/winter/info.json | 5 | ||||
| -rw-r--r-- | keyboards/kibou/winter/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/kibou/winter/keymaps/via/keymap.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/keyboards/kibou/winter/info.json b/keyboards/kibou/winter/info.json index d4d8005aa3..47a359ec9b 100644 --- a/keyboards/kibou/winter/info.json +++ b/keyboards/kibou/winter/info.json @@ -26,8 +26,11 @@ "pid": "0xA003", "vid": "0x586A" }, + "layout_aliases": { + "LAYOUT": "LAYOUT_tkl_ansi_wkl" + }, "layouts": { - "LAYOUT": { + "LAYOUT_tkl_ansi_wkl": { "layout": [ { "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 2], "x": 2, "y": 0 }, diff --git a/keyboards/kibou/winter/keymaps/default/keymap.c b/keyboards/kibou/winter/keymaps/default/keymap.c index ecaadeb898..0837234be5 100644 --- a/keyboards/kibou/winter/keymaps/default/keymap.c +++ b/keyboards/kibou/winter/keymaps/default/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_tkl_ansi_wkl( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, diff --git a/keyboards/kibou/winter/keymaps/via/keymap.c b/keyboards/kibou/winter/keymaps/via/keymap.c index ecaadeb898..0837234be5 100644 --- a/keyboards/kibou/winter/keymaps/via/keymap.c +++ b/keyboards/kibou/winter/keymaps/via/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_tkl_ansi_wkl( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, |