diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-08-29 21:24:43 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-08-29 21:24:43 +1000 |
| commit | 31a91add168c956655ace8ec4cf9750db1e2cfc6 (patch) | |
| tree | 12cea9b5f8e769f9611a31cbaede9537edad71cc /keyboards/cannonkeys/devastatingtkl | |
| parent | f07490bc092e365ba03dc685b3fc30ad0bf0b752 (diff) | |
| parent | edaf8a87ef3164f8986b0a8eb171d4879b45414c (diff) | |
Merge branch 'develop'
Diffstat (limited to 'keyboards/cannonkeys/devastatingtkl')
| -rw-r--r-- | keyboards/cannonkeys/devastatingtkl/config.h | 11 | ||||
| -rw-r--r-- | keyboards/cannonkeys/devastatingtkl/info.json | 15 | ||||
| -rw-r--r-- | keyboards/cannonkeys/devastatingtkl/rules.mk | 2 |
3 files changed, 15 insertions, 13 deletions
diff --git a/keyboards/cannonkeys/devastatingtkl/config.h b/keyboards/cannonkeys/devastatingtkl/config.h index 947648f59e..bea77ceac2 100644 --- a/keyboards/cannonkeys/devastatingtkl/config.h +++ b/keyboards/cannonkeys/devastatingtkl/config.h @@ -26,17 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 20 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/info.json index 13a1a2ef48..a3b269f1cf 100644 --- a/keyboards/cannonkeys/devastatingtkl/info.json +++ b/keyboards/cannonkeys/devastatingtkl/info.json @@ -18,6 +18,21 @@ "levels": 6, "breathing": true }, + "rgblight": { + "led_count": 20, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, "ws2812": { "pin": "B15", "driver": "spi" diff --git a/keyboards/cannonkeys/devastatingtkl/rules.mk b/keyboards/cannonkeys/devastatingtkl/rules.mk index b7ab91a339..8d3de1b8b2 100644 --- a/keyboards/cannonkeys/devastatingtkl/rules.mk +++ b/keyboards/cannonkeys/devastatingtkl/rules.mk @@ -13,5 +13,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes RGBLIGHT_ENABLE = yes -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE |