qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-10-19 15:40:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot
2023-09-21 05:50:37 +00:00
parent 9cb0ad1aa1 f8cea06be3
commit 9d9af8d353
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quantum/rgb_matrix/rgb_matrix_drivers.c
+1 -1
View File
@@ -440,7 +440,7 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
};
#elif defined(RGB_MATRIX_WS2812)
# if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_CUSTOM_DRIVER)
# if defined(RGBLIGHT_WS2812)
# pragma message "Cannot use RGBLIGHT and RGB Matrix using WS2812 at the same time."
# pragma message "You need to use a custom driver, or re-implement the WS2812 driver to use a different configuration."
# endif