Relocate RGB/HSV color defs to a more fitting place (#13377)
This commit is contained in:
Ryan
GitHub
parent
1e2378fe7f
commit
653082235a
4 changed files with 100 additions and 86 deletions
|
|
@ -554,28 +554,29 @@ For inspiration and examples, check out the built-in effects under `quantum/rgb_
|
||||||
|
|
||||||
These are shorthands to popular colors. The `RGB` ones can be passed to the `setrgb` functions, while the `HSV` ones to the `sethsv` functions.
|
These are shorthands to popular colors. The `RGB` ones can be passed to the `setrgb` functions, while the `HSV` ones to the `sethsv` functions.
|
||||||
|
|
||||||
|RGB |HSV |
|
|RGB |HSV |
|
||||||
|-------------------|-------------------|
|
|---------------------|---------------------|
|
||||||
|`RGB_WHITE` |`HSV_WHITE` |
|
|`RGB_AZURE` |`HSV_AZURE` |
|
||||||
|`RGB_RED` |`HSV_RED` |
|
|`RGB_BLACK`/`RGB_OFF`|`HSV_BLACK`/`HSV_OFF`|
|
||||||
|`RGB_CORAL` |`HSV_CORAL` |
|
|`RGB_BLUE` |`HSV_BLUE` |
|
||||||
|`RGB_ORANGE` |`HSV_ORANGE` |
|
|`RGB_CHARTREUSE` |`HSV_CHARTREUSE` |
|
||||||
|`RGB_GOLDENROD` |`HSV_GOLDENROD` |
|
|`RGB_CORAL` |`HSV_CORAL` |
|
||||||
|`RGB_GOLD` |`HSV_GOLD` |
|
|`RGB_CYAN` |`HSV_CYAN` |
|
||||||
|`RGB_YELLOW` |`HSV_YELLOW` |
|
|`RGB_GOLD` |`HSV_GOLD` |
|
||||||
|`RGB_CHARTREUSE` |`HSV_CHARTREUSE` |
|
|`RGB_GOLDENROD` |`HSV_GOLDENROD` |
|
||||||
|`RGB_GREEN` |`HSV_GREEN` |
|
|`RGB_GREEN` |`HSV_GREEN` |
|
||||||
|`RGB_SPRINGGREEN` |`HSV_SPRINGGREEN` |
|
|`RGB_MAGENTA` |`HSV_MAGENTA` |
|
||||||
|`RGB_TURQUOISE` |`HSV_TURQUOISE` |
|
|`RGB_ORANGE` |`HSV_ORANGE` |
|
||||||
|`RGB_TEAL` |`HSV_TEAL` |
|
|`RGB_PINK` |`HSV_PINK` |
|
||||||
|`RGB_CYAN` |`HSV_CYAN` |
|
|`RGB_PURPLE` |`HSV_PURPLE` |
|
||||||
|`RGB_AZURE` |`HSV_AZURE` |
|
|`RGB_RED` |`HSV_RED` |
|
||||||
|`RGB_BLUE` |`HSV_BLUE` |
|
|`RGB_SPRINGGREEN` |`HSV_SPRINGGREEN` |
|
||||||
|`RGB_PURPLE` |`HSV_PURPLE` |
|
|`RGB_TEAL` |`HSV_TEAL` |
|
||||||
|`RGB_MAGENTA` |`HSV_MAGENTA` |
|
|`RGB_TURQUOISE` |`HSV_TURQUOISE` |
|
||||||
|`RGB_PINK` |`HSV_PINK` |
|
|`RGB_WHITE` |`HSV_WHITE` |
|
||||||
|
|`RGB_YELLOW` |`HSV_YELLOW` |
|
||||||
|
|
||||||
These are defined in [`rgblight_list.h`](https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight_list.h). Feel free to add to this list!
|
These are defined in [`color.h`](https://github.com/qmk/qmk_firmware/blob/master/quantum/color.h). Feel free to add to this list!
|
||||||
|
|
||||||
|
|
||||||
## Additional `config.h` Options :id=additional-configh-options
|
## Additional `config.h` Options :id=additional-configh-options
|
||||||
|
|
|
||||||
|
|
@ -449,26 +449,27 @@ rgblight_sethsv_at(HSV_GREEN, 2); // led 2
|
||||||
|
|
||||||
These are shorthands to popular colors. The `RGB` ones can be passed to the `setrgb` functions, while the `HSV` ones to the `sethsv` functions.
|
These are shorthands to popular colors. The `RGB` ones can be passed to the `setrgb` functions, while the `HSV` ones to the `sethsv` functions.
|
||||||
|
|
||||||
|RGB |HSV |
|
|RGB |HSV |
|
||||||
|-------------------|-------------------|
|
|---------------------|---------------------|
|
||||||
|`RGB_WHITE` |`HSV_WHITE` |
|
|`RGB_AZURE` |`HSV_AZURE` |
|
||||||
|`RGB_RED` |`HSV_RED` |
|
|`RGB_BLACK`/`RGB_OFF`|`HSV_BLACK`/`HSV_OFF`|
|
||||||
|`RGB_CORAL` |`HSV_CORAL` |
|
|`RGB_BLUE` |`HSV_BLUE` |
|
||||||
|`RGB_ORANGE` |`HSV_ORANGE` |
|
|`RGB_CHARTREUSE` |`HSV_CHARTREUSE` |
|
||||||
|`RGB_GOLDENROD` |`HSV_GOLDENROD` |
|
|`RGB_CORAL` |`HSV_CORAL` |
|
||||||
|`RGB_GOLD` |`HSV_GOLD` |
|
|`RGB_CYAN` |`HSV_CYAN` |
|
||||||
|`RGB_YELLOW` |`HSV_YELLOW` |
|
|`RGB_GOLD` |`HSV_GOLD` |
|
||||||
|`RGB_CHARTREUSE` |`HSV_CHARTREUSE` |
|
|`RGB_GOLDENROD` |`HSV_GOLDENROD` |
|
||||||
|`RGB_GREEN` |`HSV_GREEN` |
|
|`RGB_GREEN` |`HSV_GREEN` |
|
||||||
|`RGB_SPRINGGREEN` |`HSV_SPRINGGREEN` |
|
|`RGB_MAGENTA` |`HSV_MAGENTA` |
|
||||||
|`RGB_TURQUOISE` |`HSV_TURQUOISE` |
|
|`RGB_ORANGE` |`HSV_ORANGE` |
|
||||||
|`RGB_TEAL` |`HSV_TEAL` |
|
|`RGB_PINK` |`HSV_PINK` |
|
||||||
|`RGB_CYAN` |`HSV_CYAN` |
|
|`RGB_PURPLE` |`HSV_PURPLE` |
|
||||||
|`RGB_AZURE` |`HSV_AZURE` |
|
|`RGB_RED` |`HSV_RED` |
|
||||||
|`RGB_BLUE` |`HSV_BLUE` |
|
|`RGB_SPRINGGREEN` |`HSV_SPRINGGREEN` |
|
||||||
|`RGB_PURPLE` |`HSV_PURPLE` |
|
|`RGB_TEAL` |`HSV_TEAL` |
|
||||||
|`RGB_MAGENTA` |`HSV_MAGENTA` |
|
|`RGB_TURQUOISE` |`HSV_TURQUOISE` |
|
||||||
|`RGB_PINK` |`HSV_PINK` |
|
|`RGB_WHITE` |`HSV_WHITE` |
|
||||||
|
|`RGB_YELLOW` |`HSV_YELLOW` |
|
||||||
|
|
||||||
```c
|
```c
|
||||||
rgblight_setrgb(RGB_ORANGE);
|
rgblight_setrgb(RGB_ORANGE);
|
||||||
|
|
@ -477,7 +478,7 @@ rgblight_setrgb_at(RGB_GOLD, 3);
|
||||||
rgblight_sethsv_range(HSV_WHITE, 0, 6);
|
rgblight_sethsv_range(HSV_WHITE, 0, 6);
|
||||||
```
|
```
|
||||||
|
|
||||||
These are defined in [`rgblight_list.h`](https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight_list.h). Feel free to add to this list!
|
These are defined in [`color.h`](https://github.com/qmk/qmk_firmware/blob/master/quantum/color.h). Feel free to add to this list!
|
||||||
|
|
||||||
|
|
||||||
## Changing the order of the LEDs
|
## Changing the order of the LEDs
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,60 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
// clang-format off
|
||||||
|
|
||||||
|
/*
|
||||||
|
* RGB Colors
|
||||||
|
*/
|
||||||
|
#define RGB_AZURE 0x99, 0xF5, 0xFF
|
||||||
|
#define RGB_BLACK 0x00, 0x00, 0x00
|
||||||
|
#define RGB_BLUE 0x00, 0x00, 0xFF
|
||||||
|
#define RGB_CHARTREUSE 0x80, 0xFF, 0x00
|
||||||
|
#define RGB_CORAL 0xFF, 0x7C, 0x4D
|
||||||
|
#define RGB_CYAN 0x00, 0xFF, 0xFF
|
||||||
|
#define RGB_GOLD 0xFF, 0xD9, 0x00
|
||||||
|
#define RGB_GOLDENROD 0xD9, 0xA5, 0x21
|
||||||
|
#define RGB_GREEN 0x00, 0xFF, 0x00
|
||||||
|
#define RGB_MAGENTA 0xFF, 0x00, 0xFF
|
||||||
|
#define RGB_ORANGE 0xFF, 0x80, 0x00
|
||||||
|
#define RGB_PINK 0xFF, 0x80, 0xBF
|
||||||
|
#define RGB_PURPLE 0x7A, 0x00, 0xFF
|
||||||
|
#define RGB_RED 0xFF, 0x00, 0x00
|
||||||
|
#define RGB_SPRINGGREEN 0x00, 0xFF, 0x80
|
||||||
|
#define RGB_TEAL 0x00, 0x80, 0x80
|
||||||
|
#define RGB_TURQUOISE 0x47, 0x6E, 0x6A
|
||||||
|
#define RGB_WHITE 0xFF, 0xFF, 0xFF
|
||||||
|
#define RGB_YELLOW 0xFF, 0xFF, 0x00
|
||||||
|
#define RGB_OFF RGB_BLACK
|
||||||
|
|
||||||
|
/*
|
||||||
|
* HSV Colors
|
||||||
|
*
|
||||||
|
* All values (including hue) are scaled to 0-255
|
||||||
|
*/
|
||||||
|
#define HSV_AZURE 132, 102, 255
|
||||||
|
#define HSV_BLACK 0, 0, 0
|
||||||
|
#define HSV_BLUE 170, 255, 255
|
||||||
|
#define HSV_CHARTREUSE 64, 255, 255
|
||||||
|
#define HSV_CORAL 11, 176, 255
|
||||||
|
#define HSV_CYAN 128, 255, 255
|
||||||
|
#define HSV_GOLD 36, 255, 255
|
||||||
|
#define HSV_GOLDENROD 30, 218, 218
|
||||||
|
#define HSV_GREEN 85, 255, 255
|
||||||
|
#define HSV_MAGENTA 213, 255, 255
|
||||||
|
#define HSV_ORANGE 28, 255, 255
|
||||||
|
#define HSV_PINK 234, 128, 255
|
||||||
|
#define HSV_PURPLE 191, 255, 255
|
||||||
|
#define HSV_RED 0, 255, 255
|
||||||
|
#define HSV_SPRINGGREEN 106, 255, 255
|
||||||
|
#define HSV_TEAL 128, 255, 128
|
||||||
|
#define HSV_TURQUOISE 123, 90, 112
|
||||||
|
#define HSV_WHITE 0, 0, 255
|
||||||
|
#define HSV_YELLOW 43, 255, 255
|
||||||
|
#define HSV_OFF HSV_BLACK
|
||||||
|
|
||||||
|
// clang-format on
|
||||||
|
|
||||||
#if defined(__GNUC__)
|
#if defined(__GNUC__)
|
||||||
# define PACKED __attribute__((__packed__))
|
# define PACKED __attribute__((__packed__))
|
||||||
#else
|
#else
|
||||||
|
|
|
||||||
|
|
@ -15,49 +15,7 @@
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/* RGB COLORS */
|
#include "color.h"
|
||||||
#define RGB_WHITE 0xFF, 0xFF, 0xFF
|
|
||||||
#define RGB_RED 0xFF, 0x00, 0x00
|
|
||||||
#define RGB_CORAL 0xFF, 0x7C, 0x4D
|
|
||||||
#define RGB_ORANGE 0xFF, 0x80, 0x00
|
|
||||||
#define RGB_GOLDENROD 0xD9, 0xA5, 0x21
|
|
||||||
#define RGB_GOLD 0xFF, 0xD9, 0x00
|
|
||||||
#define RGB_YELLOW 0xFF, 0xFF, 0x00
|
|
||||||
#define RGB_CHARTREUSE 0x80, 0xFF, 0x00
|
|
||||||
#define RGB_GREEN 0x00, 0xFF, 0x00
|
|
||||||
#define RGB_SPRINGGREEN 0x00, 0xFF, 0x80
|
|
||||||
#define RGB_TURQUOISE 0x47, 0x6E, 0x6A
|
|
||||||
#define RGB_TEAL 0x00, 0x80, 0x80
|
|
||||||
#define RGB_CYAN 0x00, 0xFF, 0xFF
|
|
||||||
#define RGB_AZURE 0x99, 0xf5, 0xFF
|
|
||||||
#define RGB_BLUE 0x00, 0x00, 0xFF
|
|
||||||
#define RGB_PURPLE 0x7A, 0x00, 0xFF
|
|
||||||
#define RGB_MAGENTA 0xFF, 0x00, 0xFF
|
|
||||||
#define RGB_PINK 0xFF, 0x80, 0xBF
|
|
||||||
#define RGB_BLACK 0x00, 0x00, 0x00
|
|
||||||
#define RGB_OFF RGB_BLACK
|
|
||||||
|
|
||||||
/* HSV COLORS */
|
|
||||||
#define HSV_WHITE 0, 0, 255
|
|
||||||
#define HSV_RED 0, 255, 255
|
|
||||||
#define HSV_CORAL 11, 176, 255
|
|
||||||
#define HSV_ORANGE 28, 255, 255
|
|
||||||
#define HSV_GOLDENROD 30, 218, 218
|
|
||||||
#define HSV_GOLD 36, 255, 255
|
|
||||||
#define HSV_YELLOW 43, 255, 255
|
|
||||||
#define HSV_CHARTREUSE 64, 255, 255
|
|
||||||
#define HSV_GREEN 85, 255, 255
|
|
||||||
#define HSV_SPRINGGREEN 106, 255, 255
|
|
||||||
#define HSV_TURQUOISE 123, 90, 112
|
|
||||||
#define HSV_TEAL 128, 255, 128
|
|
||||||
#define HSV_CYAN 128, 255, 255
|
|
||||||
#define HSV_AZURE 132, 102, 255
|
|
||||||
#define HSV_BLUE 170, 255, 255
|
|
||||||
#define HSV_PURPLE 191, 255, 255
|
|
||||||
#define HSV_MAGENTA 213, 255, 255
|
|
||||||
#define HSV_PINK 234, 128, 255
|
|
||||||
#define HSV_BLACK 0, 0, 0
|
|
||||||
#define HSV_OFF HSV_BLACK
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
########################################################################################
|
########################################################################################
|
||||||
|
|
@ -66,7 +24,7 @@
|
||||||
## ##
|
## ##
|
||||||
## The functions below have been deprecated and may be removed in a future release. ##
|
## The functions below have been deprecated and may be removed in a future release. ##
|
||||||
## ##
|
## ##
|
||||||
## Please use the values above with the RGB functions. ##
|
## Please use the values in color.h with the RGB functions. ##
|
||||||
## ##
|
## ##
|
||||||
## ##
|
## ##
|
||||||
## ##
|
## ##
|
||||||
Loading…
Reference in a new issue