diff --git a/keymap/keymap.c b/keymap/keymap.c index 0e2caf8..295a7ca 100644 --- a/keymap/keymap.c +++ b/keymap/keymap.c @@ -4,6 +4,9 @@ #define _T2 _TALI_LAYER2 #define _T3 _TALI_LAYER3 #define _GL _GAME_LAYER +#define _FL _FUNCTION_LAYER +#define _UL _UNB_W_LAY +#define _U2 _UNB_W_LAY_2 enum alt_keycodes { U_T_AUTO = SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active @@ -30,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, \ - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT \ ), [_GAME_LAYER] = LAYOUT_65_ansi_blocker( KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ @@ -39,12 +42,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ KC_LCTL, XXXXXXX, KC_LALT, _______, _______, _______, _______, _______, _______ \ ), + [_UNB_W_LAY] = LAYOUT_65_ansi_blocker( + KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, KC_Q, KC_E, _______, _______, _______, _______, _______, _______, \ + XXXXXXX, KC_Q, _______, KC_E, _______, _______, KC_A, KC_S, KC_W, KC_D, _______, _______, KC_ESC, _______, \ + _______, _______, _______, _______, _______, _______, KC_SPC, _______, _______, _______, _______, _______, _______, _______, \ + _______, XXXXXXX, TG(_U2), KC_F, TG(_U2), MO(_FL), _______, _______, _______ \ + ), + [_UNB_W_LAY_2] = LAYOUT_65_ansi_blocker( + KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, \ + XXXXXXX, KC_Q, _______, KC_E, _______, _______, KC_F, KC_J, KC_K, KC_D, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, XXXXXXX, _______, _______, _______, XXXXXXX, _______, _______, _______ \ + ), [_FUNCTION_LAYER] = LAYOUT_65_ansi_blocker( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RCTL(KC_BSPC), RALT(KC_PSCR), \ _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, TG(_TL), _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_DEL, \ - _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, TG(_GL), _______, _______, _______, G(KC_L), _______, _______, RCTL(KC_ENT), KC_VOLU, \ + _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, TG(_GL), TG(_UL), _______, _______, G(KC_L), _______, _______, RCTL(KC_ENT), KC_VOLU, \ _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, RCTL(KC_SLSH), _______, KC_PGUP, KC_VOLD, \ - _______, _______, _______, KC_MEDIA_PLAY_PAUSE, _______, _______, RCTL(KC_LEFT), KC_PGDN, RCTL(KC_RGHT) \ + _______, _______, _______, KC_MEDIA_PLAY_PAUSE, _______, MO(_FL), RCTL(KC_LEFT), KC_PGDN, RCTL(KC_RGHT) \ ), [_TALI_LAYER] = LAYOUT( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ @@ -91,7 +108,7 @@ const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { [_FUNCTION_LAYER] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_TALI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, C_SECO, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, C_SECO, C_SECO, _______, _______, _______, _______, _______, _______, _______, _______, C_PRIM, _______, _______, _______, C_PRIM, _______, _______, _______, _______, _______, _______, C_MODI, _______, _______, _______, _______, _______, _______, _______, C_MODI, C_MODI, C_MODI, //UnderGlow @@ -157,6 +174,34 @@ const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO + }, + [_UNB_W_LAY] = { + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, C_MODI, C_MODI, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, C_PRIM, C_PRIM, C_PRIM, C_PRIM, _______, _______, C_TALI, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, C_TAL3, C_TAL3, C_TAL3, _______, _______, _______, _______, + //UnderGlow + C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, + C_SECO, C_SECO, + C_SECO, C_SECO, + C_SECO, C_SECO, + C_SECO, C_SECO, + C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO, C_SECO + }, + [_UNB_W_LAY_2] = { + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, C_TAL2, C_PRIM, C_PRIM, C_TAL2, _______, _______, C_TALI, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, C_TALI, C_TAL3, C_TALI, _______, _______, _______, _______, + //UnderGlow + C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, + C_PRIM, C_PRIM, + C_PRIM, C_PRIM, + C_PRIM, C_PRIM, + C_PRIM, C_PRIM, + C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM, C_PRIM } }; diff --git a/keymap/keymap.h b/keymap/keymap.h index cd08805..6fef0af 100644 --- a/keymap/keymap.h +++ b/keymap/keymap.h @@ -10,8 +10,10 @@ enum layout_names { _TYPING_LAYER=0, - _FUNCTION_LAYER, _GAME_LAYER, + _UNB_W_LAY, + _UNB_W_LAY_2, + _FUNCTION_LAYER, _TALI_LAYER, _TALI_LAYER2, _TALI_LAYER3,