Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
1444ebb7f1
3 changed files with 6 additions and 24 deletions
|
@ -41,6 +41,12 @@
|
||||||
/* COL2ROW or ROW2COL */
|
/* COL2ROW or ROW2COL */
|
||||||
#define DIODE_DIRECTION COL2ROW
|
#define DIODE_DIRECTION COL2ROW
|
||||||
|
|
||||||
|
#define RGB_DI_PIN B7
|
||||||
|
#if defined(RGBLIGHT_ENABLE)
|
||||||
|
# define RGBLED_NUM 2
|
||||||
|
# define RGBLIGHT_EFFECT_BREATHING
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Set 0 if debouncing isn't needed */
|
/* Set 0 if debouncing isn't needed */
|
||||||
#define DEBOUNCE 5
|
#define DEBOUNCE 5
|
||||||
|
|
||||||
|
|
|
@ -18,15 +18,3 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define TAPPING_TERM_PER_KEY
|
#define TAPPING_TERM_PER_KEY
|
||||||
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
|
||||||
/* ws2812 RGB LED */
|
|
||||||
#define RGB_DI_PIN B7
|
|
||||||
#define RGBLED_NUM 2 // Number of LEDs
|
|
||||||
|
|
||||||
#define RGBLIGHT_EFFECT_BREATHING
|
|
||||||
/* #define RGBLIGHT_HUE_STEP 6
|
|
||||||
* #define RGBLIGHT_SAT_STEP 4
|
|
||||||
* #define RGBLIGHT_VAL_STEP 4
|
|
||||||
*/
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -18,15 +18,3 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define TAPPING_TERM_PER_KEY
|
#define TAPPING_TERM_PER_KEY
|
||||||
|
|
||||||
#ifdef RGBLIGHT_ENABLE
|
|
||||||
/* ws2812 RGB LED */
|
|
||||||
#define RGB_DI_PIN B7
|
|
||||||
#define RGBLED_NUM 2 // Number of LEDs
|
|
||||||
|
|
||||||
#define RGBLIGHT_EFFECT_BREATHING
|
|
||||||
/* #define RGBLIGHT_HUE_STEP 6
|
|
||||||
* #define RGBLIGHT_SAT_STEP 4
|
|
||||||
* #define RGBLIGHT_VAL_STEP 4
|
|
||||||
*/
|
|
||||||
#endif
|
|
||||||
|
|
Loading…
Reference in a new issue