~ruther/qmk_firmware

d9add95037b0c0f394c4ca9885f645f8523c90d6 — QMK Bot 4 years ago 17d0fad + 9975e17
Merge remote-tracking branch 'origin/master' into develop
2 files changed, 2 insertions(+), 2 deletions(-)

M quantum/led_matrix.c
M quantum/rgb_matrix.c
M quantum/led_matrix.c => quantum/led_matrix.c +1 -1
@@ 67,7 67,7 @@ const led_point_t k_led_matrix_center = LED_MATRIX_CENTER;
#    define LED_DISABLE_TIMEOUT 0
#endif

#if LED_DISABLE_WHEN_USB_SUSPENDED == false
#if LED_DISABLE_WHEN_USB_SUSPENDED != 1
#    undef LED_DISABLE_WHEN_USB_SUSPENDED
#endif


M quantum/rgb_matrix.c => quantum/rgb_matrix.c +1 -1
@@ 67,7 67,7 @@ __attribute__((weak)) RGB rgb_matrix_hsv_to_rgb(HSV hsv) { return hsv_to_rgb(hsv
#    define RGB_DISABLE_TIMEOUT 0
#endif

#if RGB_DISABLE_WHEN_USB_SUSPENDED == false
#if RGB_DISABLE_WHEN_USB_SUSPENDED != 1
#    undef RGB_DISABLE_WHEN_USB_SUSPENDED
#endif