diff --git a/keymap/keymap.c b/keymap/keymap.c index 507bbe6..483b1fa 100644 --- a/keymap/keymap.c +++ b/keymap/keymap.c @@ -3,6 +3,7 @@ #define _TL _TALI_LAYER #define _T2 _TALI_LAYER2 #define _T3 _TALI_LAYER3 +#define _GL _GAME_LAYER enum alt_keycodes { U_T_AUTO = SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active @@ -31,10 +32,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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 \ ), + [_GAME_LAYER] = LAYOUT_65_ansi_blocker( + KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + KC_LCTL, XXXXXXX, KC_LALT, _______, _______, _______, _______, _______, _______ \ + ), [_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), KC_MUTE, \ _______, 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, _______, _______, _______, _______, _______, _______, _______, RCTL(KC_ENT), KC_VOLU, \ + _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, TG(_GL), _______, _______, _______, _______, _______, _______, RCTL(KC_ENT), KC_VOLU, \ _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, RCTL(KC_SLSH), _______, KC_PGUP, KC_VOLD, \ _______, _______, _______, KC_MEDIA_PLAY_PAUSE, _______, _______, KC_HOME, KC_PGDN, KC_END \ ), @@ -70,72 +78,86 @@ const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CORAL, _______, - _______, _______, _______, _______, _______, _______, CORAL, CORAL, CORAL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_PRIM, _______, + _______, _______, _______, _______, _______, _______, C_PRIM, C_PRIM, C_PRIM, //UnderGlow - CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, - CORAL, CORAL, - CORAL, CORAL, - CORAL, CORAL, - CORAL, CORAL, - CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL, CORAL + 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 }, [_FUNCTION_LAYER] = { - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CORAL, _______, - _______, _______, _______, _______, _______, _______, CORAL, CORAL, CORAL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, C_TALI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, C_SECO, _______, _______, _______, _______, _______, _______, _______, _______, + _______, C_PRIM, _______, _______, _______, C_PRIM, _______, _______, _______, _______, _______, _______, C_MODI, _______, + _______, _______, _______, _______, _______, _______, C_MODI, C_MODI, C_MODI, //UnderGlow - MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, - MAGENT, MAGENT, - MAGENT, MAGENT, - MAGENT, MAGENT, - MAGENT, MAGENT, - MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT, MAGENT + C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, + C_MODI, C_MODI, + C_MODI, C_MODI, + C_MODI, C_MODI, + C_MODI, C_MODI, + C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI, C_MODI }, [_TALI_LAYER] = { - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, //UnderGlow - RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, - RED, RED, - RED, RED, - RED, RED, - RED, RED, - RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED, RED + C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, + C_TALI, C_TALI, + C_TALI, C_TALI, + C_TALI, C_TALI, + C_TALI, C_TALI, + C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI, C_TALI }, [_TALI_LAYER2] = { - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, //UnderGlow - YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, - YELLOW, YELLOW, - YELLOW, YELLOW, - YELLOW, YELLOW, - YELLOW, YELLOW, - YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW + C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, + C_TAL2, C_TAL2, + C_TAL2, C_TAL2, + C_TAL2, C_TAL2, + C_TAL2, C_TAL2, + C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2, C_TAL2 }, [_TALI_LAYER3] = { - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, //UnderGlow - GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, - GREEN, GREEN, - GREEN, GREEN, - GREEN, GREEN, - GREEN, GREEN, - GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN + C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, + C_TAL3, C_TAL3, + C_TAL3, C_TAL3, + C_TAL3, C_TAL3, + C_TAL3, C_TAL3, + C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3, C_TAL3 }, + [_GAME_LAYER] = { + _______, C_MODI, C_MODI, C_SECO, C_SECO, C_PRIM, _______, _______, _______, _______, _______, _______, _______, _______, _______, + C_PRIM, C_PRIM, C_SECO, C_PRIM, C_PRIM, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, C_SECO, C_SECO, C_SECO, C_PRIM, _______, _______, _______, _______, _______, _______, _______, _______, _______, + C_PRIM, C_PRIM, _______, C_PRIM, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, C_PRIM, _______, _______, _______, _______, _______, + //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 + } }; #undef _______ @@ -321,10 +343,9 @@ void set_layer_color(int layer) { RGB rgb = hsv_to_rgb(hsv); float f = (float)rgb_matrix_config.hsv.v / UINT8_MAX; rgb_matrix_set_color(i, f * rgb.r, f * rgb.g, f * rgb.b); - } else if (layer == 1) { - // Only deactivate non-defined key LEDs at layers other than FN. Because at FN we have RGB adjustments and need to see them live. - // If the values are all false then it's a transparent key and deactivate LED at this layer - // rgb_matrix_set_color(i, 0, 0, 0); + } else if (layer == _GAME_LAYER) { + // Allow lights to be blanked + rgb_matrix_set_color(i, 0, 0, 0); } } } diff --git a/keymap/keymap.h b/keymap/keymap.h index 5a96902..cd08805 100644 --- a/keymap/keymap.h +++ b/keymap/keymap.h @@ -1,29 +1,20 @@ #include QMK_KEYBOARD_H -#define RED {HSV_RED} -#define CORAL {HSV_CORAL} -#define ORANGE {HSV_ORANGE} -#define GOLDEN {HSV_GOLDENROD} -#define GOLD {HSV_GOLD} -#define YELLOW {HSV_YELLOW} -#define CHART {HSV_CHARTREUSE} -#define GREEN {HSV_GREEN} -#define SPRING {HSV_SPRINGGREEN} -#define TURQ {HSV_TURQUOISE} -#define TEAL {HSV_TEAL} -#define CYAN {HSV_CYAN} -#define AZURE {HSV_AZURE} -#define BLUE {HSV_BLUE} -#define PURPLE {HSV_PURPLE} -#define MAGENT {HSV_MAGENTA} -#define PINK {HSV_PINK} +#define C_PRIM {HSV_PURPLE} +#define C_SECO {HSV_GOLD} +#define C_MODI {HSV_MAGENTA} + +#define C_TALI {HSV_RED} +#define C_TAL2 {HSV_YELLOW} +#define C_TAL3 {HSV_GREEN} enum layout_names { _TYPING_LAYER=0, _FUNCTION_LAYER, + _GAME_LAYER, _TALI_LAYER, _TALI_LAYER2, - _TALI_LAYER3 + _TALI_LAYER3, }; extern bool g_suspend_state;