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

This commit is contained in:
QMK Bot 2021-02-13 00:59:41 +00:00
commit 5e3cd884eb
2 changed files with 14 additions and 2 deletions

View File

@ -43,6 +43,15 @@
/* Underglow + top RGB configuration */ /* Underglow + top RGB configuration */
#define RGB_DI_PIN D4 #define RGB_DI_PIN D4
#define RGBLIGHT_ANIMATIONS
#if !defined(RGBLED_NUM)
/* RGB LED count
* No external LED PCB: 10
* External LED PCB: 14
*/
# define RGBLED_NUM 14
#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
//#define LOCKING_SUPPORT_ENABLE //#define LOCKING_SUPPORT_ENABLE

View File

@ -20,5 +20,8 @@
* No external LED PCB: 10 * No external LED PCB: 10
* External LED PCB: 14 * External LED PCB: 14
*/ */
#define RGBLED_NUM 10 #if defined(RGBLED_NUM)
# undef RGBLED_NUM
# define RGBLED_NUM 10
#endif
#define RGBLIGHT_ANIMATIONS #define RGBLIGHT_ANIMATIONS