~ruther/qmk_firmware

6df5fce0732df5cf15f7c388040e6dadbaa476b0 — QMK Bot 3 years ago 5141d6e + 5c79727
Merge remote-tracking branch 'origin/master' into develop
2 files changed, 1 insertions(+), 5 deletions(-)

M keyboards/crkbd/keymaps/jpe230/config.h
M keyboards/crkbd/keymaps/jpe230/keymap.c
M keyboards/crkbd/keymaps/jpe230/config.h => keyboards/crkbd/keymaps/jpe230/config.h +0 -4
@@ 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

M keyboards/crkbd/keymaps/jpe230/keymap.c => keyboards/crkbd/keymaps/jpe230/keymap.c +1 -1
@@ 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
                }