summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-10-28 09:50:14 +1100
committerGitHub <noreply@github.com>2022-10-27 23:50:14 +0100
commit7407347be1df69928d27ea9b6a4fe094429f2a55 (patch)
treee511be10ad74c60b54ce1839cbf3db767466275a
parenta96a9fd5f8d1db141bc4d5083b63267aac035adf (diff)
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
-rw-r--r--docs/feature_eeprom.md14
-rw-r--r--keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c2
-rw-r--r--keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/keymap.c2
-rw-r--r--keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c2
-rw-r--r--keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c2
-rw-r--r--keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c2
-rw-r--r--keyboards/bastardkb/dilemma/keymaps/bstiq/keymap.c2
-rw-r--r--keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c10
-rw-r--r--keyboards/crkbd/keymaps/edvorakjp/keymap.c6
-rw-r--r--keyboards/dp60/keymaps/indicator/indicator.c1
-rw-r--r--keyboards/dz60/keymaps/iso_split-spacebar/keymap.c8
-rw-r--r--keyboards/dz60/keymaps/mechmerlin/keymap.c4
-rw-r--r--keyboards/dz60/keymaps/mechmerlin/readme.md2
-rw-r--r--keyboards/ergodox_ez/keymaps/hacker_dvorak/user/layer_set_state_user.c20
-rw-r--r--keyboards/ergodox_ez/keymaps/hacker_dvorak/user/matrix_scan_user.c2
-rw-r--r--keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c20
-rw-r--r--keyboards/handwired/heisenberg/keymaps/turkishish/keymap.c2
-rw-r--r--keyboards/handwired/onekey/keymaps/apa102/keymap.c2
-rw-r--r--keyboards/handwired/onekey/keymaps/rgb/keymap.c2
-rw-r--r--keyboards/helix/rev2/keymaps/edvorakjp/keymap.c6
-rw-r--r--keyboards/hub16/keymaps/ahk_companion/keymap.c2
-rw-r--r--keyboards/hub16/keymaps/peepeetee/keymap.c2
-rw-r--r--keyboards/kbdfans/kbd75/keymaps/edulpn/keymap.c8
-rw-r--r--keyboards/keebio/iris/keymaps/edvorakjp/keymap.c6
-rw-r--r--keyboards/keebio/levinson/keymaps/issmirnov/README.md2
-rw-r--r--keyboards/keebio/levinson/keymaps/issmirnov/rgb.c8
-rwxr-xr-xkeyboards/ktec/staryu/keymaps/default/keymap.c12
-rw-r--r--keyboards/lfkeyboards/lfkpad/keymaps/pascalpfeil/keymap.c2
-rw-r--r--keyboards/matrix/m12og/rev1/keymaps/default/keymap.c2
-rw-r--r--keyboards/mechlovin/kanu/keymaps/dhertz/keymap.c6
-rw-r--r--keyboards/percent/canoe/keymaps/dhertz/keymap.c6
-rw-r--r--keyboards/redox/keymaps/jeherve/keymap.c10
-rwxr-xr-xkeyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c8
-rw-r--r--keyboards/xiudi/xd75/keymaps/hybrid/keymap.c6
-rw-r--r--keyboards/xiudi/xd75/keymaps/tdl-jturner/keymap.c16
-rw-r--r--keyboards/yushakobo/quick17/rgb_matrix_kb.inc2
-rw-r--r--layouts/community/numpad_5x6/bjohnson/keymap.c6
-rw-r--r--quantum/rgblight/rgblight.h1
-rw-r--r--quantum/rgblight/rgblight_list.h136
-rw-r--r--users/brandonschlack/rgb_theme.h1
-rw-r--r--users/curry/curry.c2
-rw-r--r--users/greatwizard/underglow.c16
-rw-r--r--users/kuchosauronad0/kuchosauronad0.c2
-rw-r--r--users/kuchosauronad0/leader.c2
-rw-r--r--users/kuchosauronad0/rgblight_user.c18
-rw-r--r--users/peej/peej.c2
-rw-r--r--users/twschum/twschum.c1
-rw-r--r--users/wanleg/wanleg.c2
48 files changed, 129 insertions, 269 deletions
diff --git a/docs/feature_eeprom.md b/docs/feature_eeprom.md
index 3a4119eab7..088f4f36ff 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 ec707557d1..a326abcf83 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 a28c200b2d..2664b531a2 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 417220a38e..d3fdfef14a 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 9a6eb5f236..39b05b9234 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 0ab7b78cc4..92a861e91a 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 5533bc40c6..e8c0441d7b 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 161543806f..2d687037e4 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 66c39783fd..0cc8a0c4ba 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 999e0c3338..683ae3625a 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 a790f6d3ad..56dccf376f 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 0b7b17f2cd..795ba24798 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 9c53288fea..bb8fbf84b3 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 ed407def79..bd4fd10ad1 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 3b78079cca..277821afac 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 a41a21072c..6ed204a357 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 3cdc3e0026..0aa6e56a06 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 700755a452..8b4191fb28 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 c3e77f1ec1..c99eb86339 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 80d0392ffb..5cb34887c0 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 a3b19521a0..a5148f97e1 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 8979eef165..dac88c8482 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 320d38ea71..61552499bd 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 d0df36b5f9..e593051db8 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 1e03e58e71..b6a94c6c3d 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 3695731353..0b123bb8d2 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 c41c436f9d..0769227c6c 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 7afbb8cd08..94f66e78b2 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 287e85f924..10ed423186 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 1446ad8cf4..d3b9987bd8 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 b6785f963c..bd948327d5 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 ac590116ab..85707be9d6 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 33a5428fe4..500fddd53f 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 2ef38e25b5..6d7b52439d 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 52aeaa0a19..d7f8b044e3 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 d0071205af..34b410ce57 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 dc6b939e5f..71c8829d02 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 a08b9a7b6b..46e8e07212 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 0fd68b75f3..0000000000
--- 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 <http://www.gnu.org/licenses/>.
- */
-#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 7c8b2923fc..cf9b681de6 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 a9f9f79870..f29b9c3ff7 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 db31290acd..c23fb5bc51 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 820d84daad..4e9e856107 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 22674eef05..ac2a6599a1 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 feea0c412f..77a8ac6df8 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 c4ea4f87b1..bd9264ea60 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 7f1cb3de78..f0ae1e65a9 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 aa7b1c9a4c..b056f5dd96 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