~ruther/qmk_firmware

c8cff1489a82bb61266ce32750895c6935b256a3 — QMK Bot 4 years ago c4f910b
format code according to conventions [skip ci]
2 files changed, 13 insertions(+), 13 deletions(-)

M quantum/process_keycode/process_rgb.c
M quantum/rgb_matrix_drivers.c
M quantum/process_keycode/process_rgb.c => quantum/process_keycode/process_rgb.c +7 -7
@@ 167,7 167,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) {
#endif
                return false;
            case RGB_MODE_RAINBOW:
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined( RGBLIGHT_EFFECT_RAINBOW_MOOD)
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined(RGBLIGHT_EFFECT_RAINBOW_MOOD)
                handleKeycodeRGBMode(RGBLIGHT_MODE_RAINBOW_MOOD, RGBLIGHT_MODE_RAINBOW_MOOD_end);
#endif
#if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES) && !defined(DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT)


@@ 175,7 175,7 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) {
#endif
                return false;
            case RGB_MODE_SWIRL:
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined( RGBLIGHT_EFFECT_RAINBOW_SWIRL)
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined(RGBLIGHT_EFFECT_RAINBOW_SWIRL)
                handleKeycodeRGBMode(RGBLIGHT_MODE_RAINBOW_SWIRL, RGBLIGHT_MODE_RAINBOW_SWIRL_end);
#endif
#if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES) && !defined(DISABLE_RGB_MATRIX_CYCLE_PINWHEEL)


@@ 183,27 183,27 @@ bool process_rgb(const uint16_t keycode, const keyrecord_t *record) {
#endif
                return false;
            case RGB_MODE_SNAKE:
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined( RGBLIGHT_EFFECT_SNAKE)
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined(RGBLIGHT_EFFECT_SNAKE)
                handleKeycodeRGBMode(RGBLIGHT_MODE_SNAKE, RGBLIGHT_MODE_SNAKE_end);
#endif
                return false;
            case RGB_MODE_KNIGHT:
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined( RGBLIGHT_EFFECT_KNIGHT)
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined(RGBLIGHT_EFFECT_KNIGHT)
                handleKeycodeRGBMode(RGBLIGHT_MODE_KNIGHT, RGBLIGHT_MODE_KNIGHT_end);
#endif
                return false;
            case RGB_MODE_XMAS:
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined( RGBLIGHT_EFFECT_CHRISTMAS)
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined(RGBLIGHT_EFFECT_CHRISTMAS)
                rgblight_mode(RGBLIGHT_MODE_CHRISTMAS);
#endif
                return false;
            case RGB_MODE_GRADIENT:
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined( RGBLIGHT_EFFECT_STATIC_GRADIENT)
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined(RGBLIGHT_EFFECT_STATIC_GRADIENT)
                handleKeycodeRGBMode(RGBLIGHT_MODE_STATIC_GRADIENT, RGBLIGHT_MODE_STATIC_GRADIENT_end);
#endif
                return false;
            case RGB_MODE_RGBTEST:
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined( RGBLIGHT_EFFECT_RGB_TEST)
#if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES) && defined(RGBLIGHT_EFFECT_RGB_TEST)
                rgblight_mode(RGBLIGHT_MODE_RGB_TEST);
#endif
                return false;

M quantum/rgb_matrix_drivers.c => quantum/rgb_matrix_drivers.c +6 -6
@@ 31,9 31,9 @@ static void init(void) {
    i2c_init();
#    ifdef IS31FL3731
    IS31FL3731_init(DRIVER_ADDR_1);
#      ifdef DRIVER_ADDR_2
#        ifdef DRIVER_ADDR_2
    IS31FL3731_init(DRIVER_ADDR_2);
#      endif
#        endif
#    elif defined(IS31FL3733)
    IS31FL3733_init(DRIVER_ADDR_1, 0);
#    elif defined(IS31FL3737)


@@ 57,9 57,9 @@ static void init(void) {
    // This actually updates the LED drivers
#    ifdef IS31FL3731
    IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
#      ifdef DRIVER_ADDR_2
#        ifdef DRIVER_ADDR_2
    IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1);
#      endif
#        endif
#    elif defined(IS31FL3733)
    IS31FL3733_update_led_control_registers(DRIVER_ADDR_1, 0);
    IS31FL3733_update_led_control_registers(DRIVER_ADDR_2, 1);


@@ 73,9 73,9 @@ static void init(void) {
#    ifdef IS31FL3731
static void flush(void) {
    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
#      ifdef DRIVER_ADDR_2
#        ifdef DRIVER_ADDR_2
    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
#      endif
#        endif
}

const rgb_matrix_driver_t rgb_matrix_driver = {