diff options
author | Erez Zukerman <bulk@ezuk.org> | 2018-05-15 10:50:24 -0400 |
---|---|---|
committer | Erez Zukerman <bulk@ezuk.org> | 2018-05-15 10:50:24 -0400 |
commit | 5272218ac9cff7ce5af8cfda9129dc03b7aafa49 (patch) | |
tree | 61ad3987770684afd55cbdd12bca48a221d83713 /quantum/rgb_matrix.h | |
parent | 0592d23b74142a554c9e36d2da7bf525fbe3a4c0 (diff) | |
parent | e41147da929afd15c1088226893cc02537650284 (diff) |
Merge branch 'master' into hf/shinydox
Diffstat (limited to 'quantum/rgb_matrix.h')
-rw-r--r-- | quantum/rgb_matrix.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/quantum/rgb_matrix.h b/quantum/rgb_matrix.h index 1552d59103..aaa85d5f51 100644 --- a/quantum/rgb_matrix.h +++ b/quantum/rgb_matrix.h @@ -64,7 +64,6 @@ typedef union { enum rgb_matrix_effects { RGB_MATRIX_SOLID_COLOR = 1, - RGB_MATRIX_SOLID_REACTIVE, RGB_MATRIX_ALPHAS_MODS, RGB_MATRIX_DUAL_BEACON, RGB_MATRIX_GRADIENT_UP_DOWN, @@ -77,6 +76,7 @@ enum rgb_matrix_effects { RGB_MATRIX_RAINBOW_MOVING_CHEVRON, RGB_MATRIX_JELLYBEAN_RAINDROPS, #ifdef RGB_MATRIX_KEYPRESSES + RGB_MATRIX_SOLID_REACTIVE, RGB_MATRIX_SPLASH, RGB_MATRIX_MULTISPLASH, RGB_MATRIX_SOLID_SPLASH, |