diff options
author | QMK Bot <[email protected]> | 2024-10-06 17:27:18 +0000 |
---|---|---|
committer | QMK Bot <[email protected]> | 2024-10-06 17:27:18 +0000 |
commit | 3a5be8bd22f35febe0abc5f1e6e75e5a06dbeadf (patch) | |
tree | fdfc1a363a19a7cbcb9e16a79e371624a03e259d /keyboards | |
parent | a428727897f0d459c7d082763e2eae0f1c3f21c0 (diff) | |
parent | f25624dca4717150f719bc6d72418a6e195fb1f7 (diff) | |
download | qmk_firmware-3a5be8bd22f35febe0abc5f1e6e75e5a06dbeadf.tar.gz qmk_firmware-3a5be8bd22f35febe0abc5f1e6e75e5a06dbeadf.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/thumbsup/keymaps/default/keymap.c | 12 | ||||
-rw-r--r-- | keyboards/thumbsup/keymaps/default/rules.mk | 1 |
2 files changed, 4 insertions, 9 deletions
diff --git a/keyboards/thumbsup/keymaps/default/keymap.c b/keyboards/thumbsup/keymaps/default/keymap.c index a7bc427180..04a16a5081 100644 --- a/keyboards/thumbsup/keymaps/default/keymap.c +++ b/keyboards/thumbsup/keymaps/default/keymap.c @@ -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); +} diff --git a/keyboards/thumbsup/keymaps/default/rules.mk b/keyboards/thumbsup/keymaps/default/rules.mk deleted file mode 100644 index 2c72d2ddb6..0000000000 --- a/keyboards/thumbsup/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -TRI_LAYER_ENABLE = yes
\ No newline at end of file |