mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-11-22 11:29:26 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
6df5fce073
@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
# define RGB_MATRIX_KEYPRESSES
|
|
||||||
# define RGB_DISABLE_WHEN_USB_SUSPENDED
|
# define RGB_DISABLE_WHEN_USB_SUSPENDED
|
||||||
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
|
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
|
||||||
# define RGB_MATRIX_STARTUP_HUE 215
|
# define RGB_MATRIX_STARTUP_HUE 215
|
||||||
@ -38,7 +37,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||||||
# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
|
# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
|
||||||
# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
|
# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
|
||||||
# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
|
# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
|
||||||
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
|
|
||||||
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
|
|
||||||
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -405,7 +405,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
prev_hsv = rgb_matrix_get_hsv();
|
prev_hsv = rgb_matrix_get_hsv();
|
||||||
prev_mode = rgb_matrix_get_mode();
|
prev_mode = rgb_matrix_get_mode();
|
||||||
rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_MULTISPLASH);
|
rgb_matrix_mode_noeeprom(RGB_MATRIX_ALPHAS_MODS);
|
||||||
rgb_matrix_sethsv_noeeprom(HSV_YELLOW);
|
rgb_matrix_sethsv_noeeprom(HSV_YELLOW);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user