darkkirb/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Keyboard] Fix Planck/Rev6 compiler issue (#9953)

Browse source 
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.
This commit is contained in:
Drashna Jaelre 2020-08-15 05:18:13 -07:00 committed by GitHub
parent c02666c4cb
commit acc4bedddc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keyboards/planck/rev6/rev6.c
View file

@ -15,6 +15,7 @@
*/ */
#include "rev6.h" #include "rev6.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { { led_config_t g_led_config = { {
// Key Matrix to LED Index // Key Matrix to LED Index
{ NO_LED, 6, NO_LED, NO_LED, 5, NO_LED }, { 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, 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) { void matrix_init_kb(void) {
matrix_init_user(); matrix_init_user();

3
keyboards/planck/rev6/rules.mk
View file

@ -23,9 +23,8 @@ API_SYSEX_ENABLE = no
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE # 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 = 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 # SERIAL_LINK_ENABLE = yes
ENCODER_ENABLE = yes ENCODER_ENABLE = yes
DIP_SWITCH_ENABLE = yes DIP_SWITCH_ENABLE = yes