summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-06-07 18:33:49 +0000
committerQMK Bot <hello@qmk.fm>2022-06-07 18:33:49 +0000
commit6df5fce0732df5cf15f7c388040e6dadbaa476b0 (patch)
tree7b2f21ac857f9600c2825c576092f62c892a1bfb
parent5141d6eeb180ba00973174154d52a4e4d0fae113 (diff)
parent5c7972760c437a994fca813944ed67ea3c2ee6f9 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/crkbd/keymaps/jpe230/config.h4
-rw-r--r--keyboards/crkbd/keymaps/jpe230/keymap.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/keyboards/crkbd/keymaps/jpe230/config.h b/keyboards/crkbd/keymaps/jpe230/config.h
index 2887b5014c..d8185d4253 100644
--- a/keyboards/crkbd/keymaps/jpe230/config.h
+++ b/keyboards/crkbd/keymaps/jpe230/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_KEYPRESSES
# define RGB_DISABLE_WHEN_USB_SUSPENDED
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
# 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_CYCLE_OUT_IN_DUAL
# 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
diff --git a/keyboards/crkbd/keymaps/jpe230/keymap.c b/keyboards/crkbd/keymaps/jpe230/keymap.c
index 6e812c0e61..c5ec473fed 100644
--- a/keyboards/crkbd/keymaps/jpe230/keymap.c
+++ b/keyboards/crkbd/keymaps/jpe230/keymap.c
@@ -405,7 +405,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef RGB_MATRIX_ENABLE
prev_hsv = rgb_matrix_get_hsv();
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);
#endif
}