diff options
author | QMK Bot <hello@qmk.fm> | 2022-02-28 23:34:29 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-02-28 23:34:29 +0000 |
commit | c70bb75323021ab1e1346f99f97e6d9ad4bd8acd (patch) | |
tree | d0e14980ccc20a3c5fd55057eb3d3a839b78012f | |
parent | 5e57d18c5bc69addc1ae7a1c0c7a9b0cd9cc3f35 (diff) | |
parent | f293e6b4da5a3eca36e6a6da7c1bcbf3ecd536e8 (diff) |
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r-- | keyboards/creatkeebs/glacier/glacier.h | 2 | ||||
-rw-r--r-- | keyboards/creatkeebs/glacier/info.json | 7 | ||||
-rw-r--r-- | keyboards/creatkeebs/glacier/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/creatkeebs/glacier/rules.mk | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/keyboards/creatkeebs/glacier/glacier.h b/keyboards/creatkeebs/glacier/glacier.h index 3b7b1320f5..91400e8b13 100644 --- a/keyboards/creatkeebs/glacier/glacier.h +++ b/keyboards/creatkeebs/glacier/glacier.h @@ -18,7 +18,7 @@ #include "quantum.h" -#define LAYOUT( \ +#define LAYOUT_tkl_f13_ansi_tsangan( \ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \ diff --git a/keyboards/creatkeebs/glacier/info.json b/keyboards/creatkeebs/glacier/info.json index a22dabba0b..3bc2ee2018 100644 --- a/keyboards/creatkeebs/glacier/info.json +++ b/keyboards/creatkeebs/glacier/info.json @@ -1,9 +1,12 @@ { "keyboard_name": "glacier", "url": "", - "maintainer": "Tim", + "maintainer": "Timliuzhaolu", + "layout_aliases": { + "LAYOUT": "LAYOUT_tkl_f13_ansi_tsangan" + }, "layouts": { - "LAYOUT": { + "LAYOUT_tkl_f13_ansi_tsangan": { "layout": [ {"x":0, "y":0}, {"x":1.25, "y":0}, diff --git a/keyboards/creatkeebs/glacier/keymaps/default/keymap.c b/keyboards/creatkeebs/glacier/keymaps/default/keymap.c index e58d790545..209b89d1c9 100644 --- a/keyboards/creatkeebs/glacier/keymaps/default/keymap.c +++ b/keyboards/creatkeebs/glacier/keymaps/default/keymap.c @@ -17,7 +17,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_tkl_f13_ansi_tsangan( 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_F13, KC_PSCR, KC_SLCK, 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/creatkeebs/glacier/rules.mk b/keyboards/creatkeebs/glacier/rules.mk index 7c9fb95020..95a02dff26 100644 --- a/keyboards/creatkeebs/glacier/rules.mk +++ b/keyboards/creatkeebs/glacier/rules.mk @@ -16,3 +16,5 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Enable keyboard RGB underglow RGBLIGHT_ENABLE = no # Audio output + +LAYOUTS = tkl_f13_ansi_tsangan |