diff options
| author | Drashna Jaelre <drashna@live.com> | 2020-08-15 05:18:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-15 13:18:13 +0100 |
| commit | acc4bedddcb360d2d221d7ca7882baec446457f2 (patch) | |
| tree | 5e8b6f8f2b49487104a4408aecc47cc62f7b17c5 | |
| parent | c02666c4cbdae772698f2cb252a2a791225f81a9 (diff) | |
| download | qmk_firmware-acc4bedddcb360d2d221d7ca7882baec446457f2.tar.gz qmk_firmware-acc4bedddcb360d2d221d7ca7882baec446457f2.zip | |
[Keyboard] Fix Planck/Rev6 compiler issue (#9953)
Specifically, don't want to have both RGBLight and RGB Matrix (with WS2812) enabled at the same time. This will cause issues in usage, but apparently not when compiling. Additionally, the led matrix was not encapsulated with preprocessor code.
| -rw-r--r-- | keyboards/planck/rev6/rev6.c | 2 | ||||
| -rw-r--r-- | keyboards/planck/rev6/rules.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/keyboards/planck/rev6/rev6.c b/keyboards/planck/rev6/rev6.c index 6fe7772b5e..25c7351c7f 100644 --- a/keyboards/planck/rev6/rev6.c +++ b/keyboards/planck/rev6/rev6.c @@ -15,6 +15,7 @@ */ #include "rev6.h" +#ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { // Key Matrix to LED Index { NO_LED, 6, NO_LED, NO_LED, 5, NO_LED }, @@ -33,6 +34,7 @@ led_config_t g_led_config = { { LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL } }; +#endif void matrix_init_kb(void) { matrix_init_user(); diff --git a/keyboards/planck/rev6/rules.mk b/keyboards/planck/rev6/rules.mk index a1ff82b17e..4f3790d294 100644 --- a/keyboards/planck/rev6/rules.mk +++ b/keyboards/planck/rev6/rules.mk @@ -23,9 +23,8 @@ API_SYSEX_ENABLE = no # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -RGB_MATRIX_ENABLE = WS2812 +# RGB_MATRIX_ENABLE = WS2812 # SERIAL_LINK_ENABLE = yes ENCODER_ENABLE = yes DIP_SWITCH_ENABLE = yes |