From 3f3579bacc63c2ba47255f2dcea1a296b43ca604 Mon Sep 17 00:00:00 2001 From: Dave G Vigil Sr Date: Sat, 18 Nov 2023 20:29:47 -0600 Subject: [PATCH] --wip-- [skip ci] --- dgvigil/definitions/keymap_blocks.h | 50 +++++++++++++++++++++++++++-- iris/keymap.c | 38 +++++++++++----------- sweep/keymap.c | 32 +++++++++--------- 3 files changed, 82 insertions(+), 38 deletions(-) diff --git a/dgvigil/definitions/keymap_blocks.h b/dgvigil/definitions/keymap_blocks.h index 6be5460..d92fb50 100644 --- a/dgvigil/definitions/keymap_blocks.h +++ b/dgvigil/definitions/keymap_blocks.h @@ -8,10 +8,18 @@ // THUMB KEYS #define ___________THUMB_L3________ MUS_ESC, NAV_BKSP,MOUSE_TAB #define ___________THUMB_R3________ SYM_ENTER,NUM_SPC,FUN_DEL -#define +#define _________________BOOT_L1____________________ _______, _______, _______ #define ____THUMB_L2____ NAV_BKSP,FUN_TAB #define ____THUMB_R2____ SYM_ENTER,NUM_SPC +#define ____THUMB2BLANK_ _______, _______ + +// EMPTY ROW +#define __________________EMPTY_____________________ _______, _______, _______, _______, _______ +// BOOTLOADER +#define _________________BOOT_R1____________________ _______, _______, _______, _______, QK_BOOTLOADER +#define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,_______,_______,_______ + // _BASE #define __________________BASE_L1____________________ Q_ESC, W_GRV, KC_E, KC_R, KC_T @@ -22,11 +30,47 @@ #define __________________BASE_R2____________________ KC_H, KC_J, KC_K, KC_L, KC_QUOT #define __________________BASE_R3____________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH + // _NAV -#define __________________NAV_L1____________________ QK_BOOTLOADER,_______,_______,_______,_______ -#define __________________NAV_L2____________________ _______, _______, _______, _______, _______ #define __________________NAV_L3____________________ _______, _______, _______, M_PASS2, M_PASS1 #define __________________NAV_R1____________________ _______, KC_PSTE, KC_COPY, KC_CUT, KC_UNDO #define __________________NAV_R2____________________ KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT #define __________________NAV_R3____________________ _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END + + +// NUM + +#define __________________NUM_L1____________________ KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC +#define __________________NUM_L2____________________ KC_SCLN, KC_4, KC_5, KC_6, KC_EQL +#define __________________NUM_L3____________________ KC_DOT, KC_1, KC_2, KC_3, KC_BSLS +#define _________NUM_TH_L3________ KC_DOT, KC_0, KC_MINUS +#define _____NUM_TH_L2___ KC_0, KC_MINUS + + +// SYM +#define __________________SYM_L1____________________ KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR +#define __________________SYM_L1____________________ KC_COLN, KC_DLR, KC_PERC, KC_CIRC, KC_PLUS +#define __________________SYM_L1____________________ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_PIPE +#define _________SYM_TH_L3________ KC_LPRN, KC_RPRN, KC_UNDS +#define _____SYM_TH_L2___ KC_RPRN, KC_UNDS + +// FUN +#define __________________FUN_R1____________________ _______, _______, _______, _______, QK_BOOTLOADER +#define __________________FUN_L1____________________ KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR +#define __________________FUN_L1____________________ KC_COLN, KC_DLR, KC_PERC, KC_CIRC, KC_PLUS +#define __________________FUN_L1____________________ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_PIPE + + +// MUS +#define __________________MUS_L1____________________ QK_BOOTLOADER, _______, _______, _______, _______ + +#define __________________MUS_R1____________________ KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR +#define __________________MUS_R2____________________ KC_COLN, KC_DLR, KC_PERC, KC_CIRC, KC_PLUS +#define __________________MUS_R3____________________ KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_PIPE + + +// MOUSE +#define __________________MOU_R1____________________ _______, KC_PSTE, KC_COPY, KC_CUT, KC_UNDO +#define __________________MOU_R2____________________ KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R +#define __________________MOU_R3____________________ KC_BTN2, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R \ No newline at end of file diff --git a/iris/keymap.c b/iris/keymap.c index 33585af..c61f764 100644 --- a/iris/keymap.c +++ b/iris/keymap.c @@ -70,11 +70,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MUTE, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - KC_LPAD, Q_ESC, W_GRV, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_GRV, + KC_LPAD, __________________BASE_L1____________________ __________________BASE_R1____________________, KC_GRV, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, _______, + _______, __________________BASE_L2____________________ __________________BASE_R2____________________, _______, //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, QK_CAPS_WORD_TOGGLE, _______, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LSFT, __________________BASE_L3____________________,QK_CAPS_WORD_TOGGLE, _______, __________________BASE_R3____________________, KC_RSFT, //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ MUS_ESC, NAV_BKSP,MOUSE_TAB, SYM_ENTER,NUM_SPC,FUN_DEL // └────────┴────────┴────────┘ └────────┴────────┴────────┘ @@ -84,13 +84,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ _______, _______, _______, _______, _______, KC_LPAD, KC_PSCR, _______, _______, _______, _______, RGB_TOG, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, QK_CAPS_WORD_TOGGLE, _______, KC_PSTE, KC_COPY, KC_CUT, KC_UNDO, _______, + _______, __________________NAV_L1____________________, __________________NAV_R1____________________, _______, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, + _______, __________________EMPTY_____________________, __________________NAV_R2____________________, _______, //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, M_PASS2, M_PASS1, QK_LEAD, _______, _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______, + _______, __________________NAV_L3____________________, QK_LEAD, _______, __________________NAV_R2____________________, _______, //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - _______, _______, _______, _______, _______, _______ + ___________THUMB_3__BLANK__, ___________THUMB_3__BLANK__ // └────────┴────────┴────────┘ └────────┴────────┴────────┘ ), @@ -98,13 +98,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ _______, _______, _______, _______, _______, KC_LPAD, KC_PSCR, _______, _______, _______, _______, _______, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, _______, _______, _______, _______, _______, _______, + _______, __________________NUM_L1____________________, __________________NUM_R1____________________, _______, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, KC_SCLN, KC_4, KC_5, KC_6, KC_EQL, _______, _______, _______, _______, _______, _______, + _______, __________________NUM_L2____________________, __________________EMPTY_____________________, _______, //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - _______, KC_DOT, KC_1, KC_2, KC_3, KC_BSLS, KC_LPRN, _______, _______, _______, _______, _______, _______, _______, + _______, __________________NUM_L3____________________, KC_LPRN, _______, __________________EMPTY_____________________, _______, //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - KC_DOT, KC_0, KC_MINUS, _______, _______, _______ + _________NUM_TH_L3________, ___________THUMB_3__BLANK__ // └────────┴────────┴────────┘ └────────┴────────┴────────┘ ), @@ -112,13 +112,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ _______, _______, _______, _______, _______, KC_LPAD, KC_PSCR, _______, _______, _______, _______, _______, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, _______, _______, _______, _______, _______, _______, + _______, __________________SYM_L1____________________, __________________EMPTY_____________________, _______, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, KC_COLN, KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, _______, _______, _______, _______, _______, _______, + _______, __________________SYM_L2____________________, __________________EMPTY_____________________, _______, //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - _______, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_PIPE, _______, _______, _______, _______, _______, _______, _______, _______, + _______, __________________SYM_L3____________________, _______, _______, __________________EMPTY_____________________, _______, //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ - KC_LPRN, KC_RPRN, KC_UNDS, _______, _______, _______ + _________SYM_TH_L3________, _______, _______, _______ // └────────┴────────┴────────┘ └────────┴────────┴────────┘ ), @@ -126,11 +126,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ _______, _______, _______, _______, _______, KC_LPAD, KC_PSCR, _______, _______, _______, _______, _______, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, KC_F12, KC_F7, KC_F8, KC_F9, KC_PSCR, _______, _______, _______, _______, QK_BOOTLOADER, _______, + _______, __________________FUN_L1____________________, _________________BOOT_R1____________________, _______, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, KC_F11, KC_F4, KC_F5, KC_F6, _______, _______, _______, _______, _______, _______, _______, + _______, __________________FUN_L1____________________, __________________EMPTY_____________________, _______, //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - _______, KC_F10, KC_F1, KC_F2, KC_F3, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, __________________FUN_L1____________________, _______, _______, __________________EMPTY_____________________, _______, //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ _______, _______, _______, _______, _______, _______ // └────────┴────────┴────────┘ └────────┴────────┴────────┘ @@ -140,7 +140,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ _______, _______, _______, _______, _______, KC_LPAD, KC_PSCR, _______, _______, _______, _______, _______, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ - _______, QK_BOOTLOADER, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _________________BOOT_L1____________________, _______, _______, _______, _______, _______, _______, //├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ diff --git a/sweep/keymap.c b/sweep/keymap.c index 58eb0ee..eaa4eb9 100644 --- a/sweep/keymap.c +++ b/sweep/keymap.c @@ -76,49 +76,49 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NAV] = LAYOUT( // ┌────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┐ - QK_BOOTLOADER,_______,_______,_______,_______, _______, KC_PSTE, KC_COPY, KC_CUT, KC_UNDO, + __________________NAV_L1____________________, __________________NAV_R1____________________, // ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, + __________________EMPTY_____________________, __________________NAV_R2____________________, // ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______,M_PASS2, M_PASS1, _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END, + __________________NAV_L3____________________, __________________NAV_R3____________________, // ├────────┼────────┼────────┼────┬───┴────┬───┴───┐ ┌────┴───┬────────┼────────┼────────┼─────────┘ - _______, _______, _______, _______ + ____THUMB2BLANK_, ____THUMB2BLANK_ // └────────┴───────┘ └────────┴────────┘ ), [_NUM] = LAYOUT( // ┌────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┐ - KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, _______, _______, _______, _______, QK_BOOTLOADER, + __________________NUM_L1____________________, __________________NUM_R1____________________, // ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤ - KC_SCLN, KC_4, KC_5, KC_6, KC_EQL, _______, _______, _______, _______, _______, + __________________NUM_L2____________________ __________________EMPTY_____________________, // ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤ - KC_DOT, KC_1, KC_2, KC_3, KC_MINS, _______, _______, _______, _______, _______, + __________________NUM_L3____________________, __________________EMPTY_____________________, // ├────────┼────────┼────────┼────┬───┴────┬───┴───┐ ┌────┴───┬────────┼────────┼────────┼─────────┘ - KC_0, KC_MINUS, _______, _______ + _____NUM_TH_L2___, ____THUMB2BLANK_ // └────────┴───────┘ └────────┴────────┘ ), [_SYM] = LAYOUT( // ┌────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┐ - KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RBRC, _______, _______, _______, _______, _______, + __________________SYM_L1____________________, __________________EMPTY_____________________, // ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤ - KC_COLN, KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, KC_LPRN, KC_RPRN, _______, _______, _______, + __________________SYM_L2____________________, __________________EMPTY_____________________, // ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤ - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_PIPE, KC_LPRN, KC_RPRN, _______, _______, _______, + __________________SYM_L3____________________, __________________EMPTY_____________________, // ├────────┼────────┼────────┼────┬───┴────┬───┴───┐ ┌────┴───┬────────┼────────┼────────┼─────────┘ - KC_RPRN, KC_UNDS, _______, _______ + _____SYM_TH_L2___, ____THUMB2BLANK_ // └────────┴───────┘ └────────┴────────┘ ), [_FUN] = LAYOUT( // ┌────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┐ - _______, _______, _______, _______, _______, KC_F12, KC_F7, KC_F8, KC_F9, KC_PSCR, + __________________EMPTY_____________________, KC_F12, KC_F7, KC_F8, KC_F9, KC_PSCR, // ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, KC_F11, KC_F4, KC_F5, KC_F6, _______, + __________________EMPTY_____________________, KC_F11, KC_F4, KC_F5, KC_F6, _______, // ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤ - _______, _______, _______, _______, _______, KC_F10, KC_F1, KC_F2, KC_F3, _______, + __________________EMPTY_____________________, KC_F10, KC_F1, KC_F2, KC_F3, _______, // ├────────┼────────┼────────┼────┬───┴────┬───┴───┐ ┌────┴───┬────────┼────────┼────────┼─────────┘ - _______, _______, _______, _______ + ____THUMB2BLANK_, ____THUMB2BLANK_ // └────────┴───────┘ └────────┴────────┘ )