From c9cf9712aaefc2356305cbc731d06f1b1948d8c1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 6 Jun 2023 11:08:04 +1000 Subject: Move `RGBLED_SPLIT` to data driven (#21113) Co-authored-by: Joel Challis --- keyboards/keycapsss/kimiko/rev1/config.h | 1 - keyboards/keycapsss/kimiko/rev1/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/keycapsss') diff --git a/keyboards/keycapsss/kimiko/rev1/config.h b/keyboards/keycapsss/kimiko/rev1/config.h index 27049500bc..60d11111ac 100644 --- a/keyboards/keycapsss/kimiko/rev1/config.h +++ b/keyboards/keycapsss/kimiko/rev1/config.h @@ -18,7 +18,6 @@ #ifdef RGBLIGHT_ENABLE # define RGBLED_NUM 60 // Total number of LEDs -# define RGBLED_SPLIT { 30, 30 } // LEDs per side # define RGBLIGHT_SPLIT #endif diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/info.json index 56028f3f81..c9af182427 100644 --- a/keyboards/keycapsss/kimiko/rev1/info.json +++ b/keyboards/keycapsss/kimiko/rev1/info.json @@ -21,6 +21,9 @@ "split": { "soft_serial_pin": "D2" }, + "rgblight": { + "split_count": [30, 30] + }, "ws2812": { "pin": "D3" }, -- cgit v1.2.3 From e8ca83a353cae7a6faaf65d95ceb1f64278f27f4 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 15 Jun 2023 22:27:26 +1000 Subject: Move `RGBLIGHT_SPLIT` to data driven (#21190) * Move `RGBLIGHT_SPLIT` to data driven * Remove where `split_count` is already set --- keyboards/keycapsss/kimiko/rev1/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/keycapsss') diff --git a/keyboards/keycapsss/kimiko/rev1/config.h b/keyboards/keycapsss/kimiko/rev1/config.h index 60d11111ac..2ddcf1a143 100644 --- a/keyboards/keycapsss/kimiko/rev1/config.h +++ b/keyboards/keycapsss/kimiko/rev1/config.h @@ -18,7 +18,6 @@ #ifdef RGBLIGHT_ENABLE # define RGBLED_NUM 60 // Total number of LEDs -# define RGBLIGHT_SPLIT #endif // Limit the power draw -- cgit v1.2.3 From 2367d8129c92474eb0da66ebc5ace893097cf574 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 16 Jun 2023 14:04:45 +1000 Subject: Move `RGBLIGHT_SLEEP` to data driven (#21072) --- keyboards/keycapsss/o4l_5x12/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/keycapsss') diff --git a/keyboards/keycapsss/o4l_5x12/config.h b/keyboards/keycapsss/o4l_5x12/config.h index 804dabbf6d..47d71ba911 100644 --- a/keyboards/keycapsss/o4l_5x12/config.h +++ b/keyboards/keycapsss/o4l_5x12/config.h @@ -4,7 +4,6 @@ # define RGBLIGHT_HUE_STEP 4 # define RGBLIGHT_SAT_STEP 4 # define RGBLIGHT_VAL_STEP 4 -//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL -- cgit v1.2.3 From b1783db4eacacaf8181cfbce13146db1941486ba Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 18 Jun 2023 14:39:07 +1000 Subject: Move `RGBLED_NUM` to data driven (#21278) --- keyboards/keycapsss/kimiko/rev1/config.h | 4 ---- keyboards/keycapsss/kimiko/rev1/info.json | 1 + keyboards/keycapsss/o4l_5x12/config.h | 1 - keyboards/keycapsss/o4l_5x12/info.json | 3 +++ 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'keyboards/keycapsss') diff --git a/keyboards/keycapsss/kimiko/rev1/config.h b/keyboards/keycapsss/kimiko/rev1/config.h index 2ddcf1a143..8e44b27ace 100644 --- a/keyboards/keycapsss/kimiko/rev1/config.h +++ b/keyboards/keycapsss/kimiko/rev1/config.h @@ -16,10 +16,6 @@ #pragma once -#ifdef RGBLIGHT_ENABLE -# define RGBLED_NUM 60 // Total number of LEDs -#endif - // Limit the power draw #ifdef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 40 diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/info.json index c9af182427..e0106f4423 100644 --- a/keyboards/keycapsss/kimiko/rev1/info.json +++ b/keyboards/keycapsss/kimiko/rev1/info.json @@ -22,6 +22,7 @@ "soft_serial_pin": "D2" }, "rgblight": { + "led_count": 60, "split_count": [30, 30] }, "ws2812": { diff --git a/keyboards/keycapsss/o4l_5x12/config.h b/keyboards/keycapsss/o4l_5x12/config.h index 47d71ba911..4fa58a42c9 100644 --- a/keyboards/keycapsss/o4l_5x12/config.h +++ b/keyboards/keycapsss/o4l_5x12/config.h @@ -1,6 +1,5 @@ #pragma once -# define RGBLED_NUM 12 # define RGBLIGHT_HUE_STEP 4 # define RGBLIGHT_SAT_STEP 4 # define RGBLIGHT_VAL_STEP 4 diff --git a/keyboards/keycapsss/o4l_5x12/info.json b/keyboards/keycapsss/o4l_5x12/info.json index 0766e0a2e4..15be2161d4 100644 --- a/keyboards/keycapsss/o4l_5x12/info.json +++ b/keyboards/keycapsss/o4l_5x12/info.json @@ -8,6 +8,9 @@ "pid": "0x0512", "device_version": "0.0.1" }, + "rgblight": { + "led_count": 12 + }, "ws2812": { "pin": "D3" }, -- cgit v1.2.3 From 4ae9bfd17ab01608e1bf2492c35d79bd2ad5c0fe Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 24 Jun 2023 17:37:54 +1000 Subject: Move `RGBLIGHT_HUE/SAT/VAL_STEP` to data driven (#21292) Co-authored-by: Nick Brassel --- keyboards/keycapsss/o4l_5x12/config.h | 3 --- keyboards/keycapsss/o4l_5x12/info.json | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/keycapsss') diff --git a/keyboards/keycapsss/o4l_5x12/config.h b/keyboards/keycapsss/o4l_5x12/config.h index 4fa58a42c9..783ce3f9d2 100644 --- a/keyboards/keycapsss/o4l_5x12/config.h +++ b/keyboards/keycapsss/o4l_5x12/config.h @@ -1,8 +1,5 @@ #pragma once -# define RGBLIGHT_HUE_STEP 4 -# define RGBLIGHT_SAT_STEP 4 -# define RGBLIGHT_VAL_STEP 4 # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/keycapsss/o4l_5x12/info.json b/keyboards/keycapsss/o4l_5x12/info.json index 15be2161d4..090355464c 100644 --- a/keyboards/keycapsss/o4l_5x12/info.json +++ b/keyboards/keycapsss/o4l_5x12/info.json @@ -9,6 +9,9 @@ "device_version": "0.0.1" }, "rgblight": { + "hue_steps": 4, + "saturation_steps": 4, + "brightness_steps": 4, "led_count": 12 }, "ws2812": { -- cgit v1.2.3 From 2f9f555add827bbc6b7e6e4a08b830b9825ada4f Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 25 Jun 2023 22:06:31 +1000 Subject: Move `TAP_CODE_DELAY` to data driven (#21363) --- keyboards/keycapsss/plaid_pad/config.h | 20 -------------------- keyboards/keycapsss/plaid_pad/info.json | 3 +++ 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 keyboards/keycapsss/plaid_pad/config.h (limited to 'keyboards/keycapsss') diff --git a/keyboards/keycapsss/plaid_pad/config.h b/keyboards/keycapsss/plaid_pad/config.h deleted file mode 100644 index 984323f63c..0000000000 --- a/keyboards/keycapsss/plaid_pad/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 Ben Roesner (keycapsss.com) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -// Fix for volume controll with encoder (steadily in/decrease) -#define TAP_CODE_DELAY 60 diff --git a/keyboards/keycapsss/plaid_pad/info.json b/keyboards/keycapsss/plaid_pad/info.json index 9fe02448d0..c66bd05f1b 100644 --- a/keyboards/keycapsss/plaid_pad/info.json +++ b/keyboards/keycapsss/plaid_pad/info.json @@ -7,6 +7,9 @@ "pid": "0x5050", "max_power": 100 }, + "qmk": { + "tap_keycode_delay": 60 + }, "matrix_pins": { "cols": ["B0", "D7", "D6", "D5"], "rows": ["C0", "C1", "C2", "C3"] -- cgit v1.2.3 From 5d2f2af19897d1f5fd35cb8475fc8b3f74f201f1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 15 Aug 2023 19:30:34 +1000 Subject: OLED: driver naming cleanups (#21710) --- keyboards/keycapsss/kimiko/keymaps/default/rules.mk | 2 -- keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk | 2 -- keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk | 1 - keyboards/keycapsss/plaid_pad/rev3/rules.mk | 1 - 4 files changed, 6 deletions(-) (limited to 'keyboards/keycapsss') diff --git a/keyboards/keycapsss/kimiko/keymaps/default/rules.mk b/keyboards/keycapsss/kimiko/keymaps/default/rules.mk index 75655f2bd5..ef4f0c0b43 100644 --- a/keyboards/keycapsss/kimiko/keymaps/default/rules.mk +++ b/keyboards/keycapsss/kimiko/keymaps/default/rules.mk @@ -1,5 +1,4 @@ OLED_ENABLE = yes -OLED_DRIVER = SSD1306 # Enables the use of OLED displays ENCODER_ENABLE = yes # ENables the use of one or more encoders RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow @@ -8,4 +7,3 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow # This does not affect QMK Macros and Layers LTO_ENABLE = yes ENCODER_MAP_ENABLE = yes - diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk b/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk index 0229490d44..96b99cdff0 100644 --- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk +++ b/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk @@ -1,5 +1,4 @@ OLED_ENABLE = yes -OLED_DRIVER = SSD1306 # Enables the use of OLED displays ENCODER_ENABLE = yes # ENables the use of one or more encoders RGBLIGHT_ENABLE = no # Disable keyboard RGB underglow @@ -18,4 +17,3 @@ SPLIT_KEYBOARD = yes #DEACTIVATED FOR MEMORY SAVING MOUSEKEY_ENABLE = no CONSOLE_ENABLE = no - diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk b/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk index 9ce6e078db..dc3e29cf8b 100644 --- a/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk +++ b/keyboards/keycapsss/plaid_pad/keymaps/oled/rules.mk @@ -1,3 +1,2 @@ OLED_ENABLE = yes -OLED_DRIVER = SSD1306 # Enables the use of OLED displays COMBO_ENABLE = yes diff --git a/keyboards/keycapsss/plaid_pad/rev3/rules.mk b/keyboards/keycapsss/plaid_pad/rev3/rules.mk index e72f11863f..5ec06e9609 100644 --- a/keyboards/keycapsss/plaid_pad/rev3/rules.mk +++ b/keyboards/keycapsss/plaid_pad/rev3/rules.mk @@ -1,3 +1,2 @@ ENCODER_ENABLE = yes OLED_ENABLE = yes -OLED_DRIVER = SSD1306 # Enables the use of OLED displays -- cgit v1.2.3 From 37bc9499453f95e4e835faa751dbfffff9bfd644 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 23 Aug 2023 10:00:03 +1000 Subject: RGB Matrix: driver naming cleanups (#21594) --- keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/keycapsss') diff --git a/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk b/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk index 96b99cdff0..46cb8d8a94 100644 --- a/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk +++ b/keyboards/keycapsss/kimiko/keymaps/oriaj3/rules.mk @@ -9,7 +9,7 @@ LTO_ENABLE = yes #ENABLE RGB MATRIX WITH DRIVER WS2812 RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 +RGB_MATRIX_DRIVER = ws2812 #DEFINE SPLIT KEYBOARD AND SPLIT TRANSPORT MIRROR SPLIT_KEYBOARD = yes -- cgit v1.2.3 From 023d644bb69748d97feb49091e2c24f3fcd3da11 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 24 Aug 2023 07:11:39 +1000 Subject: Move RGBLight animations to data driven (#21635) * Move RGBLight animations to data driven, 0-9 * Move RGBLight animations to data driven, A * Move RGBLight animations to data driven, B * Move RGBLight animations to data driven, C * Move RGBLight animations to data driven, D * Move RGBLight animations to data driven, E * Move RGBLight animations to data driven, F * Move RGBLight animations to data driven, G * Move RGBLight animations to data driven, H * Move RGBLight animations to data driven, handwired * Move RGBLight animations to data driven, I * Move RGBLight animations to data driven, J * Move RGBLight animations to data driven, K * Move RGBLight animations to data driven, L * Move RGBLight animations to data driven, M * Move RGBLight animations to data driven, N * Move RGBLight animations to data driven, O * Move RGBLight animations to data driven, P * Move RGBLight animations to data driven, Q * Move RGBLight animations to data driven, R * Move RGBLight animations to data driven, S * Move RGBLight animations to data driven, T * Move RGBLight animations to data driven, U * Move RGBLight animations to data driven, V * Move RGBLight animations to data driven, W * Move RGBLight animations to data driven, X * Move RGBLight animations to data driven, Y * Move RGBLight animations to data driven, Z * Fix incorrect placement * Fix build failures and mismatches --- keyboards/keycapsss/o4l_5x12/config.h | 11 ----------- keyboards/keycapsss/o4l_5x12/info.json | 14 +++++++++++++- 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'keyboards/keycapsss') diff --git a/keyboards/keycapsss/o4l_5x12/config.h b/keyboards/keycapsss/o4l_5x12/config.h index 783ce3f9d2..7bc78f68d6 100644 --- a/keyboards/keycapsss/o4l_5x12/config.h +++ b/keyboards/keycapsss/o4l_5x12/config.h @@ -1,16 +1,5 @@ #pragma once -# 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 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/keycapsss/o4l_5x12/info.json b/keyboards/keycapsss/o4l_5x12/info.json index 090355464c..91dc056468 100644 --- a/keyboards/keycapsss/o4l_5x12/info.json +++ b/keyboards/keycapsss/o4l_5x12/info.json @@ -12,7 +12,19 @@ "hue_steps": 4, "saturation_steps": 4, "brightness_steps": 4, - "led_count": 12 + "led_count": 12, + "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": "D3" -- cgit v1.2.3