[Phoebe] Keymap improvements (#9092)

Enable leader key with some useful macros, use fancier design for keymap previews in code, other smaller tweaks
master
Max Rumpf 2020-05-16 08:43:10 +02:00 committed by GitHub
parent 9cf69a1997
commit d89e552419
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 71 additions and 49 deletions

View File

@ -57,6 +57,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_CHRISTMAS #define RGBLIGHT_EFFECT_CHRISTMAS
#define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1 #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
/* Leader key setup */
#define LEADER_PER_KEY_TIMING
#define LEADER_TIMEOUT 250
/* /*
* Feature disable options * Feature disable options
* These options are also useful to firmware size reduction. * These options are also useful to firmware size reduction.

View File

@ -1,6 +1,7 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#include "keymap_german.h" #include "keymap_german.h"
#include "sendstring_german.h"
enum layers { enum layers {
_QWERTZ, _QWERTZ,
@ -16,40 +17,40 @@ enum layers {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwertz /* QWERTZ
* ,-----------------------------------------------------------------------------------. *
* | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ? | * Esc 1 2 3 4 5 6 7 8 9 0 ?
* |------+------+------+------+------+------+------+------+------+------+------+------| *
* | ^ ° | Q | W | E | R | T | Z | U | I | O | P | Bspc | * ^ ° Q W E R T Z U I O P Bkspc
* |------+------+------+------+------+------+------+------+------+------+------+------| *
* | Tab | A | S | D | F | G | H | J | K | L | +* ~ | Enter| * Tab A S D F G H J K L +*~ Enter
* |------+------+------+------+------+------+------+------+------+------+------+------| *
* | Shift| Y | X | C | V | B | N | M | , | . | Up | Shift| * Shift Y X C V B N M , . Shift
* |------+------+------+------+------+------+------+------+------+------+------+------| *
* | Ctrl | Sup | Alt | Alt | SpCh | Space | AltGr| Fun | Left | Down | Right| * Ctl Sup Alt LeadKSpcCh Space AltGr Fun
* `-----------------------------------------------------------------------------------' *
*/ */
[_QWERTZ] = LAYOUT( [_QWERTZ] = LAYOUT(
KC_ESC, DE_1, DE_2, DE_3, DE_4, DE_5, DE_6, DE_7, DE_8, DE_9, DE_0, DE_QST, KC_ESC, DE_1, DE_2, DE_3, DE_4, DE_5, DE_6, DE_7, DE_8, DE_9, DE_0, DE_QST,
KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, DE_PLUS, KC_ENT, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, DE_PLUS, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSPC, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSPC,
KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, KC_SC, KC_SPC, KC_ALGR, KC_FN, KC_LEFT, KC_DOWN, KC_RGHT KC_LCTL, KC_LGUI, KC_LALT, KC_LEAD, KC_SC, KC_SPC, KC_ALGR, KC_FN, KC_LEFT, KC_DOWN, KC_RGHT
), ),
/* Special characters /* Special characters
* ,-----------------------------------------------------------------------------------. *
* | | | | | | | | | | | | | *
* |------+------+------+------+------+------+------+------+------+------+------+------| *
* | ´ ` | | | | | | | | | | | | * ´ `
* |------+------+------+------+------+------+------+------+------+------+------+------| *
* | | | | | | | | | | | #' | | * # '
* |------+------+------+------+------+------+------+------+------+------+------+------| *
* | | <> | | | | | | | | | | -_ | | * <>| - _
* |------+------+------+------+------+------+------+------+------+------+------+------| *
* | | | | ---- | ---- | | | ---- | | | | * X X
* `-----------------------------------------------------------------------------------' *
*/ */
[_SC] = LAYOUT( [_SC] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
DE_ACUT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DE_ACUT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@ -59,17 +60,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
), ),
/* Function layer /* Function layer
* ,-----------------------------------------------------------------------------------. *
* | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F10 | F11 | F12 | * F1 F2 F3 F4 F5 F6 F7 F8 F10 F11 F12
* |------+------+------+------+------+------+------+------+------+------+------+------| *
* | | | | | | | | Ü | F9 | Ö | | Del | * Ü F9 Ö Del
* |------+------+------+------+------+------+------+------+------+------+------+------| *
* | Lock | Ä | ß | | | GAME | | RGBS | RGBB | RGBS | | | * Lck Ä ß GAME RGB SRGB BRGB S
* |------+------+------+------+------+------+------+------+------+------+------+------| *
* | | | | | | | | RGBH-| RGBT | RGBH+| PgUp | | * RGBH-RGB TRGBH+ Pg
* |------+------+------+------+------+------+------+------+------+------+------+------| *
* | | | | ---- | ---- | | ---- | ---- | Home | PgDn | End | * X X X X X X Home Pg End
* `-----------------------------------------------------------------------------------' *
*/ */
[_FN] = LAYOUT( [_FN] = LAYOUT(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F10, KC_F11, KC_F12, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F10, KC_F11, KC_F12,
@ -80,24 +81,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
), ),
/* Gaming /* Gaming
* ,-----------------------------------------------------------------------------------. *
* | | | | | | | | | | | | | *
* |------+------+------+------+------+------+------+------+------+------+------+------| *
* | | | | | | | | | | | | | *
* |------+------+------+------+------+------+------+------+------+------+------+------| *
* | | | | | | | | | | | | | *
* |------+------+------+------+------+------+------+------+------+------+------+------| *
* | | | | | | | | | | | | | *
* |------+------+------+------+------+------+------+------+------+------+------+------| *
* | Space| | | | | | | Leave| | | | * Space Ctl Leave
* `-----------------------------------------------------------------------------------' *
*/ */
[_GAMING] = LAYOUT( [_GAMING] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
KC_SPC, XXXXXXX, _______, _______, _______, _______, _______, G_0, _______, _______, _______ KC_SPC, XXXXXXX, _______, _______, _______, KC_LCTL, _______, G_0, _______, _______, _______
) )
}; };
@ -128,3 +129,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
} }
return true; return true;
}; };
LEADER_EXTERNS();
void matrix_scan_user(void) {
LEADER_DICTIONARY() {
leading = false;
leader_end();
SEQ_TWO_KEYS(KC_G, KC_P) {
SEND_STRING("git push");
}
SEQ_THREE_KEYS(KC_G, KC_F, KC_P) {
SEND_STRING("git push --force-with-lease");
}
}
}

View File

@ -29,5 +29,6 @@ UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
KEY_LOCK_ENABLE = yes KEY_LOCK_ENABLE = yes
LEADER_ENABLE = yes # Enable leader key
API_SYSEX_ENABLE = no API_SYSEX_ENABLE = no
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend