updated keymap
Some checks failed
Update API Data / api_data (push) Has been skipped
CLI CI / test (push) Failing after 1m25s
Update develop after master merge / develop_update (push) Has been skipped
Lint Format / lint (push) Failing after 24s
Regenerate Files / regen (push) Failing after 5s
Unit Tests / test (push) Failing after 3s
Close stale issues and PRs / stale (push) Successful in 1m2s
Automatic Approve / automatic_approve (push) Has been skipped

This commit is contained in:
locker98 2024-09-14 19:44:04 -04:00
parent c75c8e1c78
commit 99501ddae4
3 changed files with 80 additions and 52 deletions

View File

@ -80,7 +80,6 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
#undef RGBLIGHT_LED_COUNT #undef RGBLIGHT_LED_COUNT
#define RGBLIGHT_LED_COUNT 72 // Number of LEDs
#define RGB_MATRIX_LED_COUNT 72 #define RGB_MATRIX_LED_COUNT 72
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) // # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
@ -97,34 +96,54 @@
#define RGB_MATRIX_VAL_STEP 8 #define RGB_MATRIX_VAL_STEP 8
#define RGB_MATRIX_SPD_STEP 10 #define RGB_MATRIX_SPD_STEP 10
/* Disable the animations you don't want/need. You will need to disable a good number of these * // #define ENABLE_RGB_MATRIX_ALPHAS_MODS // Static dual hue, speed is hue for secondary hue
* because they take up a lot of space. Disable until you can successfully compile your firmware. */ // #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // Static gradient top to bottom, speed controls how much gradient changes
// # undef ENABLE_RGB_MATRIX_ALPHAS_MODS // #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT // Static gradient left to right, speed controls how much gradient changes
// # undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN // #define ENABLE_RGB_MATRIX_BREATHING // Single hue brightness cycling animation
// # undef ENABLE_RGB_MATRIX_BREATHING // #define ENABLE_RGB_MATRIX_BAND_SAT // Single hue band fading saturation scrolling left to right good
// # undef ENABLE_RGB_MATRIX_CYCLE_ALL // #define ENABLE_RGB_MATRIX_BAND_VAL // Single hue band fading brightness scrolling left to right good
// # undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT // Single hue 3 blade spinning pinwheel fades saturation good
// # undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN // #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL // Single hue 3 blade spinning pinwheel fades brightness good
// # undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN // #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT // Single hue spinning spiral fades saturation good
// # undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL // Single hue spinning spiral fades brightness good
// # undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON #define ENABLE_RGB_MATRIX_CYCLE_ALL // Full keyboard solid hue cycling through full gradient good
// # undef ENABLE_RGB_MATRIX_DUAL_BEACON // #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT // Full gradient scrolling left to right good
// # undef ENABLE_RGB_MATRIX_RAINBOW_BEACON // #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN // Full gradient scrolling top to bottom
// # undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN // Full gradient scrolling out to in
// # undef ENABLE_RGB_MATRIX_RAINDROPS // #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL // Full dual gradients scrolling out to in
// # undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON // Full gradient Chevron shapped scrolling left to right good
// # undef ENABLE_RGB_MATRIX_TYPING_HEATMAP // #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL // Full gradient spinning pinwheel around center of keyboard good
// # undef ENABLE_RGB_MATRIX_DIGITAL_RAIN #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL // Full gradient spinning spiral around center of keyboard good
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE // #define ENABLE_RGB_MATRIX_DUAL_BEACON // Full gradient spinning around center of keyboard
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // #define ENABLE_RGB_MATRIX_RAINBOW_BEACON // Full tighter gradient spinning around center of keyboard
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS // Full dual gradients spinning two halfs of keyboard
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // #define ENABLE_RGB_MATRIX_FLOWER_BLOOMING // Full tighter gradient of first half scrolling left to right and second half scrolling right to left
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // #define ENABLE_RGB_MATRIX_RAINDROPS // Randomly changes a single key's hue
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS // Randomly changes a single key's hue and saturation good
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // #define ENABLE_RGB_MATRIX_HUE_BREATHING // Hue shifts up a slight ammount at the same time, then shifts back
// # undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // #define ENABLE_RGB_MATRIX_HUE_PENDULUM // Hue shifts up a slight ammount in a wave to the right, then back to the left
// # undef ENABLE_RGB_MATRIX_SPLASH // #define ENABLE_RGB_MATRIX_HUE_WAVE // Hue shifts up a slight ammount and then back down in a wave to the right
// # undef ENABLE_RGB_MATRIX_MULTISPLASH // #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL // Single hue fractal filled keys pulsing horizontally out to edges
// # undef ENABLE_RGB_MATRIX_SOLID_SPLASH // #define ENABLE_RGB_MATRIX_PIXEL_FLOW // Pulsing RGB flow along LED wiring with random hues
// # undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // #define ENABLE_RGB_MATRIX_PIXEL_RAIN // Randomly light keys with random hues
#define ENABLE_RGB_MATRIX_TYPING_HEATMAP // How hot is your WPM! good
// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN // That famous computer simulation
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE // Pulses keys hit to hue & value then fades value out
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE // Static single hue, pulses keys hit to shifted hue then fades to current hue
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // Hue & value pulse near a single key hit then fades value out
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // Hue & value pulse near multiple key hits then fades value out
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS // Hue & value pulse the same column and row of a single key hit then fades value out
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS // Hue & value pulse away on the same column and row of a single key hit then fades value out
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
//#define ENABLE_RGB_MATRIX_SPLASH // Full gradient & value pulse away from a single key hit then fades value out good
#define ENABLE_RGB_MATRIX_MULTISPLASH // Full gradient & value pulse away from multiple key hits then fades value out good
// #define ENABLE_RGB_MATRIX_SOLID_SPLASH // Hue & value pulse away from a single key hit then fades value out good
// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH // Hue & value pulse away from multiple key hits then fades value out
// #define ENABLE_RGB_MATRIX_STARLIGHT // LEDs turn on and off at random at varying brightness, maintaining user set color
#define ENABLE_RGB_MATRIX_STARLIGHT_DUAL_HUE // LEDs turn on and off at random at varying brightness, modifies user set hue by +- 30 good
// #define ENABLE_RGB_MATRIX_STARLIGHT_DUAL_SAT // LEDs turn on and off at random at varying brightness, modifies user set saturation by +- 30
// #define ENABLE_RGB_MATRIX_RIVERFLOW // Modification to breathing animation, offset's animation depending on key location to simulate a river flowing
// #define ENABLE_RGB_MATRIX_EFFECT_MAX
#endif #endif

