diff options
| author | QMK Bot <hello@qmk.fm> | 2021-01-14 05:52:00 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-01-14 05:52:00 +0000 |
| commit | e60844738261d60b6fd03dec9285dff8487cbd00 (patch) | |
| tree | a883023429a85b3f43a6fbb539dba1dee68ffb1a /keyboards/torn/keymaps/default/keymap.c | |
| parent | 811e0155ef2760db05350cc9c1a8718fbb6a2b99 (diff) | |
| parent | 523c8315a22772fc3e605e21b14821b148c48a09 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/torn/keymaps/default/keymap.c')
| -rw-r--r-- | keyboards/torn/keymaps/default/keymap.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/keyboards/torn/keymaps/default/keymap.c b/keyboards/torn/keymaps/default/keymap.c index 7c91325bdc..b004101895 100644 --- a/keyboards/torn/keymaps/default/keymap.c +++ b/keyboards/torn/keymaps/default/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_QUOT, KC_GRV, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_LBRC, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RBRC , - _______, KC_LCTL, S_BSPC, R_DEL, G_ENT, L_SPC, KC_RALT, _______ + R_DEL, KC_LCTL, S_BSPC, R_DEL, G_ENT, L_SPC, KC_RALT, G_ENT ), /* Lower @@ -103,17 +103,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - -const uint16_t PROGMEM encoder_keymaps[][2][2] = { - [_QWERTY] = { { C(S(KC_TAB)), C(KC_TAB) }, { KC_PGDN, KC_PGUP } }, - [_LOWER] = { { C(KC_LEFT), C(KC_RGHT) }, { KC__VOLDOWN, KC__VOLUP } }, - [_RAISE] = { { KC_TRNS, KC_TRNS }, { G(KC_TAB), G(S(KC_TAB)) } }, - [_ADJUST] = { { KC_TRNS, KC_TRNS }, { KC_TRNS, KC_TRNS } }, -}; -// clang-format on - -layer_state_t layer_state_set_user(layer_state_t state) { - torn_set_led(0, IS_LAYER_ON_STATE(state, _RAISE)); - torn_set_led(1, IS_LAYER_ON_STATE(state, _LOWER)); - return state; -} |