diff options
| author | QMK Bot <hello@qmk.fm> | 2021-04-03 06:20:42 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-04-03 06:20:42 +0000 |
| commit | 1444ebb7f1776db99a26bccd4ebcd230837877c3 (patch) | |
| tree | 61426585d379cdae7f51a3c3437dfba6346a08f9 | |
| parent | 028a0dcd3d166effd82d16dd93d361cdfd9b1ee5 (diff) | |
| parent | 59c8672f5c09ae078162beb836032482c79c4b93 (diff) | |
| download | qmk_firmware-1444ebb7f1776db99a26bccd4ebcd230837877c3.tar.gz qmk_firmware-1444ebb7f1776db99a26bccd4ebcd230837877c3.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/kingly_keys/ave/config.h | 6 | ||||
| -rw-r--r-- | keyboards/kingly_keys/ave/ortho/keymaps/default/config.h | 12 | ||||
| -rw-r--r-- | keyboards/kingly_keys/ave/staggered/keymaps/default/config.h | 12 |
3 files changed, 6 insertions, 24 deletions
diff --git a/keyboards/kingly_keys/ave/config.h b/keyboards/kingly_keys/ave/config.h index 06fda4c26..8a663da35 100644 --- a/keyboards/kingly_keys/ave/config.h +++ b/keyboards/kingly_keys/ave/config.h | |||
| @@ -41,6 +41,12 @@ | |||
| 41 | /* COL2ROW or ROW2COL */ | 41 | /* COL2ROW or ROW2COL */ |
| 42 | #define DIODE_DIRECTION COL2ROW | 42 | #define DIODE_DIRECTION COL2ROW |
| 43 | 43 | ||
| 44 | #define RGB_DI_PIN B7 | ||
| 45 | #if defined(RGBLIGHT_ENABLE) | ||
| 46 | # define RGBLED_NUM 2 | ||
| 47 | # define RGBLIGHT_EFFECT_BREATHING | ||
| 48 | #endif | ||
| 49 | |||
| 44 | /* Set 0 if debouncing isn't needed */ | 50 | /* Set 0 if debouncing isn't needed */ |
| 45 | #define DEBOUNCE 5 | 51 | #define DEBOUNCE 5 |
| 46 | 52 | ||
diff --git a/keyboards/kingly_keys/ave/ortho/keymaps/default/config.h b/keyboards/kingly_keys/ave/ortho/keymaps/default/config.h index 6fba9d2b9..204d3236e 100644 --- a/keyboards/kingly_keys/ave/ortho/keymaps/default/config.h +++ b/keyboards/kingly_keys/ave/ortho/keymaps/default/config.h | |||
| @@ -18,15 +18,3 @@ | |||
| 18 | #pragma once | 18 | #pragma once |
| 19 | 19 | ||
| 20 | #define TAPPING_TERM_PER_KEY | 20 | #define TAPPING_TERM_PER_KEY |
| 21 | |||
| 22 | #ifdef RGBLIGHT_ENABLE | ||
| 23 | /* ws2812 RGB LED */ | ||
| 24 | #define RGB_DI_PIN B7 | ||
| 25 | #define RGBLED_NUM 2 // Number of LEDs | ||
| 26 | |||
| 27 | #define RGBLIGHT_EFFECT_BREATHING | ||
| 28 | /* #define RGBLIGHT_HUE_STEP 6 | ||
| 29 | * #define RGBLIGHT_SAT_STEP 4 | ||
| 30 | * #define RGBLIGHT_VAL_STEP 4 | ||
| 31 | */ | ||
| 32 | #endif | ||
diff --git a/keyboards/kingly_keys/ave/staggered/keymaps/default/config.h b/keyboards/kingly_keys/ave/staggered/keymaps/default/config.h index 6fba9d2b9..204d3236e 100644 --- a/keyboards/kingly_keys/ave/staggered/keymaps/default/config.h +++ b/keyboards/kingly_keys/ave/staggered/keymaps/default/config.h | |||
| @@ -18,15 +18,3 @@ | |||
| 18 | #pragma once | 18 | #pragma once |
| 19 | 19 | ||
| 20 | #define TAPPING_TERM_PER_KEY | 20 | #define TAPPING_TERM_PER_KEY |
| 21 | |||
| 22 | #ifdef RGBLIGHT_ENABLE | ||
| 23 | /* ws2812 RGB LED */ | ||
| 24 | #define RGB_DI_PIN B7 | ||
| 25 | #define RGBLED_NUM 2 // Number of LEDs | ||
| 26 | |||
| 27 | #define RGBLIGHT_EFFECT_BREATHING | ||
| 28 | /* #define RGBLIGHT_HUE_STEP 6 | ||
| 29 | * #define RGBLIGHT_SAT_STEP 4 | ||
| 30 | * #define RGBLIGHT_VAL_STEP 4 | ||
| 31 | */ | ||
| 32 | #endif | ||