aboutsummaryrefslogtreecommitdiff
path: root/keyboards/tkc
diff options
context:
space:
mode:
authorNick Brassel <[email protected]>2024-02-28 21:47:37 +1100
committerNick Brassel <[email protected]>2024-02-28 21:47:37 +1100
commit4e369d405af6bba1adce6337b2e1b1ea1788566c (patch)
treeb0f020feff1809e37c9e7795d344929ff0bb290a /keyboards/tkc
parent4e04da397ef643f8fcf4afbe1d19f63aee1fc561 (diff)
parentdd1706e468bb18dd7f7ae143de735a5d3be1bfb8 (diff)
downloadqmk_firmware-0.24.0.tar.gz
qmk_firmware-0.24.0.zip
Merge branch 'develop'0.24.0
Diffstat (limited to 'keyboards/tkc')
-rw-r--r--keyboards/tkc/california/config.h3
-rw-r--r--keyboards/tkc/california/info.json3
-rw-r--r--keyboards/tkc/portico/config.h33
-rw-r--r--keyboards/tkc/portico/info.json34
-rw-r--r--keyboards/tkc/portico68v2/config.h59
-rw-r--r--keyboards/tkc/portico68v2/info.json48
-rw-r--r--keyboards/tkc/portico68v2/portico68v2.c170
-rw-r--r--keyboards/tkc/portico75/config.h64
-rw-r--r--keyboards/tkc/portico75/info.json34
-rw-r--r--keyboards/tkc/portico75/portico75.c222
-rw-r--r--keyboards/tkc/tkl_ab87/config.h3
11 files changed, 318 insertions, 355 deletions
diff --git a/keyboards/tkc/california/config.h b/keyboards/tkc/california/config.h
index a9909d1001..827133aed3 100644
--- a/keyboards/tkc/california/config.h
+++ b/keyboards/tkc/california/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations
-
/* 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/tkc/california/info.json b/keyboards/tkc/california/info.json
index d309e872f4..731e65323e 100644
--- a/keyboards/tkc/california/info.json
+++ b/keyboards/tkc/california/info.json
@@ -17,6 +17,9 @@
"pin": "B7",
"breathing": true
},
+ "dynamic_keymap": {
+ "layer_count": 3
+ },
"indicators": {
"caps_lock": "F0",
"num_lock": "F1"
diff --git a/keyboards/tkc/portico/config.h b/keyboards/tkc/portico/config.h
index 265e0abbc3..a57c0b4b1d 100644
--- a/keyboards/tkc/portico/config.h
+++ b/keyboards/tkc/portico/config.h
@@ -17,38 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_PROCESS_LIMIT 4
-# define RGB_MATRIX_LED_FLUSH_LIMIT 26
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-# define RGB_MATRIX_KEYPRESSES
-# undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# undef ENABLE_RGB_MATRIX_BAND_SAT
-# undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-# undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-# undef ENABLE_RGB_MATRIX_SPLASH
-# undef ENABLE_RGB_MATRIX_MULTISPLASH
-# undef ENABLE_RGB_MATRIX_SOLID_SPLASH
-# undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-# undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
-# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
-# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
-# define DRIVER_1_LED_TOTAL 36
-# define DRIVER_2_LED_TOTAL 31
-# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-#else
-// IS31FL3731 driver
#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
+
+#ifndef RGB_MATRIX_ENABLE
+// IS31FL3731 driver
#define IS31FL3731_LED_COUNT 67
#define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/info.json
index 6eb15efb73..4f908c83e6 100644
--- a/keyboards/tkc/portico/info.json
+++ b/keyboards/tkc/portico/info.json
@@ -9,7 +9,39 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
- "driver": "is31fl3731"
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true
+ },
+ "driver": "is31fl3731",
+ "led_flush_limit": 26,
+ "led_process_limit": 4,
+ "max_brightness": 200,
+ "sleep": true
},
"matrix_pins": {
"cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"],
diff --git a/keyboards/tkc/portico68v2/config.h b/keyboards/tkc/portico68v2/config.h
index 2c8ecf806d..3da76c332d 100644
--- a/keyboards/tkc/portico68v2/config.h
+++ b/keyboards/tkc/portico68v2/config.h
@@ -18,62 +18,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-#define DRIVER_1_LED_TOTAL 82
-#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-#define DRIVER_INDICATOR_LED_TOTAL 0
-#define RGB_MATRIX_CENTER { 116, 32 }
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 175
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-# define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-//# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-//# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-# define ENABLE_RGB_MATRIX_SPLASH
-# define ENABLE_RGB_MATRIX_MULTISPLASH
-# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-// #define RGB_MATRIX_LED_PROCESS_LIMIT 5
-// #define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/tkc/portico68v2/info.json b/keyboards/tkc/portico68v2/info.json
index 7a11cb6172..38a94c2c9d 100644
--- a/keyboards/tkc/portico68v2/info.json
+++ b/keyboards/tkc/portico68v2/info.json
@@ -9,7 +9,53 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
- "driver": "is31fl3741"
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "center_point": [116, 32],
+ "driver": "is31fl3741",
+ "max_brightness": 175,
+ "sleep": true
},
"matrix_pins": {
"cols": ["D3", "D5", "D4", "D6", "D7", "B4", "B5", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3"],
diff --git a/keyboards/tkc/portico68v2/portico68v2.c b/keyboards/tkc/portico68v2/portico68v2.c
index 90d8c12fca..0f3c557b2c 100644
--- a/keyboards/tkc/portico68v2/portico68v2.c
+++ b/keyboards/tkc/portico68v2/portico68v2.c
@@ -18,90 +18,90 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
-const is31fl3741_led_t g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = {
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB1 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB2 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB3 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB4 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB5 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB6 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB7 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB8 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB9 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB10 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB11 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB12 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB13 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB14 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB15 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB16 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB17 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB18 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB19 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB21 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB22 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB23 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB24 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB25 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB26 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB27 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB28 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB29 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB30 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB31 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB32 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB33 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB34 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB35 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB36 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB37 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB38 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB39 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB40 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB41 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB42 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB43 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB44 */
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB45 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB46 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB47 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB48 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB49 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB50 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB51 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB52 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB53 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB54 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB55 */
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB56 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB57 */
- {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB58 */
- {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB59 */
- {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB60 */
- {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB61 */
- {0, CS6_SW7, CS5_SW7, CS4_SW7}, /* RGB62 */
- {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB63 */
- {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB64 */
- {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB65 */
- {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB66 */
- {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB67 */
+const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB1 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB2 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB3 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB4 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB5 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB6 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB7 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB8 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB9 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB10 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB11 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB12 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB13 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB14 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB15 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB16 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB17 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB18 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB19 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB21 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB22 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB23 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB24 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB25 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB26 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB27 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB28 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB29 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB30 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB31 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB32 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB33 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB34 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB35 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB36 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB37 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB38 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB39 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB40 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB41 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB42 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB43 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB44 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB45 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB46 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB47 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB48 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB49 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB50 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB51 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB52 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB53 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB54 */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB55 */
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB56 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB57 */
+ {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB58 */
+ {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB59 */
+ {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB60 */
+ {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB61 */
+ {0, SW7_CS6, SW7_CS5, SW7_CS4}, /* RGB62 */
+ {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB63 */
+ {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB64 */
+ {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB65 */
+ {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB66 */
+ {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB67 */
- {0,CS36_SW1,CS35_SW1,CS34_SW1}, /* RGB68 */
- {0,CS36_SW2,CS35_SW2,CS34_SW2}, /* RGB69 */
- {0,CS36_SW3,CS35_SW3,CS34_SW3}, /* RGB70 */
- {0,CS36_SW4,CS35_SW4,CS34_SW4}, /* RGB71 */
- {0,CS36_SW5,CS35_SW5,CS34_SW5}, /* RGB72 */
- {0,CS36_SW6,CS35_SW6,CS34_SW6}, /* RGB73 */
- {0,CS36_SW7,CS35_SW7,CS34_SW7}, /* RGB74 */
- {0,CS36_SW8,CS35_SW8,CS34_SW8}, /* RGB75 */
- {0,CS36_SW9,CS35_SW9,CS34_SW9}, /* RGB76 */
- {0,CS39_SW1,CS38_SW1,CS37_SW1}, /* RGB77 */
- {0,CS39_SW2,CS38_SW2,CS37_SW2}, /* RGB78 */
- {0,CS39_SW3,CS38_SW3,CS37_SW3}, /* RGB79 */
- {0,CS39_SW4,CS38_SW4,CS37_SW4}, /* RGB80 */
- {0,CS39_SW5,CS38_SW5,CS37_SW5}, /* RGB81 */
- {0,CS39_SW6,CS38_SW6,CS37_SW6}, /* RGB82 */
+ {0,SW1_CS36,SW1_CS35,SW1_CS34}, /* RGB68 */
+ {0,SW2_CS36,SW2_CS35,SW2_CS34}, /* RGB69 */
+ {0,SW3_CS36,SW3_CS35,SW3_CS34}, /* RGB70 */
+ {0,SW4_CS36,SW4_CS35,SW4_CS34}, /* RGB71 */
+ {0,SW5_CS36,SW5_CS35,SW5_CS34}, /* RGB72 */
+ {0,SW6_CS36,SW6_CS35,SW6_CS34}, /* RGB73 */
+ {0,SW7_CS36,SW7_CS35,SW7_CS34}, /* RGB74 */
+ {0,SW8_CS36,SW8_CS35,SW8_CS34}, /* RGB75 */
+ {0,SW9_CS36,SW9_CS35,SW9_CS34}, /* RGB76 */
+ {0,SW1_CS39,SW1_CS38,SW1_CS37}, /* RGB77 */
+ {0,SW2_CS39,SW2_CS38,SW2_CS37}, /* RGB78 */
+ {0,SW3_CS39,SW3_CS38,SW3_CS37}, /* RGB79 */
+ {0,SW4_CS39,SW4_CS38,SW4_CS37}, /* RGB80 */
+ {0,SW5_CS39,SW5_CS38,SW5_CS37}, /* RGB81 */
+ {0,SW6_CS39,SW6_CS38,SW6_CS37}, /* RGB82 */
};
led_config_t g_led_config = {
@@ -133,13 +133,13 @@ bool rgb_matrix_indicators_kb(void) {
return false;
}
if (host_keyboard_led_state().caps_lock) {
- for (uint8_t i = 0; i < DRIVER_1_LED_TOTAL; i++) {
+ for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
rgb_matrix_set_color(i, 0xFF, 0xFF, 0xFF);
}
}
else {
if (rgb_matrix_get_flags() == LED_FLAG_NONE) {
- for (uint8_t i = 0; i < DRIVER_1_LED_TOTAL; i++) {
+ for (uint8_t i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
rgb_matrix_set_color(i, 0, 0, 0);
}
}
diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h
index 8146141bf0..8d209e3775 100644
--- a/keyboards/tkc/portico75/config.h
+++ b/keyboards/tkc/portico75/config.h
@@ -17,68 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_PROCESS_LIMIT 4
-# define RGB_MATRIX_LED_FLUSH_LIMIT 26
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-# define RGB_MATRIX_KEYPRESSES
-
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-// # define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// # define ENABLE_RGB_MATRIX_SPLASH
-// # define ENABLE_RGB_MATRIX_MULTISPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
-# define DRIVER_1_LED_TOTAL 98
-# define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
-# define DRIVER_INDICATOR_LED_TOTAL 0
-#else
+#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
+
+#ifndef RGB_MATRIX_ENABLE
// WT_RGB IS31FL3741 driver code
-# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND
# define IS31FL3741_LED_COUNT 98
# define RGB_BACKLIGHT_ENABLED 1
diff --git a/keyboards/tkc/portico75/info.json b/keyboards/tkc/portico75/info.json
index 5a90036972..fa2a24951f 100644
--- a/keyboards/tkc/portico75/info.json
+++ b/keyboards/tkc/portico75/info.json
@@ -9,7 +9,39 @@
"device_version": "0.0.1"
},
"rgb_matrix": {
- "driver": "is31fl3741"
+ "animations": {
+ "alphas_mods": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_val": true,
+ "band_pinwheel_val": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_rain": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "typing_heatmap": true
+ },
+ "driver": "is31fl3741",
+ "led_flush_limit": 26,
+ "led_process_limit": 4,
+ "max_brightness": 200,
+ "sleep": true
},
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B3", "B7"],
diff --git a/keyboards/tkc/portico75/portico75.c b/keyboards/tkc/portico75/portico75.c
index 0a22a37d4e..cd6dafe31a 100644
--- a/keyboards/tkc/portico75/portico75.c
+++ b/keyboards/tkc/portico75/portico75.c
@@ -25,119 +25,119 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#if defined(RGB_MATRIX_ENABLE) || defined(RGB_BACKLIGHT_PORTICO75)
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS18_SW1, CS17_SW1, CS16_SW1},
- {0, CS18_SW2, CS17_SW2, CS16_SW2},
- {0, CS18_SW3, CS17_SW3, CS16_SW3},
- {0, CS18_SW4, CS17_SW4, CS16_SW4},
- {0, CS18_SW5, CS17_SW5, CS16_SW5},
- {0, CS18_SW6, CS17_SW6, CS16_SW6},
- {0, CS18_SW7, CS17_SW7, CS16_SW7},
- {0, CS18_SW8, CS17_SW8, CS16_SW8},
- {0, CS18_SW9, CS17_SW9, CS16_SW9},
-
- {0, CS21_SW1, CS20_SW1, CS19_SW1},
- {0, CS21_SW2, CS20_SW2, CS19_SW2},
- {0, CS21_SW3, CS20_SW3, CS19_SW3},
- {0, CS21_SW4, CS20_SW4, CS19_SW4},
- {0, CS21_SW5, CS20_SW5, CS19_SW5},
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, //Encoder, NO_LED
-
- {0, CS15_SW1, CS14_SW1, CS13_SW1},
- {0, CS15_SW2, CS14_SW2, CS13_SW2},
- {0, CS15_SW3, CS14_SW3, CS13_SW3},
- {0, CS15_SW4, CS14_SW4, CS13_SW4},
- {0, CS15_SW5, CS14_SW5, CS13_SW5},
- {0, CS15_SW6, CS14_SW6, CS13_SW6},
- {0, CS15_SW7, CS14_SW7, CS13_SW7},
- {0, CS15_SW8, CS14_SW8, CS13_SW8},
- {0, CS15_SW9, CS14_SW9, CS13_SW9},
-
- {0, CS24_SW1, CS23_SW1, CS22_SW1},
- {0, CS24_SW2, CS23_SW2, CS22_SW2},
- {0, CS24_SW3, CS23_SW3, CS22_SW3},
- {0, CS24_SW4, CS23_SW4, CS22_SW4},
- {0, CS24_SW5, CS23_SW5, CS22_SW5},
- {0, CS24_SW6, CS23_SW6, CS22_SW6},
-
- {0, CS12_SW1, CS11_SW1, CS10_SW1},
- {0, CS12_SW2, CS11_SW2, CS10_SW2},
- {0, CS12_SW3, CS11_SW3, CS10_SW3},
- {0, CS12_SW4, CS11_SW4, CS10_SW4},
- {0, CS12_SW5, CS11_SW5, CS10_SW5},
- {0, CS12_SW6, CS11_SW6, CS10_SW6},
- {0, CS12_SW7, CS11_SW7, CS10_SW7},
- {0, CS12_SW8, CS11_SW8, CS10_SW8},
- {0, CS12_SW9, CS11_SW9, CS10_SW9},
-
- {0, CS27_SW1, CS26_SW1, CS25_SW1},
- {0, CS27_SW2, CS26_SW2, CS25_SW2},
- {0, CS27_SW3, CS26_SW3, CS25_SW3},
- {0, CS27_SW4, CS26_SW4, CS25_SW4},
- {0, CS27_SW5, CS26_SW5, CS25_SW5},
- {0, CS27_SW6, CS26_SW6, CS25_SW6},
-
- {0, CS9_SW1, CS8_SW1, CS7_SW1},
- {0, CS9_SW2, CS8_SW2, CS7_SW2},
- {0, CS9_SW3, CS8_SW3, CS7_SW3},
- {0, CS9_SW4, CS8_SW4, CS7_SW4},
- {0, CS9_SW5, CS8_SW5, CS7_SW5},
- {0, CS9_SW6, CS8_SW6, CS7_SW6},
- {0, CS9_SW7, CS8_SW7, CS7_SW7},
- {0, CS9_SW8, CS8_SW8, CS7_SW8},
- {0, CS9_SW9, CS8_SW9, CS7_SW9},
-
- {0, CS30_SW1, CS29_SW1, CS28_SW1},
- {0, CS30_SW2, CS29_SW2, CS28_SW2},
- {0, CS30_SW3, CS29_SW3, CS28_SW3},
- {0, CS30_SW4, CS29_SW4, CS28_SW4},
-
- {0, CS6_SW1, CS5_SW1, CS4_SW1},
- {0, CS6_SW2, CS5_SW2, CS4_SW2},
- {0, CS6_SW3, CS5_SW3, CS4_SW3},
- {0, CS6_SW4, CS5_SW4, CS4_SW4},
- {0, CS6_SW5, CS5_SW5, CS4_SW5},
- {0, CS6_SW6, CS5_SW6, CS4_SW6},
- {0, CS6_SW7, CS5_SW7, CS4_SW7},
- {0, CS6_SW8, CS5_SW8, CS4_SW8},
- {0, CS6_SW9, CS5_SW9, CS4_SW9},
-
- {0, CS33_SW1, CS32_SW1, CS31_SW1},
- {0, CS33_SW2, CS32_SW2, CS31_SW2},
- {0, CS33_SW3, CS32_SW3, CS31_SW3},
- {0, CS33_SW4, CS32_SW4, CS31_SW4},
-
- {0, CS3_SW1, CS2_SW1, CS1_SW1},
- {0, CS3_SW2, CS2_SW2, CS1_SW2},
- {0, CS3_SW3, CS2_SW3, CS1_SW3},
- {0, CS3_SW6, CS2_SW6, CS1_SW6},
- {0, CS3_SW8, CS2_SW8, CS1_SW8},
- {0, CS3_SW9, CS2_SW9, CS1_SW9},
-
- {0, CS36_SW1, CS35_SW1, CS34_SW1},
- {0, CS36_SW2, CS35_SW2, CS34_SW2},
- {0, CS36_SW3, CS35_SW3, CS34_SW3},
+ {0, SW1_CS18, SW1_CS17, SW1_CS16},
+ {0, SW2_CS18, SW2_CS17, SW2_CS16},
+ {0, SW3_CS18, SW3_CS17, SW3_CS16},
+ {0, SW4_CS18, SW4_CS17, SW4_CS16},
+ {0, SW5_CS18, SW5_CS17, SW5_CS16},
+ {0, SW6_CS18, SW6_CS17, SW6_CS16},
+ {0, SW7_CS18, SW7_CS17, SW7_CS16},
+ {0, SW8_CS18, SW8_CS17, SW8_CS16},
+ {0, SW9_CS18, SW9_CS17, SW9_CS16},
+
+ {0, SW1_CS21, SW1_CS20, SW1_CS19},
+ {0, SW2_CS21, SW2_CS20, SW2_CS19},
+ {0, SW3_CS21, SW3_CS20, SW3_CS19},
+ {0, SW4_CS21, SW4_CS20, SW4_CS19},
+ {0, SW5_CS21, SW5_CS20, SW5_CS19},
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, //Encoder, NO_LED
+
+ {0, SW1_CS15, SW1_CS14, SW1_CS13},
+ {0, SW2_CS15, SW2_CS14, SW2_CS13},
+ {0, SW3_CS15, SW3_CS14, SW3_CS13},
+ {0, SW4_CS15, SW4_CS14, SW4_CS13},
+ {0, SW5_CS15, SW5_CS14, SW5_CS13},
+ {0, SW6_CS15, SW6_CS14, SW6_CS13},
+ {0, SW7_CS15, SW7_CS14, SW7_CS13},
+ {0, SW8_CS15, SW8_CS14, SW8_CS13},
+ {0, SW9_CS15, SW9_CS14, SW9_CS13},
+
+ {0, SW1_CS24, SW1_CS23, SW1_CS22},
+ {0, SW2_CS24, SW2_CS23, SW2_CS22},
+ {0, SW3_CS24, SW3_CS23, SW3_CS22},
+ {0, SW4_CS24, SW4_CS23, SW4_CS22},
+ {0, SW5_CS24, SW5_CS23, SW5_CS22},
+ {0, SW6_CS24, SW6_CS23, SW6_CS22},
+
+ {0, SW1_CS12, SW1_CS11, SW1_CS10},
+ {0, SW2_CS12, SW2_CS11, SW2_CS10},
+ {0, SW3_CS12, SW3_CS11, SW3_CS10},
+ {0, SW4_CS12, SW4_CS11, SW4_CS10},
+ {0, SW5_CS12, SW5_CS11, SW5_CS10},
+ {0, SW6_CS12, SW6_CS11, SW6_CS10},
+ {0, SW7_CS12, SW7_CS11, SW7_CS10},
+ {0, SW8_CS12, SW8_CS11, SW8_CS10},
+ {0, SW9_CS12, SW9_CS11, SW9_CS10},
+
+ {0, SW1_CS27, SW1_CS26, SW1_CS25},
+ {0, SW2_CS27, SW2_CS26, SW2_CS25},
+ {0, SW3_CS27, SW3_CS26, SW3_CS25},
+ {0, SW4_CS27, SW4_CS26, SW4_CS25},
+ {0, SW5_CS27, SW5_CS26, SW5_CS25},
+ {0, SW6_CS27, SW6_CS26, SW6_CS25},
+
+ {0, SW1_CS9, SW1_CS8, SW1_CS7},
+ {0, SW2_CS9, SW2_CS8, SW2_CS7},
+ {0, SW3_CS9, SW3_CS8, SW3_CS7},
+ {0, SW4_CS9, SW4_CS8, SW4_CS7},
+ {0, SW5_CS9, SW5_CS8, SW5_CS7},
+ {0, SW6_CS9, SW6_CS8, SW6_CS7},
+ {0, SW7_CS9, SW7_CS8, SW7_CS7},
+ {0, SW8_CS9, SW8_CS8, SW8_CS7},
+ {0, SW9_CS9, SW9_CS8, SW9_CS7},
+
+ {0, SW1_CS30, SW1_CS29, SW1_CS28},
+ {0, SW2_CS30, SW2_CS29, SW2_CS28},
+ {0, SW3_CS30, SW3_CS29, SW3_CS28},
+ {0, SW4_CS30, SW4_CS29, SW4_CS28},
+
+ {0, SW1_CS6, SW1_CS5, SW1_CS4},
+ {0, SW2_CS6, SW2_CS5, SW2_CS4},
+ {0, SW3_CS6, SW3_CS5, SW3_CS4},
+ {0, SW4_CS6, SW4_CS5, SW4_CS4},
+ {0, SW5_CS6, SW5_CS5, SW5_CS4},
+ {0, SW6_CS6, SW6_CS5, SW6_CS4},
+ {0, SW7_CS6, SW7_CS5, SW7_CS4},
+ {0, SW8_CS6, SW8_CS5, SW8_CS4},
+ {0, SW9_CS6, SW9_CS5, SW9_CS4},
+
+ {0, SW1_CS33, SW1_CS32, SW1_CS31},
+ {0, SW2_CS33, SW2_CS32, SW2_CS31},
+ {0, SW3_CS33, SW3_CS32, SW3_CS31},
+ {0, SW4_CS33, SW4_CS32, SW4_CS31},
+
+ {0, SW1_CS3, SW1_CS2, SW1_CS1},
+ {0, SW2_CS3, SW2_CS2, SW2_CS1},
+ {0, SW3_CS3, SW3_CS2, SW3_CS1},
+ {0, SW6_CS3, SW6_CS2, SW6_CS1},
+ {0, SW8_CS3, SW8_CS2, SW8_CS1},
+ {0, SW9_CS3, SW9_CS2, SW9_CS1},
+
+ {0, SW1_CS36, SW1_CS35, SW1_CS34},
+ {0, SW2_CS36, SW2_CS35, SW2_CS34},
+ {0, SW3_CS36, SW3_CS35, SW3_CS34},
/*UNDERGLOW*/
- {0, CS39_SW1, CS38_SW1, CS37_SW1},
- {0, CS39_SW2, CS38_SW2, CS37_SW2},
- {0, CS39_SW3, CS38_SW3, CS37_SW3},
- {0, CS39_SW4, CS38_SW4, CS37_SW4},
- {0, CS39_SW5, CS38_SW5, CS37_SW5},
- {0, CS39_SW6, CS38_SW6, CS37_SW6},
- {0, CS39_SW7, CS38_SW7, CS37_SW7},
- {0, CS39_SW8, CS38_SW8, CS37_SW8},
- {0, CS39_SW9, CS38_SW9, CS37_SW9},
-
- {0, CS36_SW4, CS35_SW4, CS34_SW4},
- {0, CS36_SW5, CS35_SW5, CS34_SW5},
- {0, CS36_SW6, CS35_SW6, CS34_SW6},
- {0, CS36_SW7, CS35_SW7, CS34_SW7},
- {0, CS36_SW8, CS35_SW8, CS34_SW8},
- {0, CS36_SW9, CS35_SW9, CS34_SW9},
-
- {0, CS33_SW5, CS32_SW5, CS31_SW5},
- {0, CS33_SW6, CS32_SW6, CS31_SW6},
- {0, CS33_SW7, CS32_SW7, CS31_SW7},
+ {0, SW1_CS39, SW1_CS38, SW1_CS37},
+ {0, SW2_CS39, SW2_CS38, SW2_CS37},
+ {0, SW3_CS39, SW3_CS38, SW3_CS37},
+ {0, SW4_CS39, SW4_CS38, SW4_CS37},
+ {0, SW5_CS39, SW5_CS38, SW5_CS37},
+ {0, SW6_CS39, SW6_CS38, SW6_CS37},
+ {0, SW7_CS39, SW7_CS38, SW7_CS37},
+ {0, SW8_CS39, SW8_CS38, SW8_CS37},
+ {0, SW9_CS39, SW9_CS38, SW9_CS37},
+
+ {0, SW4_CS36, SW4_CS35, SW4_CS34},
+ {0, SW5_CS36, SW5_CS35, SW5_CS34},
+ {0, SW6_CS36, SW6_CS35, SW6_CS34},
+ {0, SW7_CS36, SW7_CS35, SW7_CS34},
+ {0, SW8_CS36, SW8_CS35, SW8_CS34},
+ {0, SW9_CS36, SW9_CS35, SW9_CS34},
+
+ {0, SW5_CS33, SW5_CS32, SW5_CS31},
+ {0, SW6_CS33, SW6_CS32, SW6_CS31},
+ {0, SW7_CS33, SW7_CS32, SW7_CS31},
};
#endif
diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h
index 5a3bda67c2..ef2f04081f 100644
--- a/keyboards/tkc/tkl_ab87/config.h
+++ b/keyboards/tkc/tkl_ab87/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */