From d09965aa581c1c83d76f4234f21c2f8dcb631afd Mon Sep 17 00:00:00 2001 From: Dave G Vigil Sr Date: Sat, 18 Nov 2023 14:06:50 -0600 Subject: [PATCH] Updated Sweep keymap --- dgvigil/rules.mk | 12 +++++++ sweep/keymap.c | 91 ++++++++++++++++++++++++++++-------------------- sweep/rules.mk | 4 +++ 3 files changed, 69 insertions(+), 38 deletions(-) diff --git a/dgvigil/rules.mk b/dgvigil/rules.mk index 245757d..6b8dbc3 100644 --- a/dgvigil/rules.mk +++ b/dgvigil/rules.mk @@ -1 +1,13 @@ SRC += dgvigil.c +SRC += secret.c +SRC += definitions/keycodes.c +SRC += features/tapdance.c +SRC += features/combos.c + +REPEAT_KEY_ENABLE = yes +AUTO_SHIFT_ENABLE = yes +CAPS_WORD_ENABLE = yes +COMBO_ENABLE = yes +TAP_DANCE_ENABLE = yes +RGBLIGHT_ENABLE = yes +LTO_ENABLE = yes diff --git a/sweep/keymap.c b/sweep/keymap.c index e52dcaa..503f44b 100644 --- a/sweep/keymap.c +++ b/sweep/keymap.c @@ -1,23 +1,11 @@ #include QMK_KEYBOARD_H -#define _BASE 0 -#define _NAV 1 -#define _NUM 2 -#define _SYM 3 -#define _FUN 4 - -//Tap Dance Declarations -enum { - TD_ESC_Q, - TD_ESC_A, -}; - -//Tap Dance Definitions -tap_dance_action_t tap_dance_actions[] = { - //Tap once for Q, twice for Esc - [TD_ESC_Q] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), - //Tap once for A, twice for Tab - [TD_ESC_A] = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB) +enum layer_number { + _BASE, + _NAV, + _NUM, + _SYM, + _FUN }; enum custom_keycodes { @@ -25,36 +13,63 @@ enum custom_keycodes { M_PASS2 }; +// Tap Dance declarations +enum { + TD_Q_ESC, + TD_W_GRV, +}; + +// Tap Dance definitions +tap_dance_action_t tap_dance_actions[] = { + // Tap once for Q, twice for Escape + [TD_Q_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), + [TD_W_GRV] = ACTION_TAP_DANCE_DOUBLE(KC_W, KC_GRAVE), +}; + +enum combos { + FA_GUI, + FS_ALT, + FD_CTL, + JQUOT_GUI, + JL_ALT, + JK_CTL +}; + +const uint16_t PROGMEM fa_combo[] = {KC_F, KC_A, COMBO_END}; +const uint16_t PROGMEM fs_combo[] = {KC_F, KC_S, COMBO_END}; +const uint16_t PROGMEM fd_combo[] = {KC_F, KC_D, COMBO_END}; +const uint16_t PROGMEM jquote_combo[] = {KC_J, KC_QUOT, COMBO_END}; +const uint16_t PROGMEM jl_combo[] = {KC_J, KC_L, COMBO_END}; +const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END}; + +combo_t key_combos[] = { + [FA_GUI] = COMBO(fa_combo, KC_LGUI), + [FS_ALT] = COMBO(fs_combo, KC_LALT), + [FD_CTL] = COMBO(fd_combo, KC_LCTL), + [JQUOT_GUI] = COMBO(jquote_combo, KC_RGUI), + [JL_ALT] = COMBO(jl_combo, KC_RALT), + [JK_CTL] = COMBO(jk_combo, KC_RCTL), +}; + // LEFT THUMB KEYS #define NAV_BKSP LT(_NAV, KC_BSPC) #define FUN_TAB LT(_FUN, KC_TAB) // RIGHT THUMB KEYS #define SYM_ENTER LT(_SYM, KC_ENTER) #define NUM_SPC LT(_NUM, KC_SPC) - -// QWERTY mods -// LEFT HOME KEY MODS -#define GUIA MT(MOD_LGUI,KC_A) -#define ALTS MT(MOD_LALT,KC_S) -#define CTLD MT(MOD_LCTL,KC_D) -#define SHTF MT(MOD_LSFT,KC_F) -// RIGHT HOME KEY MODS -#define SHTJ MT(MOD_LSFT | MOD_RSFT,KC_J) -#define CTLK MT(MOD_LCTL | MOD_RCTL,KC_K) -#define ALTL MT(MOD_LALT | MOD_RALT,KC_L) -#define GUIQUOT MT(MOD_LGUI | MOD_RGUI,KC_QUOT) - -// Tap Dance -#define KC_EscTap TD(TD_ESC_Q) +#define FUN_DEL LT(_FUN, KC_DEL) +// TAP DANCE +#define Q_ESC TD(TD_Q_ESC) +#define W_GRV TD(TD_W_GRV) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT( // ┌────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┐ - KC_EscTap,KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, + Q_ESC, W_GRV, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, // ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤ GUIA, ALTS, CTLD, SHTF, KC_G, KC_H, SHTJ, CTLK, ALTL, GUIQUOT, // ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤ - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, + KC_A, KC_S, KC_D, KC_F, KC_G, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, // ├────────┼────────┼────────┼────┬───┴────┬───┴───┐ ┌────┴───┬────────┼────────┼────────┼─────────┘ NAV_BKSP,FUN_TAB, SYM_ENTER,NUM_SPC // └────────┴───────┘ └────────┴────────┘ @@ -62,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NAV] = LAYOUT( // ┌────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┐ - _______, _______, _______, _______, _______, _______, KC_PSTE, KC_COPY, KC_CUT, KC_UNDO, + QK_BOOTLOADER,_______,_______,_______,_______, _______, KC_PSTE, KC_COPY, KC_CUT, KC_UNDO, // ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, // ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤ @@ -74,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NUM] = LAYOUT( // ┌────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┐ - KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, _______, _______, _______, _______, _______, + KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, _______, _______, _______, _______, QK_BOOTLOADER, // ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤ KC_SCLN, KC_4, KC_5, KC_6, KC_EQL, _______, _______, _______, _______, _______, // ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤ @@ -120,7 +135,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return false; case M_PASS2: if (record->event.pressed) { - SEND_STRING("C0pperfield!2023"); + SEND_STRING("P0plarLake!2023"); } return false; } diff --git a/sweep/rules.mk b/sweep/rules.mk index 75fa6e4..f1a8d03 100644 --- a/sweep/rules.mk +++ b/sweep/rules.mk @@ -1,4 +1,8 @@ +AUTO_SHIFT_ENABLE = yes +CAPS_WORD_ENABLE = yes +COMBO_ENABLE = yes TAP_DANCE_ENABLE = yes + LTO_ENABLE = yes BOOTLOADER = rp2040 CONVERT_TO = promicro_rp2040