diff options
| author | QMK Bot <hello@qmk.fm> | 2021-06-08 19:07:33 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-06-08 19:07:33 +0000 |
| commit | d9add95037b0c0f394c4ca9885f645f8523c90d6 (patch) | |
| tree | 4eaa3fd9b42390f06d2b634b140043a7d3968c34 /quantum | |
| parent | 17d0fad7626aafef02b57156723414cb4d180d18 (diff) | |
| parent | 9975e1771205beaa5b05d61c3c2c8e7afbcd3981 (diff) | |
| download | qmk_firmware-d9add95037b0c0f394c4ca9885f645f8523c90d6.tar.gz qmk_firmware-d9add95037b0c0f394c4ca9885f645f8523c90d6.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/led_matrix.c | 2 | ||||
| -rw-r--r-- | quantum/rgb_matrix.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/quantum/led_matrix.c b/quantum/led_matrix.c index d612fbfa9..7e0fdf896 100644 --- a/quantum/led_matrix.c +++ b/quantum/led_matrix.c | |||
| @@ -67,7 +67,7 @@ const led_point_t k_led_matrix_center = LED_MATRIX_CENTER; | |||
| 67 | # define LED_DISABLE_TIMEOUT 0 | 67 | # define LED_DISABLE_TIMEOUT 0 |
| 68 | #endif | 68 | #endif |
| 69 | 69 | ||
| 70 | #if LED_DISABLE_WHEN_USB_SUSPENDED == false | 70 | #if LED_DISABLE_WHEN_USB_SUSPENDED != 1 |
| 71 | # undef LED_DISABLE_WHEN_USB_SUSPENDED | 71 | # undef LED_DISABLE_WHEN_USB_SUSPENDED |
| 72 | #endif | 72 | #endif |
| 73 | 73 | ||
diff --git a/quantum/rgb_matrix.c b/quantum/rgb_matrix.c index e716c6aad..ab8dbd849 100644 --- a/quantum/rgb_matrix.c +++ b/quantum/rgb_matrix.c | |||
| @@ -67,7 +67,7 @@ __attribute__((weak)) RGB rgb_matrix_hsv_to_rgb(HSV hsv) { return hsv_to_rgb(hsv | |||
| 67 | # define RGB_DISABLE_TIMEOUT 0 | 67 | # define RGB_DISABLE_TIMEOUT 0 |
| 68 | #endif | 68 | #endif |
| 69 | 69 | ||
| 70 | #if RGB_DISABLE_WHEN_USB_SUSPENDED == false | 70 | #if RGB_DISABLE_WHEN_USB_SUSPENDED != 1 |
| 71 | # undef RGB_DISABLE_WHEN_USB_SUSPENDED | 71 | # undef RGB_DISABLE_WHEN_USB_SUSPENDED |
| 72 | #endif | 72 | #endif |
| 73 | 73 | ||