diff options
author | Drashna Jaelre <drashna@live.com> | 2019-11-04 13:59:15 -0800 |
---|---|---|
committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2019-11-04 14:07:22 -0800 |
commit | a836c85e54bfb06cd685a5444eea377374cebea3 (patch) | |
tree | 80d7fa5047fe45ac088cb3976dc33f6d761f20f5 | |
parent | 511fa5f8156b188c591ee760b7d246939c260451 (diff) | |
download | qmk_firmware-a836c85e54bfb06cd685a5444eea377374cebea3.tar.gz qmk_firmware-a836c85e54bfb06cd685a5444eea377374cebea3.zip |
Update keymap.c
-rw-r--r-- | keyboards/kyria/keymaps/default/keymap.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/keyboards/kyria/keymaps/default/keymap.c b/keyboards/kyria/keymaps/default/keymap.c index a27486d39..acadb0422 100644 --- a/keyboards/kyria/keymaps/default/keymap.c +++ b/keyboards/kyria/keymaps/default/keymap.c | |||
@@ -16,15 +16,10 @@ | |||
16 | #include QMK_KEYBOARD_H | 16 | #include QMK_KEYBOARD_H |
17 | 17 | ||
18 | enum layers { | 18 | enum layers { |
19 | QWERTY = 0, | 19 | _QWERTY = 0, |
20 | LOWER, | 20 | _LOWER, |
21 | RAISE, | 21 | _RAISE, |
22 | ADJUST | 22 | _ADJUST |
23 | }; | ||
24 | |||
25 | enum custom_keycodes { | ||
26 | LOWER = SAFE_RANGE, | ||
27 | RAISE | ||
28 | }; | 23 | }; |
29 | 24 | ||
30 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 25 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
@@ -42,11 +37,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
42 | * | | | Alt | Lower| Raise| | Lower| Raise| | | | | 37 | * | | | Alt | Lower| Raise| | Lower| Raise| | | | |
43 | * `----------------------------------' `----------------------------------' | 38 | * `----------------------------------' `----------------------------------' |
44 | */ | 39 | */ |
45 | [QWERTY] = LAYOUT( | 40 | [_QWERTY] = LAYOUT( |
46 | LT(RAISE, KC_ESC), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PIPE, | 41 | LT(_RAISE, KC_ESC), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PIPE, |
47 | MT(MOD_LCTL, KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, | 42 | MT(MOD_LCTL, KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, |
48 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LSFT, KC_LSFT, KC_LSFT, KC_LSFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, | 43 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LSFT, KC_LSFT, KC_LSFT, KC_LSFT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, |
49 | KC_LGUI, KC_DEL, MT(MOD_LALT, KC_ENT), LT(LOWER, KC_SPC), LT(RAISE, KC_ESC), LT(LOWER, KC_ENT), LT(RAISE, KC_SPC), KC_TAB, KC_BSPC, KC_RALT | 44 | KC_LGUI, KC_DEL, MT(MOD_LALT, KC_ENT), LT(_LOWER, KC_SPC), LT(_RAISE, KC_ESC), LT(_LOWER, KC_ENT), LT(_RAISE, KC_SPC), KC_TAB, KC_BSPC, KC_RALT |
50 | ), | 45 | ), |
51 | /* | 46 | /* |
52 | * Lower Layer: Symbols | 47 | * Lower Layer: Symbols |
@@ -62,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
62 | * | | | | | | | | | | | | | 57 | * | | | | | | | | | | | | |
63 | * `----------------------------------' `----------------------------------' | 58 | * `----------------------------------' `----------------------------------' |
64 | */ | 59 | */ |
65 | [LOWER] = LAYOUT( | 60 | [_LOWER] = LAYOUT( |
66 | _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, _______, _______, _______, KC_BSLS, | 61 | _______, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, _______, _______, _______, KC_BSLS, |
67 | _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_PERC, KC_QUOT, | 62 | _______, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_GRV, KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_PERC, KC_QUOT, |
68 | _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, _______, _______, _______, _______, KC_AMPR, KC_EQL, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, | 63 | _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, _______, _______, _______, _______, KC_AMPR, KC_EQL, KC_COMM, KC_DOT, KC_SLSH, KC_MINS, |
@@ -82,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
82 | * | | | | | | | | | | | | | 77 | * | | | | | | | | | | | | |
83 | * `----------------------------------' `----------------------------------' | 78 | * `----------------------------------' `----------------------------------' |
84 | */ | 79 | */ |
85 | [RAISE] = LAYOUT( | 80 | [_RAISE] = LAYOUT( |
86 | _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, | 81 | _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, |
87 | _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, | 82 | _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, |
88 | _______, _______, _______, _______, KC_MUTE, KC_VOLD, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______, | 83 | _______, _______, _______, _______, KC_MUTE, KC_VOLD, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______, |
@@ -102,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
102 | * | | | | | | | | | | | | | 97 | * | | | | | | | | | | | | |
103 | * `----------------------------------' `----------------------------------' | 98 | * `----------------------------------' `----------------------------------' |
104 | */ | 99 | */ |
105 | [ADJUST] = LAYOUT( | 100 | [_ADJUST] = LAYOUT( |
106 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, | 101 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, |
107 | _______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD, _______, _______, _______, KC_F11, KC_F12, _______, | 102 | _______, RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI, RGB_MOD, _______, _______, _______, KC_F11, KC_F12, _______, |
108 | _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 103 | _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
@@ -131,7 +126,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
131 | }; | 126 | }; |
132 | 127 | ||
133 | layer_state_t layer_state_set_user(layer_state_t state) { | 128 | layer_state_t layer_state_set_user(layer_state_t state) { |
134 | return update_tri_layer_state(state, LOWER, RAISE, ADJUST); | 129 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
135 | } | 130 | } |
136 | 131 | ||
137 | #ifdef OLED_DRIVER_ENABLE | 132 | #ifdef OLED_DRIVER_ENABLE |