View File

@ -27,18 +27,21 @@
// Light combinations // Light combinations
#define SET_INDICATORS(hsv) \ #define SET_INDICATORS(hsv) \
{0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \
{36+0, 1, hsv} {36+0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}
#define SET_UNDERGLOW(hsv) \ #define SET_UNDERGLOW(hsv) \
{1, 6, hsv}, \ {1, 6, hsv}, \
{36+1, 6,hsv} {36+1, 6,hsv}
/*
#define SET_NUMPAD(hsv) \ #define SET_NUMPAD(hsv) \
{36+15, 5, hsv},\ {18, 3, hsv},\
{36+22, 3, hsv},\ {23, 3, hsv},\
{36+27, 3, hsv} {28, 3, hsv}
*/
#define SET_ALL(hsv) {7, 29, hsv}, {36 + 7, 29, hsv}
/* /*
#define SET_NUMROW(hsv) \ #define SET_NUMROW(hsv) \
@ -132,16 +135,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_D_MUTE,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MUTE, KC_D_MUTE,KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT,
//|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
KC_SPC, KC_LGUI, KC_LOWER, KC_BSPC, KC_ENT, KC_LSFT, KC_SPC , KC_RAISE, KC_RCTL, KC_RALT KC_SPC, KC_RAISE, KC_LOWER, KC_BSPC, KC_ENT, KC_LSFT, KC_SPC , KC_RAISE, KC_RCTL, KC_RALT
// \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
), ),
/* LOWER /* LOWER
* ,-----------------------------------------. ,-----------------------------------------. * ,-----------------------------------------. ,-----------------------------------------.
* | trans| F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | * |ScrPrt| F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 |
* |------+------+------+------+------+------| |------+------+------+------+------+------| * |------+------+------+------+------+------| |------+------+------+------+------+------|
* | trans| 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | F12 | * |ShftTab| 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | F12 |
* |------+------+------+------+------+------| |------+------+------+------+------+------| * |------+------+------+------+------+------| |------+------+------+------+------+------|
* | trans| - _ | = + | [ { | ] } | | \ |-------. ,-------| Left | Down | UP | Right|ScrPrt|Numpad| * | trans| - _ | = + | [ { | ] } | | \ |-------. ,-------| Left | Down | UP | Right|ScrPrt|Numpad|
* |------+------+------+------+------+------| trans | | trans |------+------+------+------+------+------| * |------+------+------+------+------+------| trans | | trans |------+------+------+------+------+------|
@ -153,15 +156,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/ */
[_LOWER] = LAYOUT( [_LOWER] = LAYOUT(
//,------------------------------------------------. ,---------------------------------------------------. //,------------------------------------------------. ,---------------------------------------------------.
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_PSCR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
//|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F12, S(KC_TAB), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F12,
//|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
_______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC,KC_BSLS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PSCR, XXXXXXX, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC,KC_BSLS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_PSCR, XXXXXXX,
//|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
_______, C(KC_Z), KC_CUT, KC_COPY,KC_PASTE,KC_DEL,_______, _______, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, _______, _______, C(KC_Z), C(KC_X), C(KC_C), C(KC_V),KC_DEL,_______, _______, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, _______,
//|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______ _______, TG(_NUMPAD), _______, _______, _______, _______, _______, _______, _______, _______
// \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
), ),
/* RAISE /* RAISE
@ -184,7 +187,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------| //|------+-------+--------+--------+--------+------| |--------+-------+--------+--------+--------+---------|
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,KC_CAPS, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_LGUI, C(KC_F1), C(KC_F2),KC_CAPS, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,_______, _______, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,_______, _______, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
//|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
@ -242,7 +245,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,_______, _______,KC_PLUS, KC_P1, KC_P2, KC_P3, KC_SLSH, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,_______, _______,KC_PLUS, KC_P1, KC_P2, KC_P3, KC_SLSH, _______,
//|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------| //|------+-------+--------+--------+--------+------| === | | === |--------+-------+--------+--------+--------+---------|
_______, OSM(MOD_MEH), _______, _______, _______, _______, _______, KC_P0, KC_PDOT, _______ _______, TO(_QWERTY), _______, _______, _______, _______, _______, KC_P0, KC_PDOT, _______
// \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/ // \--------+--------+--------+---------+-------| |--------+---------+--------+---------+-------/
), ),
@ -285,11 +288,13 @@ const rgblight_segment_t PROGMEM layer_command_lights[] = RGBLIGHT_LAYER_SEGMENT
const rgblight_segment_t PROGMEM layer_numpad_lights[] = RGBLIGHT_LAYER_SEGMENTS( const rgblight_segment_t PROGMEM layer_numpad_lights[] = RGBLIGHT_LAYER_SEGMENTS(
SET_INDICATORS(HSV_ORANGE), SET_INDICATORS(HSV_ORANGE),
SET_UNDERGLOW(HSV_ORANGE), SET_UNDERGLOW(HSV_ORANGE),
//SET_NUMPAD(HSV_BLUE), SET_ALL(HSV_RED),
{7, 4, HSV_ORANGE}, SET_NUMPAD(HSV_GREEN)
{25, 2, HSV_ORANGE},
{36+6, 4, HSV_ORANGE}, // {7, 4, HSV_ORANGE},
{36+25, 2, HSV_ORANGE} // {25, 2, HSV_ORANGE},
// {36+6, 4, HSV_ORANGE},
// {36+25, 2, HSV_ORANGE}
); );
// _SWITCHER // light up top row // _SWITCHER // light up top row
const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMENTS( const rgblight_segment_t PROGMEM layer_switcher_lights[] = RGBLIGHT_LAYER_SEGMENTS(

View File

@ -1,8 +1,12 @@
MOUSEKEY_ENABLE = yes MOUSEKEY_ENABLE = yes
EXTRAKEY_ENABLE = yes EXTRAKEY_ENABLE = yes
CONSOLE_ENABLE = no CONSOLE_ENABLE = no
RGBLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes
#RGB_MATRIX_ENABLE = yes
ENCODER_ENABLE = yes ENCODER_ENABLE = yes
LTO_ENABLE = yes LTO_ENABLE = yes
OLED_ENABLE = yes OLED_ENABLE = no
TAP_DANCE_ENABLE = yes TAP_DANCE_ENABLE = yes