mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-02 07:55:12 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
da2dbd41d5
@ -15,8 +15,6 @@
|
||||
*/
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
|
||||
|
||||
// Defines names for use in layer keycodes and the keymap
|
||||
enum layer_names {
|
||||
_QWERTY,
|
||||
@ -26,13 +24,8 @@ enum layer_names {
|
||||
_EXTRARIGHT
|
||||
};
|
||||
|
||||
// Aliases for this command to make the thumb keys work as LOWER/RAISE on hold and as space on hit.
|
||||
//#define CURSORRGHT LT(_CURSORRGHT,KC_SPC)
|
||||
//#define CURSORLEFT LT(_CURSORLEFT,KC_SPC)
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
|
||||
/* Qwerty
|
||||
* ,-----------------------------------------+ +-----------------------------------------.
|
||||
* | Esc | Q | W | E | R | T | | Y | U | I | O | P |BSpc |
|
||||
@ -55,7 +48,7 @@ Single hit: | | |Space | |Space | | |
|
||||
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
|
||||
LT(_EXTRARIGHT,KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_PENT,
|
||||
KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL,
|
||||
KC_SPC, KC_LGUI, KC_LALT, KC_LSFT, LT(TL_LOWR,KC_SPC), LT(TL_UPPR ,KC_SPC), KC_RSFT, KC_RALT, KC_APP, KC_SPC
|
||||
KC_SPC, KC_LGUI, KC_LALT, KC_LSFT, LT(_CURSORLEFT,KC_SPC), LT(_CURSORRGHT ,KC_SPC), KC_RSFT, KC_RALT, KC_APP, KC_SPC
|
||||
),
|
||||
|
||||
|
||||
@ -173,3 +166,6 @@ without separate thumbcluster.
|
||||
)
|
||||
};
|
||||
|
||||
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
return update_tri_layer_state(state, _CURSORLEFT, _CURSORRGHT, _NUMBERS);
|
||||
}
|
||||
|
@ -1 +0,0 @@
|
||||
TRI_LAYER_ENABLE = yes
|
Loading…
Reference in New Issue
Block a user