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

This commit is contained in:
locker98 2024-06-29 22:05:12 -04:00
parent 5977e2dba0
commit c75c8e1c78

View File

@ -27,41 +27,58 @@
// 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)}, \
{35+0, 1, hsv} {36+0, 1, hsv}
#define SET_UNDERGLOW(hsv) \ #define SET_UNDERGLOW(hsv) \
{1, 6, hsv}, \ {1, 6, hsv}, \
{35+1, 6,hsv} {36+1, 6,hsv}
/*
#define SET_NUMPAD(hsv) \ #define SET_NUMPAD(hsv) \
{35+15, 5, hsv},\ {36+15, 5, hsv},\
{35+22, 3, hsv},\ {36+22, 3, hsv},\
{35+27, 3, hsv} {36+27, 3, hsv}
*/
/*
#define SET_NUMROW(hsv) \ #define SET_NUMROW(hsv) \
{10, 2, hsv}, \ {10, 2, hsv}, \
{20, 2, hsv}, \ {20, 2, hsv}, \
{30, 2, hsv}, \ {30, 2, hsv}, \
{35+ 10, 2, hsv}, \ {36+ 10, 2, hsv}, \
{35+ 20, 2, hsv}, \ {36+ 20, 2, hsv}, \
{35+ 30, 2, hsv} {36+ 30, 2, hsv}
*/
#define SET_INNER_COL(hsv) \ #define SET_INNER_COL(hsv) \
{33, 4, hsv}, \ {33, 4, hsv}, \
{35+ 33, 4, hsv} {36+ 33, 4, hsv}
#define SET_OUTER_COL(hsv) \ #define SET_OUTER_COL(hsv) \
{7, 4, hsv}, \ {8, 4, hsv}, \
{35+ 7, 4, hsv} {36+ 8, 4, hsv}
#define SET_THUMB_CLUSTER(hsv) \ #define SET_THUMB_CLUSTER(hsv) \
{25, 2, hsv}, \ {7, 1, hsv}, \
{35+ 25, 2, hsv} {36+ 7, 1, hsv}, \
{16, 2, hsv}, \
{36+ 16, 2, hsv}, \
{26, 2, hsv}, \
{36+ 26, 2, hsv}
#define SET_LAYER_ID(hsv) \ #define SET_LAYER_ID(hsv) \
{0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ {0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \
{35+0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \ {36+0, 1, HSV_OVERRIDE_HELP(hsv, INDICATOR_BRIGHTNESS)}, \
{1, 6, hsv}, \ {1, 6, hsv}, \
{35+1, 6, hsv}, \ {36+1, 6, hsv}, \
{7, 4, hsv}, \ {8, 4, hsv}, \
{35+ 7, 4, hsv}, \ {36+ 8, 4, hsv}, \
{25, 2, hsv}, \ {7, 1, hsv}, \
{35+ 25, 2, hsv} {36+ 7, 1, hsv}, \
{16, 2, hsv}, \
{36+ 16, 2, hsv}, \
{26, 2, hsv}, \
{36+ 26, 2, hsv}
enum sofle_layers { enum sofle_layers {
_DEFAULTS = 0, _DEFAULTS = 0,
@ -268,16 +285,16 @@ 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_NUMPAD(HSV_BLUE),
{7, 4, HSV_ORANGE}, {7, 4, HSV_ORANGE},
{25, 2, HSV_ORANGE}, {25, 2, HSV_ORANGE},
{35+6, 4, HSV_ORANGE}, {36+6, 4, HSV_ORANGE},
{35+25, 2, 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(
SET_LAYER_ID(HSV_GREEN), SET_LAYER_ID(HSV_GREEN)
SET_NUMROW(HSV_GREEN) //SET_NUMROW(HSV_GREEN)
); );
const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(