diff options
| author | skullY <skullydazed@gmail.com> | 2019-01-26 12:39:55 -0800 |
|---|---|---|
| committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-02-10 15:37:12 -0800 |
| commit | 159191a8747891920aea7de2324507daa8a661fb (patch) | |
| tree | c524858afead498e495cee35646b128f0ef5f2d2 /quantum/rgb_matrix.h | |
| parent | fd698c43d78ebbc42c1eb2bec74078b791616ad1 (diff) | |
| download | qmk_firmware-159191a8747891920aea7de2324507daa8a661fb.tar.gz qmk_firmware-159191a8747891920aea7de2324507daa8a661fb.zip | |
revert accidental rgb_matrix.h changes
Diffstat (limited to 'quantum/rgb_matrix.h')
| -rw-r--r-- | quantum/rgb_matrix.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/quantum/rgb_matrix.h b/quantum/rgb_matrix.h index b64ddec07..e43532d11 100644 --- a/quantum/rgb_matrix.h +++ b/quantum/rgb_matrix.h | |||
| @@ -50,17 +50,25 @@ typedef struct rgb_led { | |||
| 50 | 50 | ||
| 51 | extern const rgb_led g_rgb_leds[DRIVER_LED_TOTAL]; | 51 | extern const rgb_led g_rgb_leds[DRIVER_LED_TOTAL]; |
| 52 | 52 | ||
| 53 | typedef struct | ||
| 54 | { | ||
| 55 | HSV color; | ||
| 56 | uint8_t index; | ||
| 57 | } rgb_indicator; | ||
| 58 | |||
| 53 | typedef union { | 59 | typedef union { |
| 54 | uint32_t raw; | 60 | uint32_t raw; |
| 55 | struct { | 61 | struct { |
| 56 | bool enable :1; | 62 | bool enable :1; |
| 57 | uint8_t mode :6; | 63 | uint8_t mode :6; |
| 64 | uint16_t hue :9; | ||
| 65 | uint8_t sat :8; | ||
| 58 | uint8_t val :8; | 66 | uint8_t val :8; |
| 59 | uint8_t speed :8;//EECONFIG needs to be increased to support this | 67 | uint8_t speed :8;//EECONFIG needs to be increased to support this |
| 60 | }; | 68 | }; |
| 61 | } led_config_t; | 69 | } rgb_config_t; |
| 62 | 70 | ||
| 63 | enum _matrix_effects { | 71 | enum rgb_matrix_effects { |
| 64 | RGB_MATRIX_SOLID_COLOR = 1, | 72 | RGB_MATRIX_SOLID_COLOR = 1, |
| 65 | #ifndef DISABLE_RGB_MATRIX_ALPHAS_MODS | 73 | #ifndef DISABLE_RGB_MATRIX_ALPHAS_MODS |
| 66 | RGB_MATRIX_ALPHAS_MODS, | 74 | RGB_MATRIX_ALPHAS_MODS, |
