From 7407347be1df69928d27ea9b6a4fe094429f2a55 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 28 Oct 2022 09:50:14 +1100 Subject: [PATCH] Remove rgblight_list.h (#18878) * Remove rgblight_list defines with no usage * Remove rgblight_setrgb_*[_at] defines * Remove rgblight_sethsv_* defines * Remove rgblight_sethsv_noeeprom_* defines * Delete rgblight_list.h and remove all references --- docs/feature_eeprom.md | 14 +- .../super16/keymaps/ahk_companion/keymap.c | 2 +- .../charybdis/3x5/keymaps/bstiq/keymap.c | 2 +- .../charybdis/3x5/keymaps/via/keymap.c | 2 +- .../charybdis/3x6/keymaps/via/keymap.c | 2 +- .../charybdis/4x6/keymaps/via/keymap.c | 2 +- .../bastardkb/dilemma/keymaps/bstiq/keymap.c | 2 +- .../biacco42/ergo42/keymaps/hdbx/keymap.c | 10 +- keyboards/crkbd/keymaps/edvorakjp/keymap.c | 6 +- keyboards/dp60/keymaps/indicator/indicator.c | 1 - .../dz60/keymaps/iso_split-spacebar/keymap.c | 8 +- keyboards/dz60/keymaps/mechmerlin/keymap.c | 4 +- keyboards/dz60/keymaps/mechmerlin/readme.md | 2 +- .../hacker_dvorak/user/layer_set_state_user.c | 20 +-- .../hacker_dvorak/user/matrix_scan_user.c | 2 +- .../ergodox_ez/keymaps/rgb_layer/keymap.c | 20 +-- .../heisenberg/keymaps/turkishish/keymap.c | 2 +- .../handwired/onekey/keymaps/apa102/keymap.c | 2 +- .../handwired/onekey/keymaps/rgb/keymap.c | 2 +- .../helix/rev2/keymaps/edvorakjp/keymap.c | 6 +- .../hub16/keymaps/ahk_companion/keymap.c | 2 +- keyboards/hub16/keymaps/peepeetee/keymap.c | 2 +- .../kbdfans/kbd75/keymaps/edulpn/keymap.c | 8 +- .../keebio/iris/keymaps/edvorakjp/keymap.c | 6 +- .../levinson/keymaps/issmirnov/README.md | 2 +- .../keebio/levinson/keymaps/issmirnov/rgb.c | 8 +- .../ktec/staryu/keymaps/default/keymap.c | 12 +- .../lfkpad/keymaps/pascalpfeil/keymap.c | 2 +- .../m12og/rev1/keymaps/default/keymap.c | 2 +- .../mechlovin/kanu/keymaps/dhertz/keymap.c | 6 +- .../percent/canoe/keymaps/dhertz/keymap.c | 6 +- keyboards/redox/keymaps/jeherve/keymap.c | 10 +- .../bigseries/1key/keymaps/8ball/keymap.c | 8 +- keyboards/xiudi/xd75/keymaps/hybrid/keymap.c | 6 +- .../xiudi/xd75/keymaps/tdl-jturner/keymap.c | 16 +-- keyboards/yushakobo/quick17/rgb_matrix_kb.inc | 2 +- .../community/numpad_5x6/bjohnson/keymap.c | 6 +- quantum/rgblight/rgblight.h | 1 - quantum/rgblight/rgblight_list.h | 136 ------------------ users/brandonschlack/rgb_theme.h | 1 - users/curry/curry.c | 2 +- users/greatwizard/underglow.c | 16 +-- users/kuchosauronad0/kuchosauronad0.c | 2 +- users/kuchosauronad0/leader.c | 2 +- users/kuchosauronad0/rgblight_user.c | 18 +-- users/peej/peej.c | 2 +- users/twschum/twschum.c | 1 - users/wanleg/wanleg.c | 2 +- 48 files changed, 129 insertions(+), 269 deletions(-) delete mode 100644 quantum/rgblight/rgblight_list.h diff --git a/docs/feature_eeprom.md b/docs/feature_eeprom.md index 3a4119eab75dbe2e0f89ca1930ee4b4cce15c2fb..088f4f36fff0f9e01f84559037e96e9593148164 100644 --- a/docs/feature_eeprom.md +++ b/docs/feature_eeprom.md @@ -40,7 +40,7 @@ void keyboard_post_init_user(void) { // Set default layer, if enabled if (user_config.rgb_layer_change) { rgblight_enable_noeeprom(); - rgblight_sethsv_noeeprom_cyan(); + rgblight_sethsv_noeeprom(HSV_CYAN); rgblight_mode_noeeprom(1); } } @@ -51,19 +51,19 @@ The above function will use the EEPROM config immediately after reading it, to s layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case _RAISE: - if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_magenta(); rgblight_mode_noeeprom(1); } + if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_MAGENTA); rgblight_mode_noeeprom(1); } break; case _LOWER: - if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_red(); rgblight_mode_noeeprom(1); } + if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_RED); rgblight_mode_noeeprom(1); } break; case _PLOVER: - if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_green(); rgblight_mode_noeeprom(1); } + if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_GREEN); rgblight_mode_noeeprom(1); } break; case _ADJUST: - if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_white(); rgblight_mode_noeeprom(1); } + if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_WHITE); rgblight_mode_noeeprom(1); } break; default: // for any other layers, or the default layer - if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_cyan(); rgblight_mode_noeeprom(1); } + if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_CYAN); rgblight_mode_noeeprom(1); } break; } return state; @@ -119,7 +119,7 @@ void eeconfig_init_user(void) { // EEPROM is getting reset! // use the non noeeprom versions, to write these values to EEPROM too rgblight_enable(); // Enable RGB by default - rgblight_sethsv_cyan(); // Set it to CYAN by default + rgblight_sethsv(HSV_CYAN); // Set it to CYAN by default rgblight_mode(1); // set to solid by default } ``` diff --git a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c index ec707557d10de3bca07be0ad65f2be2a656243ad..a326abcf832aa76c4e633def24db8715a366574a 100644 --- a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c +++ b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c @@ -131,6 +131,6 @@ void matrix_scan_user(void) { //EEPROM Reset Function void eeconfig_init_user(void) { rgblight_enable(); // Enable RGB by default - rgblight_sethsv_orange(); // Set it to orange by default + rgblight_sethsv(HSV_ORANGE); // Set it to orange by default } diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c index a28c200b2d5a84f89507860fa5d5aae19a8b12fe..2664b531a23fc97b91084a640655bb03d3cff350 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c @@ -215,7 +215,7 @@ void shutdown_user(void) { #ifdef RGBLIGHT_ENABLE rgblight_enable_noeeprom(); rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - rgblight_setrgb_red(); + rgblight_setrgb(RGB_RED); #endif // RGBLIGHT_ENABLE #ifdef RGB_MATRIX_ENABLE rgb_matrix_set_color_all(RGB_RED); diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c index 417220a38e6cae1e7db2e80aa9431e78837eced1..d3fdfef14ac98e8df82b3a51ce1152ced8e71fa3 100644 --- a/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c +++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c @@ -260,7 +260,7 @@ void shutdown_user(void) { #ifdef RGBLIGHT_ENABLE rgblight_enable_noeeprom(); rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - rgblight_setrgb_red(); + rgblight_setrgb(RGB_RED); #endif // RGBLIGHT_ENABLE #ifdef RGB_MATRIX_ENABLE rgb_matrix_set_color_all(RGB_RED); diff --git a/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c index 9a6eb5f23639f955ef509676f305b823cc908094..39b05b9234268dce6e40ef47d4402ec3b04fbd91 100644 --- a/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c +++ b/keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c @@ -139,7 +139,7 @@ void shutdown_user(void) { #ifdef RGBLIGHT_ENABLE rgblight_enable_noeeprom(); rgblight_mode_noeeprom(1); - rgblight_setrgb_red(); + rgblight_setrgb(RGB_RED); #endif // RGBLIGHT_ENABLE #ifdef RGB_MATRIX_ENABLE rgb_matrix_set_color_all(RGB_RED); diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c index 0ab7b78cc4ca97b3d7c4829114b95a16fe0093e6..92a861e91a367b3bd9ce364d7bd6763b7014cf8f 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c @@ -162,7 +162,7 @@ void shutdown_user(void) { #ifdef RGBLIGHT_ENABLE rgblight_enable_noeeprom(); rgblight_mode_noeeprom(1); - rgblight_setrgb_red(); + rgblight_setrgb(RGB_RED); #endif // RGBLIGHT_ENABLE #ifdef RGB_MATRIX_ENABLE rgb_matrix_set_color_all(RGB_RED); diff --git a/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c b/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c index 5533bc40c6ff6eb5ae080ec5a393a311b691874c..e8c0441d7bbf2cec262e3634312fbed8c072161b 100644 --- a/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c +++ b/keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c @@ -215,7 +215,7 @@ void shutdown_user(void) { #ifdef RGBLIGHT_ENABLE rgblight_enable_noeeprom(); rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - rgblight_setrgb_red(); + rgblight_setrgb(RGB_RED); #endif // RGBLIGHT_ENABLE #ifdef RGB_MATRIX_ENABLE rgb_matrix_set_color_all(RGB_RED); diff --git a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c index 161543806f5286ef292cf5236eb93d5d569401de..2d687037e449ac1c46b25d818d22716d94468180 100644 --- a/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c +++ b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c @@ -141,7 +141,7 @@ layer_state_t layer_state_set_keymap (layer_state_t state) { void matrix_init_user(void) { #ifdef RGBLIGHT_ENABLE rgblight_enable(); - rgblight_setrgb_teal(); + rgblight_setrgb(RGB_TEAL); #endif } @@ -150,16 +150,16 @@ layer_state_t layer_state_set_user(layer_state_t state) { #ifdef RGBLIGHT_ENABLE switch (get_highest_layer(state)) { case _RAISE: - rgblight_setrgb_chartreuse(); // RAISE:シャルトリューズ + rgblight_setrgb(RGB_CHARTREUSE); // RAISE:シャルトリューズ break; case _LOWER: - rgblight_setrgb_pink(); // LOWER:ピンク + rgblight_setrgb(RGB_PINK); // LOWER:ピンク break; case _ADJUST: - rgblight_setrgb_red(); // ADJUST:レッド + rgblight_setrgb(RGB_RED); // ADJUST:レッド break; default: // for any other layers, or the default layer - rgblight_setrgb_teal(); // 他:ティール + rgblight_setrgb(RGB_TEAL); // 他:ティール break; } #endif diff --git a/keyboards/crkbd/keymaps/edvorakjp/keymap.c b/keyboards/crkbd/keymaps/edvorakjp/keymap.c index 66c39783fd1376737837215c8f0bfdb819120431..0cc8a0c4baace18304f679efa96313bca20570e1 100644 --- a/keyboards/crkbd/keymaps/edvorakjp/keymap.c +++ b/keyboards/crkbd/keymaps/edvorakjp/keymap.c @@ -52,14 +52,14 @@ layer_state_t layer_state_set_keymap(layer_state_t state) { rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); switch (get_highest_layer(state)) { case L_EDVORAKJP_LOWER: - rgblight_sethsv_noeeprom_red(); + rgblight_sethsv_noeeprom(HSV_RED); break; case L_EDVORAKJP_RAISE: - rgblight_sethsv_noeeprom_green(); + rgblight_sethsv_noeeprom(HSV_GREEN); break; default: // for any other layers, or the default layer rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 3); - rgblight_sethsv_red(); + rgblight_sethsv(HSV_RED); break; } return state; diff --git a/keyboards/dp60/keymaps/indicator/indicator.c b/keyboards/dp60/keymaps/indicator/indicator.c index 999e0c3338e193a1a31bb08a00c06ec78001621f..683ae3625aaf7a68d1d321283f141918e411b68f 100644 --- a/keyboards/dp60/keymaps/indicator/indicator.c +++ b/keyboards/dp60/keymaps/indicator/indicator.c @@ -16,7 +16,6 @@ #include "dp60.h" -#include "rgblight_list.h" #include "rgblight.h" diff --git a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c index a790f6d3adba0c0a88a09cf8a2ff6bdb867cb653..56dccf376f618bbc7e488e45a088d20a04f84485 100644 --- a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c +++ b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c @@ -39,16 +39,16 @@ #define RGB_XMS RGB_M_X //rgb christmas // #define RGB_BL_MODE rgblight_mode_noeeprom(3) //rgb mode for BL layer -#define RGB_BL_LIGHT rgblight_sethsv_noeeprom_turquoise() //rgb light for BL layer +#define RGB_BL_LIGHT rgblight_sethsv_noeeprom(HSV_TURQUOISE) //rgb light for BL layer // #define RGB_FL_MODE rgblight_mode_noeeprom(1) //rgb mode for FL layer -#define RGB_FL_LIGHT rgblight_sethsv_noeeprom_orange() //rgb light for FL layer +#define RGB_FL_LIGHT rgblight_sethsv_noeeprom(HSV_ORANGE) //rgb light for FL layer // #define RGB_NL_MODE rgblight_mode_noeeprom(12) //rgb mode for NL layer -#define RGB_NL_LIGHT rgblight_sethsv_noeeprom_turquoise() //rgb light for NL layer +#define RGB_NL_LIGHT rgblight_sethsv_noeeprom(HSV_TURQUOISE) //rgb light for NL layer // #define RGB_RL_MODE rgblight_mode_noeeprom(22) //rgb mode for RL layer -#define RGB_RL_LIGHT rgblight_sethsv_noeeprom_red() //rgb light for RL layer +#define RGB_RL_LIGHT rgblight_sethsv_noeeprom(HSV_RED) //rgb light for RL layer const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/dz60/keymaps/mechmerlin/keymap.c b/keyboards/dz60/keymaps/mechmerlin/keymap.c index 0b7b17f2cd0adbdbbbc472e6e7d2b6fbb51f7964..795ba24798b8419ef4f1b13bdc616255ceaa6adf 100644 --- a/keyboards/dz60/keymaps/mechmerlin/keymap.c +++ b/keyboards/dz60/keymaps/mechmerlin/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; // Set underglow RGB leds to yellow -// Find the list of available colors in quantum/rgblight_list.h +// Find the list of available colors in quantum/color.h void matrix_init_user(void) { - rgblight_sethsv_noeeprom_yellow(); + rgblight_sethsv_noeeprom(HSV_YELLOW); } diff --git a/keyboards/dz60/keymaps/mechmerlin/readme.md b/keyboards/dz60/keymaps/mechmerlin/readme.md index 9c53288feac07f92da0657545f6d4f324a869b3d..bb8fbf84b3af16ebe9080f1002edbb5661ea4728 100644 --- a/keyboards/dz60/keymaps/mechmerlin/readme.md +++ b/keyboards/dz60/keymaps/mechmerlin/readme.md @@ -65,4 +65,4 @@ This is set in `mechmerlin/config.h` so that when the computer goes to sleep, th ### RGB Underglow Color: Yellow -This is set in `mechmerlin/keymap.c` in the `matrix_init_user` function. The list of available colors can be found in [`quantum/rgblight_list.h`](https://github.com/qmk/qmk_firmware/blob/388df5359b913eaf1ce6fb0ef624e430ad010ea5/quantum/rgblight_list.h#L59-L121). +This is set in `mechmerlin/keymap.c` in the `matrix_init_user` function. The list of available colors can be found in [`quantum/color.h`](https://github.com/qmk/qmk_firmware/blob/master/quantum/color.h). diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c index ed407def791902b7f8e8048fedcf9553fd38b512..bd4fd10ad1101a3a7b5b4a950a42341ba4e567c2 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c @@ -4,7 +4,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { switch (layer) { case DVORAK: - rgblight_sethsv_noeeprom_green(); + rgblight_sethsv_noeeprom(GREEN); rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); if (PLOVER_MODE) { @@ -15,7 +15,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { break; case PLOVER: - rgblight_sethsv_noeeprom_red(); + rgblight_sethsv_noeeprom(HSV_RED); rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3); if (!(PLOVER_MODE)) { @@ -26,7 +26,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { break; case GAMING: - rgblight_sethsv_noeeprom_red(); + rgblight_sethsv_noeeprom(HSV_RED); rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2); if (PLOVER_MODE) { @@ -37,7 +37,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { break; case ARROWS: - rgblight_sethsv_noeeprom_blue(); + rgblight_sethsv_noeeprom(HSV_BLUE); rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2); if (PLOVER_MODE) { @@ -48,7 +48,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { break; case MOUSE: - rgblight_sethsv_noeeprom_blue(); + rgblight_sethsv_noeeprom(HSV_BLUE); rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2); if (PLOVER_MODE) { @@ -59,7 +59,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { break; case NUMPAD: - rgblight_sethsv_noeeprom_blue(); + rgblight_sethsv_noeeprom(HSV_BLUE); rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2); if (PLOVER_MODE) { @@ -70,7 +70,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { break; case LAYERS: - rgblight_sethsv_noeeprom_cyan(); + rgblight_sethsv_noeeprom(HSV_CYAN); rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2); if (PLOVER_MODE) { @@ -81,7 +81,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { break; case MEDIA_FN: - rgblight_sethsv_noeeprom_yellow(); + rgblight_sethsv_noeeprom(HSV_YELLOW); rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2); if (PLOVER_MODE) { @@ -92,7 +92,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { break; case CHORD: - rgblight_sethsv_noeeprom_magenta(); + rgblight_sethsv_noeeprom(HSV_MAGENTA); rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2); if (PLOVER_MODE) { @@ -103,7 +103,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { break; case FIRMWARE: - rgblight_sethsv_noeeprom_magenta(); + rgblight_sethsv_noeeprom(HSV_MAGENTA); rgblight_mode_noeeprom(RGBLIGHT_MODE_KNIGHT + 2); if (PLOVER_MODE) { diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/matrix_scan_user.c b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/matrix_scan_user.c index 3b78079ccafbd4826e5ea398b1bc472b4d8d8c79..277821afacd714ebad937b9e9a2c52e956cf23e0 100644 --- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/matrix_scan_user.c +++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/user/matrix_scan_user.c @@ -4,7 +4,7 @@ bool MATRIX_SCANNED = false; void matrix_scan_user(void) { if (!(MATRIX_SCANNED)) { - rgblight_sethsv_noeeprom_green(); + rgblight_sethsv_noeeprom(HSV_GREEN); MATRIX_SCANNED = true; } diff --git a/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c b/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c index a41a21072c731fef60dd142a50de5338aabd8b33..6ed204a3579c8f2f966bb6b789b454bd16bb8869 100644 --- a/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c +++ b/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c @@ -153,7 +153,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void eeconfig_init_user(void) { rgblight_enable(); - rgblight_sethsv_cyan(); + rgblight_sethsv(HSV_CYAN); rgblight_mode(1); user_config.rgb_layer_change = true; eeconfig_update_user(user_config.raw); @@ -213,7 +213,7 @@ void matrix_init_user(void) { // Set default layer, if enabled if (user_config.rgb_layer_change) { rgblight_enable_noeeprom(); - rgblight_sethsv_noeeprom_cyan(); + rgblight_sethsv_noeeprom(HSV_CYAN); rgblight_mode_noeeprom(1); } } @@ -231,39 +231,39 @@ layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case SYMB: ergodox_right_led_1_on(); - if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_red(); rgblight_mode_noeeprom(1); } + if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_RED); rgblight_mode_noeeprom(1); } break; case MDIA: ergodox_right_led_2_on(); - if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_green(); rgblight_mode_noeeprom(1); } + if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_GREEN); rgblight_mode_noeeprom(1); } break; case 3: ergodox_right_led_3_on(); - if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_blue(); rgblight_mode_noeeprom(1); } + if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_BLUE); rgblight_mode_noeeprom(1); } break; case 4: ergodox_right_led_1_on(); ergodox_right_led_2_on(); - if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_orange(); rgblight_mode_noeeprom(1); } + if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_ORANGE); rgblight_mode_noeeprom(1); } break; case 5: ergodox_right_led_1_on(); ergodox_right_led_3_on(); - if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_yellow(); rgblight_mode_noeeprom(1); } + if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_YELLOW); rgblight_mode_noeeprom(1); } break; case 6: ergodox_right_led_2_on(); ergodox_right_led_3_on(); - if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_pink(); rgblight_mode_noeeprom(1); } + if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_PINK); rgblight_mode_noeeprom(1); } break; case 7: ergodox_right_led_1_on(); ergodox_right_led_2_on(); ergodox_right_led_3_on(); - if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_white(); rgblight_mode_noeeprom(1); } + if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_WHITE); rgblight_mode_noeeprom(1); } break; default: // for any other layers, or the default layer - if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom_cyan(); rgblight_mode_noeeprom(1); } + if (user_config.rgb_layer_change) { rgblight_sethsv_noeeprom(HSV_CYAN); rgblight_mode_noeeprom(1); } break; } return state; diff --git a/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c b/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c index 3cdc3e002669b9dd1ad3b9796fd1b348c858a5c5..0aa6e56a0600f6bcb08e4cec2e62dec7e8bacad8 100644 --- a/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c +++ b/keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c @@ -227,6 +227,6 @@ void keyboard_post_init_user(void) { //rgblight_config.val = 255; rgblight_enable_noeeprom(); // enables Rgb, without saving settings rgblight_sethsv_noeeprom(100, 255, 255); // sets the color to greenish without saving - //rgblight_sethsv_noeeprom_turquoise(); + //rgblight_sethsv_noeeprom(HSV_TURQUOISE); } \ No newline at end of file diff --git a/keyboards/handwired/onekey/keymaps/apa102/keymap.c b/keyboards/handwired/onekey/keymaps/apa102/keymap.c index 700755a452b5817a41dd90a55e6009bdfe809236..8b4191fb283c9858759004258e96e8c1e828bd10 100644 --- a/keyboards/handwired/onekey/keymaps/apa102/keymap.c +++ b/keyboards/handwired/onekey/keymaps/apa102/keymap.c @@ -9,6 +9,6 @@ void keyboard_post_init_user(void) { apa102_set_brightness(5); rgblight_enable_noeeprom(); - rgblight_sethsv_noeeprom_cyan(); + rgblight_sethsv_noeeprom(HSV_CYAN); rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL); } diff --git a/keyboards/handwired/onekey/keymaps/rgb/keymap.c b/keyboards/handwired/onekey/keymaps/rgb/keymap.c index c3e77f1ec1ba35da8bde62fa81ff83969e5c1106..c99eb86339b3ea2dd8a28bbd05d745452ff172a4 100644 --- a/keyboards/handwired/onekey/keymaps/rgb/keymap.c +++ b/keyboards/handwired/onekey/keymaps/rgb/keymap.c @@ -6,6 +6,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void keyboard_post_init_user(void) { rgblight_enable_noeeprom(); - rgblight_sethsv_noeeprom_cyan(); + rgblight_sethsv_noeeprom(HSV_CYAN); rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL); } diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c b/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c index 80d0392ffbcea36402d2dcc6300ee6bd93a37995..5cb34887c0e9d91bc604f6e7a74bb818036c6e20 100644 --- a/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c +++ b/keyboards/helix/rev2/keymaps/edvorakjp/keymap.c @@ -9,14 +9,14 @@ layer_state_t layer_state_set_keymap(layer_state_t state) { rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); switch (get_highest_layer(state)) { case L_EDVORAKJP_LOWER: - rgblight_sethsv_noeeprom_red(); + rgblight_sethsv_noeeprom(HSV_RED); break; case L_EDVORAKJP_RAISE: - rgblight_sethsv_noeeprom_green(); + rgblight_sethsv_noeeprom(HSV_GREEN); break; default: // for any other layers, or the default layer rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 3); - rgblight_sethsv_red(); + rgblight_sethsv(HSV_RED); break; } return state; diff --git a/keyboards/hub16/keymaps/ahk_companion/keymap.c b/keyboards/hub16/keymaps/ahk_companion/keymap.c index a3b19521a05e7f4b045bedc51fc29fb7012b9e05..a5148f97e1c06fdb620419ac8b694867f23d5fa5 100644 --- a/keyboards/hub16/keymaps/ahk_companion/keymap.c +++ b/keyboards/hub16/keymaps/ahk_companion/keymap.c @@ -165,5 +165,5 @@ void matrix_scan_user(void) { //EEPROM Reset Function void eeconfig_init_user(void) { rgblight_enable(); // Enable RGB by default - rgblight_sethsv_orange(); // Set it to orange by default + rgblight_sethsv(HSV_ORANGE); // Set it to orange by default } diff --git a/keyboards/hub16/keymaps/peepeetee/keymap.c b/keyboards/hub16/keymaps/peepeetee/keymap.c index 8979eef165daf543971bf15746578020d5122c0a..dac88c8482e8e477bf38a05c1c712987bd0863a6 100644 --- a/keyboards/hub16/keymaps/peepeetee/keymap.c +++ b/keyboards/hub16/keymaps/peepeetee/keymap.c @@ -205,5 +205,5 @@ void matrix_scan_user(void) { //EEPROM Reset Function void eeconfig_init_user(void) { rgblight_enable(); // Enable RGB by default - rgblight_sethsv_orange(); // Set it to orange by default + rgblight_sethsv(HSV_ORANGE); // Set it to orange by default } diff --git a/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c b/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c index 320d38ea718ab1d488cf83afcc85da0134817f16..61552499bd6b8aaaf6aa3d3a8667b2367f0872bb 100644 --- a/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c +++ b/keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c @@ -47,16 +47,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case WINDOWS_LAYER: - rgblight_setrgb_blue(); + rgblight_setrgb(RGB_BLUE); break; case WINDOWS_FN_LAYER: - rgblight_setrgb_blue(); + rgblight_setrgb(RGB_BLUE); break; case MAC_LAYER: - rgblight_setrgb_white(); + rgblight_setrgb(RGB_WHITE); break; case MAC_FN_LAYER: - rgblight_setrgb_white(); + rgblight_setrgb(RGB_WHITE) break; default: rgblight_setrgb (0x00, 0xFF, 0xFF); diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c index d0df36b5f9622c4100ed338ae7c4f98de46c9a8a..e593051db8db4ffe527bf5b44ef9972b65ca2647 100644 --- a/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c +++ b/keyboards/keebio/iris/keymaps/edvorakjp/keymap.c @@ -57,14 +57,14 @@ layer_state_t layer_state_set_keymap(layer_state_t state) { rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); switch (get_highest_layer(state)) { case L_EDVORAKJP_LOWER: - rgblight_sethsv_noeeprom_red(); + rgblight_sethsv_noeeprom(HSV_RED); break; case L_EDVORAKJP_RAISE: - rgblight_sethsv_noeeprom_green(); + rgblight_sethsv_noeeprom(HSV_GREEN); break; default: // for any other layers, or the default layer rgblight_mode(RGBLIGHT_MODE_STATIC_GRADIENT + 3); - rgblight_sethsv_red(); + rgblight_sethsv(HSV_RED); break; } return state; diff --git a/keyboards/keebio/levinson/keymaps/issmirnov/README.md b/keyboards/keebio/levinson/keymaps/issmirnov/README.md index 1e03e58e712d9fd706dac18a8aed4a3f2a86acfa..b6a94c6c3d89b4e7dd29f93de1717db02b4374d7 100644 --- a/keyboards/keebio/levinson/keymaps/issmirnov/README.md +++ b/keyboards/keebio/levinson/keymaps/issmirnov/README.md @@ -4,7 +4,7 @@ - https://github.com/qmk/qmk_firmware/blob/master/docs/feature_rgblight.md - main docs. -- https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight_list.h +- https://github.com/qmk/qmk_firmware/blob/master/quantum/color.h - list of colors - https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight.h - list of functions for RGB manipulation diff --git a/keyboards/keebio/levinson/keymaps/issmirnov/rgb.c b/keyboards/keebio/levinson/keymaps/issmirnov/rgb.c index 36957313537e70be2c7f5d6d1b0332a838554627..0b123bb8d20d03d8449d41b8cd2737812c136f46 100644 --- a/keyboards/keebio/levinson/keymaps/issmirnov/rgb.c +++ b/keyboards/keebio/levinson/keymaps/issmirnov/rgb.c @@ -11,13 +11,13 @@ layer_state_t layer_state_set_rgb(layer_state_t state) { rgblight_sethsv_noeeprom(RGB_CLEAR); break; case _SYMB: - rgblight_sethsv_noeeprom_red(); + rgblight_sethsv_noeeprom(HSV_RED); break; case _NUMP: - rgblight_sethsv_noeeprom_green(); + rgblight_sethsv_noeeprom(HSV_GREEN); break; case _OVERWATCH: - rgblight_sethsv_noeeprom_blue(); + rgblight_sethsv_noeeprom(HSV_BLUE); // TODO set up animated rainbow swirl with overwatch colors. // rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_SWIRL); // rgblight_effect_breathing(&animation_status); @@ -47,7 +47,7 @@ void matrix_scan_rgb(void) { void set_rgb_indicators(uint8_t this_mod, uint8_t this_osm) { if (get_highest_layer(layer_state) == _QWERTY) { if ((this_mod | this_osm) & MOD_MASK_SHIFT) { - rgblight_setrgb_gold_at(SHFT_LED1); + rgblight_setrgb_at(RGB_GOLD, SHFT_LED1); } else { rgblight_setrgb_at(RGB_CLEAR, SHFT_LED1); } diff --git a/keyboards/ktec/staryu/keymaps/default/keymap.c b/keyboards/ktec/staryu/keymaps/default/keymap.c index c41c436f9da561f3339a12de96d1bd91cb8a45bd..0769227c6cde08e13a23c9294a18a154f3270067 100755 --- a/keyboards/ktec/staryu/keymaps/default/keymap.c +++ b/keyboards/ktec/staryu/keymaps/default/keymap.c @@ -78,26 +78,26 @@ void eeconfig_init_user(void) { void keyboard_post_init_user(void) { //layer_state_set_user is not called for inital state - set it here - rgblight_sethsv_noeeprom_white(); + rgblight_sethsv_noeeprom(HSV_WHITE); } layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case _LAYER1: - rgblight_sethsv_noeeprom_cyan(); + rgblight_sethsv_noeeprom(HSV_CYAN); break; case _LAYER2: - rgblight_sethsv_noeeprom_magenta(); + rgblight_sethsv_noeeprom(HSV_MAGENTA); break; case _LAYER3: - rgblight_sethsv_noeeprom_red(); + rgblight_sethsv_noeeprom(HSV_RED); break; case _LAYER4: - rgblight_sethsv_noeeprom_orange(); + rgblight_sethsv_noeeprom(HSV_ORANGE); break; case _LAYER0: default: // for any other layers, or the default layer - rgblight_sethsv_noeeprom_white(); + rgblight_sethsv_noeeprom(HSV_WHITE); break; } return state; diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c index 7afbb8cd089bf6e8a430a191df784d50d138084f..94f66e78b2c32921c0256d7b8fa5daaf1c1ea49c 100644 --- a/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c +++ b/keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c @@ -67,7 +67,7 @@ bool led_update_user(led_t led_state) { // this is needed so that upon disabling num lock, the leds don't stay red rgblight_sethsv_at(rgblight_get_hue(), rgblight_get_sat(), rgblight_get_val(), numer_leds[i]); else - rgblight_setrgb_red_at(numer_leds[i]); // set to red + rgblight_setrgb_at(RGB_RED, numer_leds[i]); // set to red return true; } diff --git a/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c b/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c index 287e85f924ec788dd84ec581d569f2e39c6374d8..10ed42318642e51333fd8dadbc1d08b1c44880c6 100644 --- a/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c +++ b/keyboards/matrix/m12og/rev1/keymaps/default/keymap.c @@ -38,7 +38,7 @@ bool led_update_user(led_t led_state) { static uint8_t caps_state = 0; if (caps_state != led_state.caps_lock) { if (led_state.caps_lock) { - rgblight_sethsv_noeeprom_cyan(); + rgblight_sethsv_noeeprom(HSV_CYAN); rgblight_mode_noeeprom(1); } else { rgblight_sethsv_noeeprom(5, 255, 255); diff --git a/keyboards/mechlovin/kanu/keymaps/dhertz/keymap.c b/keyboards/mechlovin/kanu/keymaps/dhertz/keymap.c index 1446ad8cf4922698667f5fc6b0a26fa48a9a44ee..d3b9987bd8c2e13d5bed605abf71e714e42bbfdb 100644 --- a/keyboards/mechlovin/kanu/keymaps/dhertz/keymap.c +++ b/keyboards/mechlovin/kanu/keymaps/dhertz/keymap.c @@ -46,16 +46,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void keyboard_post_init_user(void) { rgblight_enable_noeeprom(); - rgblight_sethsv_teal(); + rgblight_sethsv(HSV_TEAL); } layer_state_t layer_state_set_keymap(layer_state_t state) { switch (get_highest_layer(state)) { case 1: - rgblight_sethsv_noeeprom_magenta(); + rgblight_sethsv_noeeprom(HSV_MAGENTA); break; default: // for any other layers, or the default layer - rgblight_sethsv_noeeprom_teal(); + rgblight_sethsv_noeeprom(HSV_TEAL); break; } return state; diff --git a/keyboards/percent/canoe/keymaps/dhertz/keymap.c b/keyboards/percent/canoe/keymaps/dhertz/keymap.c index b6785f963c509d8d491deff339f2411f9f3cbaea..bd948327d5275d6ec288cf29fb41b73ea4006060 100644 --- a/keyboards/percent/canoe/keymaps/dhertz/keymap.c +++ b/keyboards/percent/canoe/keymaps/dhertz/keymap.c @@ -46,16 +46,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void keyboard_post_init_user(void) { rgblight_enable_noeeprom(); - rgblight_sethsv_teal(); + rgblight_sethsv(HSV_TEAL); } layer_state_t layer_state_set_keymap(layer_state_t state) { switch (get_highest_layer(state)) { case 1: - rgblight_sethsv_noeeprom_magenta(); + rgblight_sethsv_noeeprom(HSV_MAGENTA); break; default: // for any other layers, or the default layer - rgblight_sethsv_noeeprom_cyan(); + rgblight_sethsv_noeeprom(HSV_CYAN); break; } return state; diff --git a/keyboards/redox/keymaps/jeherve/keymap.c b/keyboards/redox/keymaps/jeherve/keymap.c index ac590116abfbc62e2bb3d4abb5da92304b442654..85707be9d617716349345e563d4f60c5d78d9a89 100644 --- a/keyboards/redox/keymaps/jeherve/keymap.c +++ b/keyboards/redox/keymaps/jeherve/keymap.c @@ -249,19 +249,19 @@ void persistent_default_layer_set(uint16_t default_layer) { layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case _SYMB: - rgblight_setrgb_orange(); + rgblight_setrgb(RGB_ORANGE); break; case _NAV: - rgblight_setrgb_springgreen(); + rgblight_setrgb(RGB_SPRINGGREEN); break; case _INTER: - rgblight_setrgb_teal(); + rgblight_setrgb(RGB_TEAL); break; case _ADJUST: - rgblight_setrgb_red(); + rgblight_setrgb(RGB_RED); break; default: // for any other layers, or the default layer - rgblight_setrgb_yellow(); + rgblight_setrgb(RGB_YELLOW); break; } return state; diff --git a/keyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c index 33a5428fe4119b1184fbfdbcf8bd84e58ae520cc..500fddd53f44a4e3d63745023b3bcd2e3a27b2aa 100755 --- a/keyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c +++ b/keyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c @@ -84,11 +84,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { uint8_t num = rand() / (RAND_MAX / NUM_ANSWERS + 1); rgblight_mode(1); if (num < UNCERTAIN_BREAK) { - rgblight_setrgb_green(); + rgblight_setrgb(RGB_GREEN); } else if (num < NO_BREAK) { - rgblight_setrgb_yellow(); + rgblight_setrgb(RGB_YELLOW); } else { - rgblight_setrgb_red(); + rgblight_setrgb(RGB_RED); } send_string(ANSWERS[num]); lastTime = timer_read32(); @@ -135,6 +135,6 @@ void led_set_user(uint8_t usb_led) { void reset_rgb(void) { // This gets called on init and after the timeout for the answer color // If you want to change the default color/mode, do it here - rgblight_sethsv_blue(); + rgblight_sethsv(HSV_BLUE); rgblight_mode(7); } diff --git a/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c b/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c index 2ef38e25b5040792a3091958815381f17baf2098..6d7b52439dc42a162e0d4122e921678c77ecf77e 100644 --- a/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c +++ b/keyboards/xiudi/xd75/keymaps/hybrid/keymap.c @@ -282,9 +282,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //Define layer colors -#define rgblight_setrgb_user_MAIN() rgblight_sethsv_red() -#define rgblight_setrgb_user_LY1() rgblight_sethsv_green() -#define rgblight_setrgb_user_LY2() rgblight_sethsv_blue() +#define rgblight_setrgb_user_MAIN() rgblight_sethsv(HSV_RED) +#define rgblight_setrgb_user_LY1() rgblight_sethsv(HSV_GREEN) +#define rgblight_setrgb_user_LY2() rgblight_sethsv(HSV_BLUE) void matrix_init_user(void) { rgblight_enable(); diff --git a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c index 52aeaa0a19f762ed44a9a43b80d763b54af7e4cf..d7f8b044e36a7632e3f06c94a71a2a0ad3301d1b 100644 --- a/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c +++ b/keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c @@ -162,14 +162,14 @@ LT(_LYMD,KC_ESC), KC_A , KC_R , KC_S , KC_T , KC_D ,________ ,_______ //Define layer colors #define rgblight_setrgb_user_base() rgblight_sethsv(325,255,255) -#define rgblight_setrgb_user_LYFK() rgblight_sethsv_red() -#define rgblight_setrgb_user_LYMED() rgblight_sethsv_blue() -#define rgblight_setrgb_user_LYNUM() rgblight_sethsv_purple() -#define rgblight_setrgb_user_LYNAV() rgblight_sethsv_cyan() -#define rgblight_setrgb_user_LYMOS() rgblight_sethsv_orange() -#define rgblight_setrgb_user_LYSYS() rgblight_sethsv_green() -#define rgblight_setrgb_user_LYLT() rgblight_sethsv_yellow() -#define rgblight_setrgb_user_LYMD() rgblight_sethsv_white() +#define rgblight_setrgb_user_LYFK() rgblight_sethsv(HSV_RED) +#define rgblight_setrgb_user_LYMED() rgblight_sethsv(HSV_BLUE) +#define rgblight_setrgb_user_LYNUM() rgblight_sethsv(HSV_PURPLE) +#define rgblight_setrgb_user_LYNAV() rgblight_sethsv(HSV_CYAN) +#define rgblight_setrgb_user_LYMOS() rgblight_sethsv(HSV_ORANGE) +#define rgblight_setrgb_user_LYSYS() rgblight_sethsv(HSV_GREEN) +#define rgblight_setrgb_user_LYLT() rgblight_sethsv(HSV_YELLOW) +#define rgblight_setrgb_user_LYMD() rgblight_sethsv(HSV_WHITE) //initialize rgb void matrix_init_user(void) { diff --git a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc index d0071205afcca01c5cd9584a87f85077f48545a7..34b410ce57423a44bc071f9fa5fcbead1bcfa0b3 100644 --- a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc +++ b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc @@ -51,7 +51,7 @@ const uint8_t rgb_keymaps [][RGB_MATRIX_LED_COUNT] = { }; static void led_color_set(uint8_t index, uint8_t color_patterns) { - HSV hsv = rgb_matrix_config.hsv; // 'quantum/rgblight_list.h' + HSV hsv = rgb_matrix_config.hsv; // 'quantum/color.h' RGB rgb_white = hsv_to_rgb(_HSV( 0, 0, hsv.v)); // HSV_WHITE RGB rgb_indc1 = hsv_to_rgb(_HSV(128, 255, hsv.v)); // HSV_TEAL RGB rgb_indc2 = hsv_to_rgb(_HSV(191, 255, hsv.v)); // HSV_PURPLE diff --git a/layouts/community/numpad_5x6/bjohnson/keymap.c b/layouts/community/numpad_5x6/bjohnson/keymap.c index dc6b939e5fb6c509a0f259869c32720a7b2c57e9..71c8829d022ff3ecf6928340fb340a002e382b9d 100644 --- a/layouts/community/numpad_5x6/bjohnson/keymap.c +++ b/layouts/community/numpad_5x6/bjohnson/keymap.c @@ -37,9 +37,9 @@ void keyboard_post_init_user(void) { void led_set_user(uint8_t usb_led) { if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) { - rgblight_sethsv_noeeprom_cyan(); + rgblight_sethsv_noeeprom(HSV_CYAN); } else { - rgblight_sethsv_noeeprom_magenta(); + rgblight_sethsv_noeeprom(HSV_MAGENTA); } } @@ -47,6 +47,6 @@ void shutdown_user (void) { #ifdef RGBLIGHT_ENABLE rgblight_enable_noeeprom(); rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - rgblight_setrgb_red(); + rgblight_setrgb(RGB_RED); #endif // RGBLIGHT_ENABLE } diff --git a/quantum/rgblight/rgblight.h b/quantum/rgblight/rgblight.h index a08b9a7b6bd7b03c3aa44d789bf2211a89588a6c..46e8e07212cb49136bb797f3c60fdffeba1e87ab 100644 --- a/quantum/rgblight/rgblight.h +++ b/quantum/rgblight/rgblight.h @@ -181,7 +181,6 @@ enum RGBLIGHT_EFFECT_MODE { #include "eeconfig.h" #include "ws2812.h" #include "color.h" -#include "rgblight_list.h" #ifdef RGBLIGHT_LAYERS typedef struct { diff --git a/quantum/rgblight/rgblight_list.h b/quantum/rgblight/rgblight_list.h deleted file mode 100644 index 0fd68b75f3e849399a713cf7951cea581d349f05..0000000000000000000000000000000000000000 --- a/quantum/rgblight/rgblight_list.h +++ /dev/null @@ -1,136 +0,0 @@ -/* Copyright 2018 Jack Humbert - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -#include "color.h" - -/* -######################################################################################## -## ## -## ## -## ## -## The functions below have been deprecated and may be removed in a future release. ## -## ## -## Please use the values in color.h with the RGB functions. ## -## ## -## ## -## ## -######################################################################################## -*/ - -/* SET RGB List */ -#define rgblight_setrgb_white() rgblight_setrgb(RGB_WHITE) -#define rgblight_setrgb_red() rgblight_setrgb(RGB_RED) -#define rgblight_setrgb_coral() rgblight_setrgb(RGB_CORAL) -#define rgblight_setrgb_orange() rgblight_setrgb(RGB_ORANGE) -#define rgblight_setrgb_goldenrod() rgblight_setrgb(RGB_GOLDENROD) -#define rgblight_setrgb_gold() rgblight_setrgb(RGB_GOLD) -#define rgblight_setrgb_yellow() rgblight_setrgb(RGB_YELLOW) -#define rgblight_setrgb_chartreuse() rgblight_setrgb(RGB_CHARTREUSE) -#define rgblight_setrgb_green() rgblight_setrgb(RGB_GREEN) -#define rgblight_setrgb_springgreen() rgblight_setrgb(RGB_SPRINGGREEN) -#define rgblight_setrgb_turquoise() rgblight_setrgb(RGB_TURQUOISE) -#define rgblight_setrgb_teal() rgblight_setrgb(RGB_TEAL) -#define rgblight_setrgb_cyan() rgblight_setrgb(RGB_CYAN) -#define rgblight_setrgb_azure() rgblight_setrgb(RGB_AZURE) -#define rgblight_setrgb_blue() rgblight_setrgb(RGB_BLUE) -#define rgblight_setrgb_purple() rgblight_setrgb(RGB_PURPLE) -#define rgblight_setrgb_magenta() rgblight_setrgb(RGB_MAGENTA) -#define rgblight_setrgb_pink() rgblight_setrgb(RGB_PINK) - -/* SET RGB List */ -#define rgblight_setrgb_white_at(at) rgblight_setrgb_at(RGB_WHITE, at) -#define rgblight_setrgb_red_at(at) rgblight_setrgb_at(RGB_RED, at) -#define rgblight_setrgb_coral_at(at) rgblight_setrgb_at(RGB_CORAL, at) -#define rgblight_setrgb_orange_at(at) rgblight_setrgb_at(RGB_ORANGE at) -#define rgblight_setrgb_goldenrod_at(at) rgblight_setrgb_at(RGB_GOLDENROD, at) -#define rgblight_setrgb_gold_at(at) rgblight_setrgb_at(RGB_GOLD, at) -#define rgblight_setrgb_yellow_at(at) rgblight_setrgb_at(RGB_YELLOW, at) -#define rgblight_setrgb_chartreuse_at(at) rgblight_setrgb_at(RGB_CHARTREUSE, at) -#define rgblight_setrgb_green_at(at) rgblight_setrgb_at(RGB_GREEN, at) -#define rgblight_setrgb_springgreen_at(at) rgblight_setrgb_at(RGB_SPRINGGREEN, at) -#define rgblight_setrgb_turquoise_at(at) rgblight_setrgb_at(RGB_TURQUOISE, at) -#define rgblight_setrgb_teal_at(at) rgblight_setrgb_at(RGB_TEAL, at) -#define rgblight_setrgb_cyan_at(at) rgblight_setrgb_at(RGB_CYAN, at) -#define rgblight_setrgb_azure_at(at) rgblight_setrgb_at(RGB_AZURE, at) -#define rgblight_setrgb_blue_at(at) rgblight_setrgb_at(RGB_BLUE, at) -#define rgblight_setrgb_purple_at(at) rgblight_setrgb_at(RGB_PURPLE, at) -#define rgblight_setrgb_magenta_at(at) rgblight_setrgb_at(RGB_MAGENTA, at) -#define rgblight_setrgb_pink_at(at) rgblight_setrgb_at(RGB_PINK, at) - -/* SET HSV List */ -#define rgblight_sethsv_white() rgblight_sethsv(HSV_WHITE) -#define rgblight_sethsv_red() rgblight_sethsv(HSV_RED) -#define rgblight_sethsv_coral() rgblight_sethsv(HSV_CORAL) -#define rgblight_sethsv_orange() rgblight_sethsv(HSV_ORANGE) -#define rgblight_sethsv_goldenrod() rgblight_sethsv(HSV_GOLDENROD) -#define rgblight_sethsv_gold() rgblight_sethsv(HSV_GOLD) -#define rgblight_sethsv_yellow() rgblight_sethsv(HSV_YELLOW) -#define rgblight_sethsv_chartreuse() rgblight_sethsv(HSV_CHARTREUSE) -#define rgblight_sethsv_green() rgblight_sethsv(HSV_GREEN) -#define rgblight_sethsv_springgreen() rgblight_sethsv(HSV_SPRINGGREEN) -#define rgblight_sethsv_turquoise() rgblight_sethsv(HSV_TURQUOISE) -#define rgblight_sethsv_teal() rgblight_sethsv(HSV_TEAL) -#define rgblight_sethsv_cyan() rgblight_sethsv(HSV_CYAN) -#define rgblight_sethsv_azure() rgblight_sethsv(HSV_AZURE) -#define rgblight_sethsv_blue() rgblight_sethsv(HSV_BLUE) -#define rgblight_sethsv_purple() rgblight_sethsv(HSV_PURPLE) -#define rgblight_sethsv_magenta() rgblight_sethsv(HSV_MAGENTA) -#define rgblight_sethsv_pink() rgblight_sethsv(HSV_PINK) - -/* SET HSV List */ -/* If you're doing layer indication, this is best, as it won't */ -/* write to the eeprom, since it's limited (very high value). */ -/* If you want to use modes with this (since you can), then you */ -/* want to use rgblight_mode_noeeprom(x) instead. */ -#define rgblight_sethsv_noeeprom_white() rgblight_sethsv_noeeprom(HSV_WHITE) -#define rgblight_sethsv_noeeprom_red() rgblight_sethsv_noeeprom(HSV_RED) -#define rgblight_sethsv_noeeprom_coral() rgblight_sethsv_noeeprom(HSV_CORAL) -#define rgblight_sethsv_noeeprom_orange() rgblight_sethsv_noeeprom(HSV_ORANGE) -#define rgblight_sethsv_noeeprom_goldenrod() rgblight_sethsv_noeeprom(HSV_GOLDENROD) -#define rgblight_sethsv_noeeprom_gold() rgblight_sethsv_noeeprom(HSV_GOLD) -#define rgblight_sethsv_noeeprom_yellow() rgblight_sethsv_noeeprom(HSV_YELLOW) -#define rgblight_sethsv_noeeprom_chartreuse() rgblight_sethsv_noeeprom(HSV_CHARTREUSE) -#define rgblight_sethsv_noeeprom_green() rgblight_sethsv_noeeprom(HSV_GREEN) -#define rgblight_sethsv_noeeprom_springgreen() rgblight_sethsv_noeeprom(HSV_SPRINGGREEN) -#define rgblight_sethsv_noeeprom_turquoise() rgblight_sethsv_noeeprom(HSV_TURQUOISE) -#define rgblight_sethsv_noeeprom_teal() rgblight_sethsv_noeeprom(HSV_TEAL) -#define rgblight_sethsv_noeeprom_cyan() rgblight_sethsv_noeeprom(HSV_CYAN) -#define rgblight_sethsv_noeeprom_azure() rgblight_sethsv_noeeprom(HSV_AZURE) -#define rgblight_sethsv_noeeprom_blue() rgblight_sethsv_noeeprom(HSV_BLUE) -#define rgblight_sethsv_noeeprom_purple() rgblight_sethsv_noeeprom(HSV_PURPLE) -#define rgblight_sethsv_noeeprom_magenta() rgblight_sethsv_noeeprom(HSV_MAGENTA) -#define rgblight_sethsv_noeeprom_pink() rgblight_sethsv_noeeprom(HSV_PINK) - -/* SET HSV List */ -#define rgblight_sethsv_white_at(at) rgblight_sethsv_at(HSV_WHITE, at) -#define rgblight_sethsv_red_at(at) rgblight_sethsv_at(HSV_RED, at) -#define rgblight_sethsv_coral_at(at) rgblight_sethsv_at(HSV_CORAL, at) -#define rgblight_sethsv_orange_at(at) rgblight_sethsv_at(HSV_ORANGE, at) -#define rgblight_sethsv_goldenrod_at(at) rgblight_sethsv_at(HSV_GOLDENROD, at) -#define rgblight_sethsv_gold_at(at) rgblight_sethsv_at(HSV_GOLD, at) -#define rgblight_sethsv_yellow_at(at) rgblight_sethsv_at(HSV_YELLOW, at) -#define rgblight_sethsv_chartreuse_at(at) rgblight_sethsv_at(HSV_CHARTREUSE, at) -#define rgblight_sethsv_green_at(at) rgblight_sethsv_at(HSV_GREEN, at) -#define rgblight_sethsv_springgreen_at(at) rgblight_sethsv_at(HSV_SPRINGGREEN, at) -#define rgblight_sethsv_turquoise_at(at) rgblight_sethsv_at(HSV_TURQUOISE, at) -#define rgblight_sethsv_teal_at(at) rgblight_sethsv_at(HSV_TEAL, at) -#define rgblight_sethsv_cyan_at(at) rgblight_sethsv_at(HSV_CYAN, at) -#define rgblight_sethsv_azure_at(at) rgblight_sethsv_at(HSV_AZURE, at) -#define rgblight_sethsv_blue_at(at) rgblight_sethsv_at(HSV_BLUE, at) -#define rgblight_sethsv_purple_at(at) rgblight_sethsv_at(HSV_PURPLE, at) -#define rgblight_sethsv_magenta_at(at) rgblight_sethsv_at(HSV_MAGENTA, at) -#define rgblight_sethsv_pink_at(at) rgblight_sethsv_at(HSV_PINK, at) diff --git a/users/brandonschlack/rgb_theme.h b/users/brandonschlack/rgb_theme.h index 7c8b2923fccf2069ca951d77df6c3b7dc9448fa9..cf9b681de6c2dec68624a8d3e367418ae93c3d4b 100644 --- a/users/brandonschlack/rgb_theme.h +++ b/users/brandonschlack/rgb_theme.h @@ -17,7 +17,6 @@ #include "brandonschlack.h" #include "color.h" -#include "rgblight_list.h" /*TODO Update as RGBLIGHT Mode */ #ifndef RGB_THEME_COLORS_MAX diff --git a/users/curry/curry.c b/users/curry/curry.c index a9f9f798701d0f598d6639cb00a1f071383ff357..f29b9c3ff7baee7af372ab696c31baebe7fd4fff 100644 --- a/users/curry/curry.c +++ b/users/curry/curry.c @@ -58,7 +58,7 @@ void shutdown_user(void) { #if defined(RGBLIGHT_ENABLE) rgblight_enable_noeeprom(); rgblight_mode_noeeprom(1); - rgblight_setrgb_red(); + rgblight_setrgb(RGB_RED); #endif #if defined(RGB_MATRIX_ENABLE) diff --git a/users/greatwizard/underglow.c b/users/greatwizard/underglow.c index db31290acd05676e3b8adaabf48043a5fde3f786..c23fb5bc51da257f4ebf0ecc52b4bd050ebf8f76 100644 --- a/users/greatwizard/underglow.c +++ b/users/greatwizard/underglow.c @@ -22,7 +22,7 @@ void keyboard_post_init_rgb(void) { return; } rgblight_enable_noeeprom(); - rgblight_sethsv_noeeprom_orange(); + rgblight_sethsv_noeeprom(HSV_ORANGE); rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); } @@ -64,31 +64,31 @@ layer_state_t layer_state_set_rgb(layer_state_t state) { #ifdef LAYERS_PROGRAMMER case _PROGRAMMER_SHIFTED: #endif - rgblight_sethsv_noeeprom_orange(); + rgblight_sethsv_noeeprom(HSV_ORANGE); break; #ifdef LAYERS_ORTHO case _LOWER: - rgblight_sethsv_noeeprom_red(); + rgblight_sethsv_noeeprom(HSV_RED); break; case _RAISE: - rgblight_sethsv_noeeprom_blue(); + rgblight_sethsv_noeeprom(HSV_BLUE); break; case _ADJUST: - rgblight_sethsv_noeeprom_purple(); + rgblight_sethsv_noeeprom(HSV_PURPLE); break; #endif #ifdef LAYER_FN case _FN: - rgblight_sethsv_noeeprom_chartreuse(); + rgblight_sethsv_noeeprom(HSV_CHARTREUSE); break; #endif #ifdef LAYER_GIT case _GIT: - rgblight_sethsv_noeeprom_teal(); + rgblight_sethsv_noeeprom(HSV_TEAL); break; #endif default: - rgblight_sethsv_noeeprom_white(); + rgblight_sethsv_noeeprom(HSV_WHITE); break; } return state; diff --git a/users/kuchosauronad0/kuchosauronad0.c b/users/kuchosauronad0/kuchosauronad0.c index 820d84daadde96885c03ea3589e50ae2369e91a8..4e9e85610752d01ab306c08d74d136924bf29083 100644 --- a/users/kuchosauronad0/kuchosauronad0.c +++ b/users/kuchosauronad0/kuchosauronad0.c @@ -69,7 +69,7 @@ void shutdown_user (void) { #ifdef RGBLIGHT_ENABLE rgblight_enable_noeeprom(); rgblight_mode_noeeprom(1); - rgblight_setrgb_teal(); + rgblight_setrgb(RGB_TEAL); #endif // RGBLIGHT_ENABLE #ifdef RGB_MATRIX_ENABLE // uint16_t timer_start = timer_read(); diff --git a/users/kuchosauronad0/leader.c b/users/kuchosauronad0/leader.c index 22674eef055ae3b781870c8eb20cd81a7a0be0a6..ac2a6599a114a3cb81bd7f10a5f6b92fdda827c3 100644 --- a/users/kuchosauronad0/leader.c +++ b/users/kuchosauronad0/leader.c @@ -97,7 +97,7 @@ void leader_start(void) { #ifdef RGBLIGHT_ENABLE rgblight_savebase(); rgblight_mode_noeeprom(1); - rgblight_sethsv_noeeprom_goldenrod(); + rgblight_sethsv_noeeprom(HSV_GOLDENROD); #endif } diff --git a/users/kuchosauronad0/rgblight_user.c b/users/kuchosauronad0/rgblight_user.c index feea0c412f7141ba0d1bbe907ee4cf291a163106..77a8ac6df801a19df6737e38a561364d9a5e27e2 100644 --- a/users/kuchosauronad0/rgblight_user.c +++ b/users/kuchosauronad0/rgblight_user.c @@ -86,36 +86,36 @@ layer_state_t layer_state_set_rgb(layer_state_t state) { if (userspace_config.rgb_layer_change) { switch (get_highest_layer(state)) { // _RAISE, _LOWER and _ADJUST use a custom color and the breathing effect case _RAISE: - rgblight_sethsv_noeeprom_green(); + rgblight_sethsv_noeeprom(HSV_GREEN); rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3); break; case _LOWER: - rgblight_sethsv_noeeprom_red(); + rgblight_sethsv_noeeprom(HSV_RED); rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3); break; case _ADJUST: - rgblight_sethsv_noeeprom_white(); + rgblight_sethsv_noeeprom(HSV_WHITE); rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 2); break; default: // Use a solid color for normal layers switch (get_highest_layer(default_layer_state)) { case _QWERTY: - rgblight_sethsv_noeeprom_magenta(); + rgblight_sethsv_noeeprom(HSV_MAGENTA); break; case _COLEMAK: - rgblight_sethsv_noeeprom_green(); + rgblight_sethsv_noeeprom(HSV_GREEN); break; case _DVORAK: - rgblight_sethsv_noeeprom_blue(); + rgblight_sethsv_noeeprom(HSV_BLUE); break; case _WORKMAN: - rgblight_sethsv_noeeprom_goldenrod(); + rgblight_sethsv_noeeprom(HSV_GOLDENROD); break; case _PLOVER: - rgblight_sethsv_noeeprom_pink(); + rgblight_sethsv_noeeprom(HSV_PINK); break; default: - rgblight_sethsv_noeeprom_white(); + rgblight_sethsv_noeeprom(HSV_WHITE); break; } get_highest_layer(state) == _MODS ? rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING) : rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); // if _MODS layer is on, then breath to denote it diff --git a/users/peej/peej.c b/users/peej/peej.c index c4ea4f87b1479555cae0f08e8d281f070fe6dbd0..bd9264ea6067b1528aefe69abd77727a0490bc6a 100644 --- a/users/peej/peej.c +++ b/users/peej/peej.c @@ -57,7 +57,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef RGBLIGHT_ENABLE rgblight_enable_noeeprom(); rgblight_mode_noeeprom(1); - rgblight_setrgb_red(); + rgblight_setrgb(RGB_RED); #endif reset_keyboard(); break; diff --git a/users/twschum/twschum.c b/users/twschum/twschum.c index 7f1cb3de783be2a0ba39fba914e46f38671d5d04..f0ae1e65a9e0ca3cd1035fa805a0e5dfe02b5907 100644 --- a/users/twschum/twschum.c +++ b/users/twschum/twschum.c @@ -97,7 +97,6 @@ static inline bool tap_ctrl_other_pressed(void) { /* Use RGB underglow to indicate layer * https://docs.qmk.fm/reference/customizing-functionality */ -// add to quantum/rgblight_list.h #ifdef RGBLIGHT_ENABLE static bool rgb_layers_enabled = true; static bool rgb_L0_enabled = false; diff --git a/users/wanleg/wanleg.c b/users/wanleg/wanleg.c index aa7b1c9a4c421f44b2c1e6fb95fa445d6d316431..b056f5dd960a53da0a66979af4054f6a35f24d69 100644 --- a/users/wanleg/wanleg.c +++ b/users/wanleg/wanleg.c @@ -129,7 +129,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #if defined(RGBLIGHT_ENABLE) rgblight_enable_noeeprom(); // enables Rgb, without saving settings rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - rgblight_sethsv_noeeprom_red(); + rgblight_sethsv_noeeprom(HSV_RED); #endif } return true; // Let QMK send the press/release events as normal