diff --git a/keymap/keymap.c b/keymap/keymap.c index 8f9f59d..94d9f34 100644 --- a/keymap/keymap.c +++ b/keymap/keymap.c @@ -1,4 +1,5 @@ #include "keymap.h" +#include "lighting.h" #define _TL _TALI_LAYER #define _T2 _TALI_LAYER2 @@ -133,184 +134,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -#ifdef _______ -#undef _______ -#define _______ {0, 0, 0} - -const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { - [_TYPING_LAYER] = { - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_PRIM, _______, - _______, _______, _______, _______, _______, _______, C_PRIM, C_PRIM, C_PRIM, - //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 - }, - [_TEAMS_LAYER] = { - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_TALI, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_PRIM, _______, - _______, _______, _______, _______, _______, _______, C_PRIM, C_PRIM, C_PRIM, - //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 - }, - [_FUNCTION_LAYER] = { - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, C_TALI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, C_SECO, C_SECO, _______, _______, _______, _______, _______, _______, _______, - _______, C_PRIM, _______, _______, _______, C_PRIM, _______, _______, _______, _______, _______, _______, C_MODI, _______, - _______, _______, _______, _______, _______, _______, C_MODI, C_MODI, C_MODI, - //UnderGlow - 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 - }, - [_WIN_LAYER] = { - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, C_TALI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, C_PRIM, C_PRIM, C_PRIM, C_PRIM, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_PRIM, _______, - _______, _______, _______, _______, _______, _______, C_PRIM, C_PRIM, C_PRIM, - //UnderGlow - 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 - }, - [_TALI_LAYER] = { - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, - //UnderGlow - 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 - 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 - 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 - }, - [_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 - }, - [_POM_LAYER] = { - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, C_RED, C_RED, C_SECO, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, C_GRN, _______, _______, _______, _______, _______, - //UnderGlow - C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, - C_ORNG, C_ORNG, - C_ORNG, C_ORNG, - C_ORNG, C_ORNG, - C_ORNG, C_ORNG, - C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG - }, - [_POM_LAYER2] = { - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, C_RED, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, - //UnderGlow (67) - C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, - C_ORNG, C_ORNG, - C_ORNG, C_ORNG, - C_ORNG, C_ORNG, - C_ORNG, C_ORNG, - C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG - }, -}; - -#undef _______ -#define _______ KC_TRNS -#endif // Runs just one time when the keyboard initializes. void matrix_init_user(void) { @@ -319,8 +142,6 @@ void matrix_init_user(void) { debug_matrix=false; debug_keyboard=false; //rgb_enabled_flag = true; // Initially, keyboard RGB is enabled. Change to false config.h initializes RGB disabled. - - debug_enable=true; }; void keyboard_post_init_user(void) { @@ -517,54 +338,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -uint8_t hsv_buf[DRIVER_LED_TOTAL][4]; - -void hsv_matrix_set_color(int index, const uint8_t hsv_color[3]) { - if (index >= DRIVER_LED_TOTAL) - return; - - hsv_buf[index][0] = hsv_color[0]; - hsv_buf[index][1] = hsv_color[1]; - hsv_buf[index][2] = hsv_color[2]; - hsv_buf[index][3] = 1; -} - -void write_hsv_matrix(void) { - for(int i = 0; i < DRIVER_LED_TOTAL; i++) { - if (!hsv_buf[i][3]) continue; - - HSV hsv = { - .h = pgm_read_byte(&hsv_buf[i][0]), - .s = pgm_read_byte(&hsv_buf[i][1]), - .v = pgm_read_byte(&hsv_buf[i][2]), - }; - - 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); - - hsv_buf[i][0] = 0; - hsv_buf[i][1] = 0; - hsv_buf[i][2] = 0; - hsv_buf[i][3] = 0; - } -} - -void set_layer_color(int layer) { - for (int i = 0; i < DRIVER_LED_TOTAL; i++) { - if(ledmap[layer][i][0] || ledmap[layer][i][1] || ledmap[layer][i][2]) { - hsv_matrix_set_color(i, ledmap[layer][i]); - } else if ( - layer == _GAME_LAYER || - layer == _POM_LAYER || - layer == _POM_LAYER2 - ) { - // Allow lights to be blanked - hsv_matrix_set_color(i, (uint8_t[3]) {0, 0, 0}); - } - } -} - #define POM_CURRENT_INDEX 68 #define POM_LIGHT_COUNT 9 #define POM_COMPLETE_INDEX POM_CURRENT_INDEX + POM_LIGHT_COUNT + 1 @@ -663,8 +436,6 @@ void rgb_matrix_indicators_user(void) { if(current_pom_state != STOPPED || poms_completed > 0){ draw_pom(); } - - write_hsv_matrix(); } const uint16_t NUMPAD_CODES[] = { diff --git a/keymap/keymap.h b/keymap/keymap.h index ac5c30b..153e338 100644 --- a/keymap/keymap.h +++ b/keymap/keymap.h @@ -1,3 +1,5 @@ +#pragma once + #include QMK_KEYBOARD_H #define C_PRIM {HSV_PURPLE} @@ -28,7 +30,6 @@ enum layout_names { }; extern bool g_suspend_state; -extern rgb_config_t rgb_matrix_config; bool disable_layer_color; enum pom_state { diff --git a/keymap/lighting.h b/keymap/lighting.h new file mode 100644 index 0000000..9cd7f39 --- /dev/null +++ b/keymap/lighting.h @@ -0,0 +1,7 @@ +#pragma once + +extern rgb_config_t rgb_matrix_config; + +void write_hsv_matrix(void); +void hsv_matrix_set_color(int, const uint8_t[3]); +void set_layer_color(int); \ No newline at end of file diff --git a/keymap/lighting_funcs.c b/keymap/lighting_funcs.c new file mode 100644 index 0000000..3b7e78e --- /dev/null +++ b/keymap/lighting_funcs.c @@ -0,0 +1,39 @@ +#include "keymap.h" +#include "lighting.h" +#include "lighting_layers.h" + +void hsv_matrix_set_color(int index, const uint8_t hsv_color[3]) { + if (index >= DRIVER_LED_TOTAL) + return; + + HSV hsv = { + .h = hsv_color[0], + .s = hsv_color[1], + .v = hsv_color[2], + }; + + RGB rgb = hsv_to_rgb(hsv); + float f = (float)rgb_matrix_config.hsv.v / UINT8_MAX; + rgb_matrix_set_color(index, f * rgb.r, f * rgb.g, f * rgb.b); +} + +void set_layer_color(int layer) { + for (int i = 0; i < DRIVER_LED_TOTAL; i++) { + HSV hsv = { + .h = pgm_read_byte(&ledmap[layer][i][0]), + .s = pgm_read_byte(&ledmap[layer][i][1]), + .v = pgm_read_byte(&ledmap[layer][i][2]), + }; + + if(hsv.h || hsv.s || hsv.v) { + hsv_matrix_set_color(i, ledmap[layer][i]); + } else if ( + layer == _GAME_LAYER || + layer == _POM_LAYER || + layer == _POM_LAYER2 + ) { + // Allow lights to be blanked + hsv_matrix_set_color(i, (uint8_t[3]) {0, 0, 0}); + } + } +} \ No newline at end of file diff --git a/keymap/lighting_layers.h b/keymap/lighting_layers.h new file mode 100644 index 0000000..e62a0ae --- /dev/null +++ b/keymap/lighting_layers.h @@ -0,0 +1,179 @@ +#include "keymap.h" +#include "lighting.h" + +#ifdef _______ +#undef _______ +#endif + +#define _______ {0, 0, 0} + +const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = { + [_TYPING_LAYER] = { + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_PRIM, _______, + _______, _______, _______, _______, _______, _______, C_PRIM, C_PRIM, C_PRIM, + //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 + }, + [_TEAMS_LAYER] = { + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_TALI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_PRIM, _______, + _______, _______, _______, _______, _______, _______, C_PRIM, C_PRIM, C_PRIM, + //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 + }, + [_FUNCTION_LAYER] = { + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, C_TALI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, C_SECO, C_SECO, _______, _______, _______, _______, _______, _______, _______, + _______, C_PRIM, _______, _______, _______, C_PRIM, _______, _______, _______, _______, _______, _______, C_MODI, _______, + _______, _______, _______, _______, _______, _______, C_MODI, C_MODI, C_MODI, + //UnderGlow + 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 + }, + [_WIN_LAYER] = { + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, C_TALI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, C_PRIM, C_PRIM, C_PRIM, C_PRIM, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, C_PRIM, _______, + _______, _______, _______, _______, _______, _______, C_PRIM, C_PRIM, C_PRIM, + //UnderGlow + 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 + }, + [_TALI_LAYER] = { + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, + //UnderGlow + 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 + 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 + 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 + }, + [_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 + }, + [_POM_LAYER] = { + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, C_RED, C_RED, C_SECO, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, C_GRN, _______, _______, _______, _______, _______, + //UnderGlow + C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, + C_ORNG, C_ORNG, + C_ORNG, C_ORNG, + C_ORNG, C_ORNG, + C_ORNG, C_ORNG, + C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG + }, + [_POM_LAYER2] = { + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, C_RED, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, + //UnderGlow (67) + C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, + C_ORNG, C_ORNG, + C_ORNG, C_ORNG, + C_ORNG, C_ORNG, + C_ORNG, C_ORNG, + C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG, C_ORNG + }, +}; diff --git a/keymap/rules.mk b/keymap/rules.mk index a13a359..ad660ae 100644 --- a/keymap/rules.mk +++ b/keymap/rules.mk @@ -12,4 +12,6 @@ TERMINAL_ENABLE = no EXTRAKEY_ENABLE = yes # Audio control and System control # RAW_ENABLE = yes # Raw HID has not yet been implemented for this keyboard # COMBO_ENABLE # Key combo feature -# LEADER_ENABLE # Enable leader key chording \ No newline at end of file +# LEADER_ENABLE # Enable leader key chording + +SRC += lighting_funcs.c \ No newline at end of file