Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

[Keymap] plattfot - Update and fix issue with DBL_TAP (#9666)

Browse source 
- Fix typo in the default layout.
- Move esc and del to the navi layer.
- Fix issue with oneshot layers and double tap aka DBL_TAP.
- Add caps lock to the raise layer.

Was relying on a broken behavior for the double tap to work with
oneshot keys, i.e. the oneshot layer not being cleared after a key
press in `process_record_user`, which allowed me to first press an
oneshot key, then double tap and then a key. With the behavior fixed,
this no longer works. As the oneshot layer will be cleared when double
tap is pressed.

To make double tap useful again. I changed that any of the layer keys
does not clear the double tap. Which allows me for example to first
press double tap, then an oneshot key and then a key. So now I'm able
to type my double symbols again.
This commit is contained in:
Fredrik Salomonsson 2020-07-10 15:00:04 -07:00 committed by GitHub
parent bdfb1bc2b5
commit 21610d245a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
keyboards/kyria/keymaps/plattfot/README.md
View file

@ -21,8 +21,8 @@ thumb keys to make it work without them.
// |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------| // |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------|
// | LShift | Z | X | C | V | B | Lead | RAISE| | LOWER|DBLTAP| N | M | , < | . > | / ? | RShift | // | LShift | Z | X | C | V | B | Lead | RAISE| | LOWER|DBLTAP| N | M | , < | . > | / ? | RShift |
// `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------' // `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------'
// | MPlay| GUI | LCtrl| Space| LALT | | Enter|BSpace| NAV | LAlt |Worksp| // | MPlay| GUI | LCtrl| Space| LALT | | Enter|BSpace| NAV | LCTL+|Worksp|
// | | | | | | | | | | |toggle| // | | | | | | | | | | LALT |toggle|
// `----------------------------------' `----------------------------------' // `----------------------------------' `----------------------------------'
``` ```
@ -103,9 +103,9 @@ programming, and it is editor agnostic.
// |--------+------+------+------+------+------| |------+------+------+------+------+--------| // |--------+------+------+------+------+------| |------+------+------+------+------+--------|
// | | | | | | F11 | | F12 | | | | | | // | | | | | | F11 | | F12 | | | | | |
// |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------| // |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------|
// | | | | | | |ScLock| | | | Ins | | | | | | | // | | | | | | |ScLock| | | | Ins | | | | | |CapsLock|
// `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------' // `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------'
// | | | | | | | Esc | Del | | RAlt | | // | | | | | | | | | | RAlt | |
// | | | | | | | | | | | | // | | | | | | | | | | | |
// `----------------------------------' `----------------------------------' // `----------------------------------' `----------------------------------'
``` ```
@ -113,6 +113,9 @@ programming, and it is editor agnostic.
Access to the functional keys, which I mostly use to run `emacs` Access to the functional keys, which I mostly use to run `emacs`
compilation mode. compilation mode.
This layer also includes key that changes the state, like insert and
caps lock.
Scroll Lock is used to toggle between English and Swedish. Scroll Lock is used to toggle between English and Swedish.
## Notable features on this layer ## Notable features on this layer
@ -130,7 +133,7 @@ Right rotary encoder
// ,-------------------------------------------. ,-------------------------------------------. // ,-------------------------------------------. ,-------------------------------------------.
// | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | // | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | |
// |--------+------+------+------+------+------| |------+------+------+------+------+--------| // |--------+------+------+------+------+------| |------+------+------+------+------+--------|
// | | | | | | | | | Left | Up | Down | Right| | // | | | ESC | DEL | | | | | Left | Up | Down | Right| |
// |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------| // |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------|
// | | | | | | | | | | | | | | | | | | // | | | | | | | | | | | | | | | | | |
// `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------' // `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------'
@ -144,6 +147,9 @@ row after using [ErgoDox](https://www.ergodox.io/) keyboards for a few
years. Do not feel I need a numpad layer, which seems to be quite years. Do not feel I need a numpad layer, which seems to be quite
common with small keyboards like this. common with small keyboards like this.
Esc and Delete is also on this layer as they are easy to reach and they
only need to be chord with the modifiers.
# Adjust Layer: RGB # Adjust Layer: RGB
``` ```
// //

31
keyboards/kyria/keymaps/plattfot/keymap.c
View file

@ -52,8 +52,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------| * |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------|
* | LShift | Z | X | C | V | B | Lead | RAISE| | LOWER|DBLTAP| N | M | , < | . > | / ? | RShift | * | LShift | Z | X | C | V | B | Lead | RAISE| | LOWER|DBLTAP| N | M | , < | . > | / ? | RShift |
* `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------' * `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------'
* | MPlay| GUI | LCtrl| Space| LALT | | Enter|BSpace| NAV | LAlt |Worksp| * | MPlay| GUI | LCtrl| Space| LALT | | Enter|BSpace| NAV |LCTL+ |Worksp|
* | | | | | | | | | | |toggle| * | | | | | | | | | |LALT |toggle|
* `----------------------------------' `----------------------------------' * `----------------------------------' `----------------------------------'
*/ */
[_DEFAULT] = LAYOUT( [_DEFAULT] = LAYOUT(
@ -91,26 +91,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |--------+------+------+------+------+------| |------+------+------+------+------+--------| * |--------+------+------+------+------+------| |------+------+------+------+------+--------|
* | | | | | | F11 | | F12 | | | | | | * | | | | | | F11 | | F12 | | | | | |
* |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------| * |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------|
* | | | | | | |ScLock| | | | Ins | | | | | | | * | | | | | | |ScLock| | | | Ins | | | | | |CapsLock|
* `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------' * `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------'
* | | | | | | | Esc | Del | | RAlt | | * | | | | | | | | | | RAlt | |
* | | | | | | | | | | | | * | | | | | | | | | | | |
* `----------------------------------' `----------------------------------' * `----------------------------------' `----------------------------------'
*/ */
[_RAISE] = LAYOUT( [_RAISE] = LAYOUT(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, 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_F11, KC_F12, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, KC_SLCK, _______, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLCK, _______, _______, KC_INS, _______, _______, _______, _______, _______, KC_CAPS,
_______, _______, _______, _______, _______, KC_ESC, KC_DEL, _______, KC_RALT, _______ _______, _______, _______, _______, _______, _______, _______, _______, KC_RALT, _______
), ),
/* /*
* Navigation Layer: Number keys, navigation * Navigation Layer: Number keys, navigation, modification
* *
* ,-------------------------------------------. ,-------------------------------------------. * ,-------------------------------------------. ,-------------------------------------------.
* | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | | * | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | |
* |--------+------+------+------+------+------| |------+------+------+------+------+--------| * |--------+------+------+------+------+------| |------+------+------+------+------+--------|
* | | | | | | | | | Left | Up | Down | Right| | * | | | Esc | Del | | | | | Left | Up | Down | Right| |
* |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------| * |--------+------+------+------+------+------+-------------. ,-------------+------+------+------+------+------+--------|
* | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | | | |
* `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------' * `----------------------+------+------+------+------+------| |------+------+------+------+------+----------------------'
@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/ */
[_NAV] = LAYOUT( [_NAV] = LAYOUT(
_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______,
_______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, _______, _______, _______, KC_ESC, KC_DEL, _______, _______, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, KC_RCTL, _______ _______, _______, _______, _______, _______, _______, _______, _______, KC_RCTL, _______
), ),
@ -177,27 +177,22 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
// Double tap gets messed up with macros, turning it off // Double tap gets messed up with macros, turning it off
double_tap_it = false; double_tap_it = false;
SEND_STRING("()" SS_TAP(X_LEFT)); SEND_STRING("()" SS_TAP(X_LEFT));
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
return false; return false;
case M_LRCBR: case M_LRCBR:
double_tap_it = false; double_tap_it = false;
SEND_STRING("{}" SS_TAP(X_LEFT)); SEND_STRING("{}" SS_TAP(X_LEFT));
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
return false; return false;
case M_LRBRC: case M_LRBRC:
double_tap_it = false; double_tap_it = false;
SEND_STRING("[]" SS_TAP(X_LEFT)); SEND_STRING("[]" SS_TAP(X_LEFT));
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
return false; return false;
case M_LRABR: case M_LRABR:
double_tap_it = false; double_tap_it = false;
SEND_STRING("<>" SS_TAP(X_LEFT)); SEND_STRING("<>" SS_TAP(X_LEFT));
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
return false; return false;
case M_DQUOT: case M_DQUOT:
double_tap_it = false; double_tap_it = false;
SEND_STRING("''" SS_TAP(X_LEFT)); SEND_STRING("''" SS_TAP(X_LEFT));
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
return false; return false;
case DBL_TAP: case DBL_TAP:
double_tap_it = !double_tap_it; double_tap_it = !double_tap_it;
@ -206,10 +201,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
double_tap_it = false; double_tap_it = false;
return true; return true;
} }
} else if (double_tap_it && keycode != DBL_TAP) {
} else if (double_tap_it &&
keycode != DBL_TAP &&
keycode != OSL(_RAISE) &&
keycode != OSL(_LOWER) &&
keycode != MO(_NAV)) {
double_tap_it = false; double_tap_it = false;
tap_code16(keycode); tap_code16(keycode);
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
} }
return true; return true;