Merge remote-tracking branch 'origin/master' into develop
commit
6f75226460
|
@ -14,7 +14,6 @@
|
||||||
/* Change the USB polling rate [default = 1000Hz (1ms)] and
|
/* Change the USB polling rate [default = 1000Hz (1ms)] and
|
||||||
* use larger value of keys per scan for elite games */
|
* use larger value of keys per scan for elite games */
|
||||||
#define USB_POLLING_INTERVAL_MS 2 // 500Hz
|
#define USB_POLLING_INTERVAL_MS 2 // 500Hz
|
||||||
#define QMK_KEYS_PER_SCAN 12
|
|
||||||
|
|
||||||
/* LED Matrix & Animations */
|
/* LED Matrix & Animations */
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
|
|
|
@ -45,11 +45,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
#define RGB_DI_PIN F0
|
#define RGB_DI_PIN F0
|
||||||
#ifdef RGB_DI_PIN
|
#ifdef RGB_DI_PIN
|
||||||
#define RGBLIGHT_ANIMATIONS
|
// RGBLIGHT_ANIMATIONS
|
||||||
#define RGBLED_NUM 16
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
#define RGBLIGHT_HUE_STEP 8
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
#define RGBLIGHT_SAT_STEP 8
|
#define RGBLIGHT_EFFECT_CHRISTMAS
|
||||||
#define RGBLIGHT_VAL_STEP 8
|
#define RGBLIGHT_EFFECT_KNIGHT
|
||||||
|
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
||||||
|
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
||||||
|
#define RGBLIGHT_EFFECT_RGB_TEST
|
||||||
|
#define RGBLIGHT_EFFECT_SNAKE
|
||||||
|
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
||||||
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
|
|
||||||
|
#define RGBLED_NUM 16
|
||||||
|
#define RGBLIGHT_HUE_STEP 8
|
||||||
|
#define RGBLIGHT_SAT_STEP 8
|
||||||
|
#define RGBLIGHT_VAL_STEP 8
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
|
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
|
||||||
|
|
|
@ -70,18 +70,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define RGBLIGHT_VAL_STEP 8
|
#define RGBLIGHT_VAL_STEP 8
|
||||||
#define RGBLIGHT_LIMIT_VAL 180 /* The maximum brightness level */
|
#define RGBLIGHT_LIMIT_VAL 180 /* The maximum brightness level */
|
||||||
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
|
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
|
||||||
/*== all animations enable ==*/
|
|
||||||
#define RGBLIGHT_ANIMATIONS
|
// RGBLIGHT_ANIMATIONS
|
||||||
/*== or choose animations ==*/
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
// #define RGBLIGHT_EFFECT_BREATHING
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
// #define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
#define RGBLIGHT_EFFECT_CHRISTMAS
|
||||||
// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
#define RGBLIGHT_EFFECT_KNIGHT
|
||||||
// #define RGBLIGHT_EFFECT_SNAKE
|
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
||||||
// #define RGBLIGHT_EFFECT_KNIGHT
|
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
||||||
// #define RGBLIGHT_EFFECT_CHRISTMAS
|
#define RGBLIGHT_EFFECT_RGB_TEST
|
||||||
// #define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
#define RGBLIGHT_EFFECT_SNAKE
|
||||||
// #define RGBLIGHT_EFFECT_RGB_TEST
|
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
||||||
// #define RGBLIGHT_EFFECT_ALTERNATING
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Bootmagic Lite key configuration: use the Esc key */
|
/* Bootmagic Lite key configuration: use the Esc key */
|
||||||
|
|
|
@ -50,9 +50,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
#define RGB_DI_PIN E2
|
#define RGB_DI_PIN E2
|
||||||
#ifdef RGB_DI_PIN
|
#ifdef RGB_DI_PIN
|
||||||
#define RGBLIGHT_ANIMATIONS
|
// RGBLIGHT_ANIMATIONS
|
||||||
#define RGBLED_NUM 22 /* 16 Bottom 6 top*/
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
#define RGBLIGHT_HUE_STEP 8
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
#define RGBLIGHT_SAT_STEP 8
|
#define RGBLIGHT_EFFECT_CHRISTMAS
|
||||||
#define RGBLIGHT_VAL_STEP 8
|
#define RGBLIGHT_EFFECT_KNIGHT
|
||||||
|
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
||||||
|
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
||||||
|
#define RGBLIGHT_EFFECT_RGB_TEST
|
||||||
|
#define RGBLIGHT_EFFECT_SNAKE
|
||||||
|
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
||||||
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
|
|
||||||
|
#define RGBLED_NUM 22 /* 16 Bottom 6 top*/
|
||||||
|
#define RGBLIGHT_HUE_STEP 8
|
||||||
|
#define RGBLIGHT_SAT_STEP 8
|
||||||
|
#define RGBLIGHT_VAL_STEP 8
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -44,13 +44,22 @@
|
||||||
/* Locking resynchronize hack */
|
/* Locking resynchronize hack */
|
||||||
#define LOCKING_RESYNC_ENABLE
|
#define LOCKING_RESYNC_ENABLE
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define RGB_DI_PIN B1
|
#define RGB_DI_PIN B1
|
||||||
#ifdef RGB_DI_PIN
|
#ifdef RGB_DI_PIN
|
||||||
#define RGBLIGHT_ANIMATIONS
|
// RGBLIGHT_ANIMATIONS
|
||||||
#define RGBLED_NUM 4
|
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||||
#define RGBLIGHT_HUE_STEP 8
|
#define RGBLIGHT_EFFECT_BREATHING
|
||||||
#define RGBLIGHT_SAT_STEP 8
|
#define RGBLIGHT_EFFECT_CHRISTMAS
|
||||||
#define RGBLIGHT_VAL_STEP 8
|
#define RGBLIGHT_EFFECT_KNIGHT
|
||||||
|
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
||||||
|
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
||||||
|
#define RGBLIGHT_EFFECT_RGB_TEST
|
||||||
|
#define RGBLIGHT_EFFECT_SNAKE
|
||||||
|
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
||||||
|
#define RGBLIGHT_EFFECT_TWINKLE
|
||||||
|
|
||||||
|
#define RGBLED_NUM 4
|
||||||
|
#define RGBLIGHT_HUE_STEP 8
|
||||||
|
#define RGBLIGHT_SAT_STEP 8
|
||||||
|
#define RGBLIGHT_VAL_STEP 8
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
#define DRIVER_LED_TOTAL 27 // -4 disabled underglow LEDs
|
#define DRIVER_LED_TOTAL 27 // -4 disabled underglow LEDs
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// #define RGBLIGHT_ANIMATIONS // don't use, please explicitly define
|
|
||||||
// #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // don't use, too few key to make it look good
|
// #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // don't use, too few key to make it look good
|
||||||
#define RGB_MATRIX_KEYPRESSES
|
#define RGB_MATRIX_KEYPRESSES
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue