diff --git a/dgvigil/definitions/keymap_blocks.h b/dgvigil/definitions/keymap_blocks.h index 1f028da..bb47ca5 100644 --- a/dgvigil/definitions/keymap_blocks.h +++ b/dgvigil/definitions/keymap_blocks.h @@ -15,18 +15,18 @@ #define ____THUMB2BLANK_ _______, _______ // EMPTY ROW -#define __________________EMPTY_____________________ _______, _______, _______, _______, _______ +#define __________________EMPTY_____________________ _______, _______, _______, _______, _______ // BOOTLOADER -#define _________________BOOT_R1____________________ _______, _______, _______, _______, QK_BOOTLOADER -#define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,_______,_______,_______ +#define _________________BOOT_R1____________________ _______, _______, _______, _______, QK_BOOTLOADER +#define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,_______,_______,_______ // _BASE -#define __________________BASE_L1____________________ Q_ESC, KC_W, KC_E, KC_R, KC_T +#define __________________BASE_L1____________________ Q_ESC, KC_W, KC_E, KC_R, KC_T #define __________________BASE_L2____________________ KC_A, KC_S, KC_D, KC_F, KC_G #define __________________BASE_L3____________________ KC_Z, KC_X, KC_C, KC_V, KC_B -#define __________________BASE_R1____________________ KC_Y, KC_U, KC_I, KC_O, KC_P +#define __________________BASE_R1____________________ KC_Y, KC_U, KC_I, KC_O, KC_P #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 @@ -35,15 +35,15 @@ #define __________________NAV_L2____________________ _______, _______, _______, M_PASS3, M_PASS4 #define __________________NAV_L3____________________ _______, _______, _______, M_PASS2, M_PASS1 -#define __________________NAV_R1____________________ KC_CAPS, PASTE, COPY, CUT, UNDO +#define __________________NAV_R1____________________ KC_CAPS, PASTE, COPY, CUT, UNDO #define __________________NAV_R2____________________ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______ #define __________________NAV_R3____________________ SALL, 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_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 @@ -73,10 +73,10 @@ #define __________________MOU_R3____________________ KC_BTN2, KC_BTN1, KC_WH_D, KC_WH_U, KC_BTN2 // COLEMAK-DH -#define __________________COLEML1____________________ Q_ESC, KC_W, KC_F, KC_P, KC_B +#define __________________COLEML1____________________ Q_ESC, KC_W, KC_F, KC_P, KC_B #define __________________COLEML2____________________ KC_A, KC_R, KC_S, KC_T, KC_G #define __________________COLEML3____________________ KC_Z, KC_X, KC_C, KC_D, KC_V -#define __________________COLEMR1____________________ KC_J, KC_L, KC_U, KC_Y, KC_QUOT +#define __________________COLEMR1____________________ KC_J, KC_L, KC_U, KC_Y, KC_QUOT #define __________________COLEMR2____________________ KC_M, KC_N, KC_E, KC_I, KC_O #define __________________COLEMR3____________________ KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH diff --git a/q8/keymap.c b/q8/keymap.c index be70711..906b0a5 100644 --- a/q8/keymap.c +++ b/q8/keymap.c @@ -20,8 +20,8 @@ // clang-format off enum layers{ - MAC_BASE, - WIN_BASE, + QWERTY, + COLEDH, _NAV, _NUM, _SYM, @@ -31,70 +31,70 @@ enum layers{ }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_ansi_69( + [QWERTY] = LAYOUT_ansi_69( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(_NAV), MO(_MOUSE), KC_SPC, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT), + KC_TAB, __________________BASE_L1____________________, __________________BASE_R1____________________, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, __________________BASE_L2____________________, __________________BASE_R2____________________, KC_QUOT, KC_ENT, KC_HOME, + KC_LSFT, __________________BASE_L3____________________, KC_B, __________________BASE_R3____________________, KC_RSFT, KC_UP, + KC_LCTL, KC_LOPTN, ___________THUMB_L3________, ___________THUMB_R3________, KC_LEFT, KC_DOWN, KC_RGHT), - [WIN_BASE] = LAYOUT_ansi_69( + [COLEDH] = LAYOUT_ansi_69( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_HOME, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(_NUM), MO(_MOUSE), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), + KC_TAB, __________________COLEML1____________________, __________________COLEMR1____________________, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, __________________COLEML2____________________, __________________COLEMR2____________________, KC_QUOT, KC_ENT, KC_HOME, + KC_LSFT, __________________COLEML3____________________, KC_B, __________________COLEMR3____________________, KC_RSFT, KC_UP, + KC_LCTL, KC_LWIN, ___________THUMB_L3________, ___________THUMB_R3________, KC_LEFT, KC_DOWN, KC_RGHT), [_NAV] = LAYOUT_ansi_69( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, __________________EMPTY_____________________, __________________NAV_R1____________________, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, __________________NAV_L2____________________, __________________NAV_R2____________________, KC_QUOT, KC_ENT, KC_HOME, + KC_LSFT, __________________NAV_L3____________________, KC_B, __________________NAV_R3____________________, KC_RSFT, KC_UP, + KC_LCTL, KC_LWIN, ___________THUMB_L3________, ___________THUMB_R3________, KC_LEFT, KC_DOWN, KC_RGHT), [_NUM] = LAYOUT_ansi_69( - KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, __________________COLEML1____________________, __________________COLEMR1____________________, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, __________________COLEML2____________________, __________________COLEMR2____________________, KC_QUOT, KC_ENT, KC_HOME, + KC_LSFT, __________________COLEML3____________________, KC_B, __________________COLEMR3____________________, KC_RSFT, KC_UP, + KC_LCTL, KC_LWIN, _________NUM_TH_L3________, ___________THUMB_3__BLANK__, KC_LEFT, KC_DOWN, KC_RGHT), [_SYM] = LAYOUT_ansi_69( - KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, __________________SYM_L1____________________, __________________COLEMR1____________________, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, __________________SYM_L2____________________, __________________COLEMR2____________________, KC_QUOT, KC_ENT, KC_HOME, + KC_LSFT, __________________SYM_L3____________________, KC_B, __________________COLEMR3____________________, KC_RSFT, KC_UP, + KC_LCTL, KC_LWIN, _________SYM_TH_L3________, ___________THUMB_3__BLANK__, KC_LEFT, KC_DOWN, KC_RGHT), [_FUN] = LAYOUT_ansi_69( - KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, __________________FUN_L1____________________, _________________BOOT_R1____________________, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, __________________FUN_L2____________________, __________________EMPTY_____________________, KC_QUOT, KC_ENT, KC_HOME, + KC_LSFT, __________________FUN_L3____________________, KC_B, __________________EMPTY_____________________, KC_RSFT, KC_UP, + KC_LCTL, KC_LWIN, ___________THUMB_3__BLANK__, ___________THUMB_3__BLANK__, KC_LEFT, KC_DOWN, KC_RGHT), [_MUS] = LAYOUT_ansi_69( - KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, _________________BOOT_L1____________________, __________________EMPTY_____________________, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, __________________EMPTY_____________________, __________________MUS_R2____________________, KC_QUOT, KC_ENT, KC_HOME, + KC_LSFT, __________________EMPTY_____________________, KC_B, __________________MUS_R3____________________, KC_RSFT, KC_UP, + KC_LCTL, KC_LWIN, ___________THUMB_3__BLANK__, ___________THUMB_3__BLANK__, KC_LEFT, KC_DOWN, KC_RGHT), [_MOUSE] = LAYOUT_ansi_69( - KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, __________________EMPTY_____________________, __________________MOU_R1____________________, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, __________________EMPTY_____________________, __________________MOU_R2____________________, KC_QUOT, KC_ENT, KC_HOME, + KC_LSFT, __________________EMPTY_____________________, KC_B, __________________MOU_R3____________________, KC_RSFT, KC_UP, + KC_LCTL, KC_LWIN, ___________THUMB_3__BLANK__, ___________THUMB_3__BLANK__, KC_LEFT, KC_DOWN, KC_RGHT) }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [_NAV] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, + [QWERTY] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [COLEDH] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [_NAV] = {ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)}, [_NUM] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [_FUN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, + [_FUN] = {ENCODER_CCW_CW(RGB_HUI, RGB_HUD)}, [_MUS] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, [_MOUSE] = {ENCODER_CCW_CW(_______, _______)} };