From 4a0badfb34257b8af819433a6358ed16a50455cb Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 13 Sep 2023 22:48:01 +1000 Subject: is31fl3741: driver naming cleanups (#21929) --- keyboards/tkc/portico68v2/config.h | 2 +- keyboards/tkc/portico75/config.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/tkc') diff --git a/keyboards/tkc/portico68v2/config.h b/keyboards/tkc/portico68v2/config.h index fd0191d101..1c9f946cb7 100644 --- a/keyboards/tkc/portico68v2/config.h +++ b/keyboards/tkc/portico68v2/config.h @@ -18,7 +18,7 @@ along with this program. If not, see . #pragma once #define DRIVER_ADDR_1 0b0110000 -#define DRIVER_COUNT 1 +#define IS31FL3741_DRIVER_COUNT 1 #define DRIVER_1_LED_TOTAL 82 #define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL #define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h index e72c95981b..d00d38e36a 100644 --- a/keyboards/tkc/portico75/config.h +++ b/keyboards/tkc/portico75/config.h @@ -73,13 +73,13 @@ along with this program. If not, see . # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 # define DRIVER_ADDR_1 0b0110000 -# define DRIVER_COUNT 1 +# define IS31FL3741_DRIVER_COUNT 1 # define DRIVER_1_LED_TOTAL 98 # define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL # define DRIVER_INDICATOR_LED_TOTAL 0 #else // WT_RGB IS31FL3741 driver code -# define DRIVER_COUNT 1 +# define IS31FL3741_DRIVER_COUNT 1 # define RGB_MATRIX_LED_COUNT 98 # define RGB_BACKLIGHT_ENABLED 1 -- cgit v1.2.3 From 8136eda6d48c8bc8dda5dfa439f7324d55448ca2 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 13 Sep 2023 22:53:15 +1000 Subject: is31fl3731: driver naming cleanups (#21918) --- keyboards/tkc/portico/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/tkc') diff --git a/keyboards/tkc/portico/config.h b/keyboards/tkc/portico/config.h index c9a25e843c..5adf42127e 100644 --- a/keyboards/tkc/portico/config.h +++ b/keyboards/tkc/portico/config.h @@ -41,14 +41,14 @@ along with this program. If not, see . # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 # define DRIVER_ADDR_1 0x74 # define DRIVER_ADDR_2 0x77 -# define DRIVER_COUNT 2 +# define IS31FL3731_DRIVER_COUNT 2 # 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 DRIVER_COUNT 2 +#define IS31FL3731_DRIVER_COUNT 2 #define RGB_MATRIX_LED_COUNT 67 #define RGB_BACKLIGHT_ENABLED 1 -- cgit v1.2.3 From 8f221052897754870e5c08a2de92c24d20cd307e Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 19 Sep 2023 19:31:54 +1000 Subject: Add and use I2C address defines for ISSI LED drivers (#22008) --- keyboards/tkc/portico/config.h | 4 ++-- keyboards/tkc/portico68v2/config.h | 2 +- keyboards/tkc/portico75/config.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'keyboards/tkc') diff --git a/keyboards/tkc/portico/config.h b/keyboards/tkc/portico/config.h index 5adf42127e..442a0900b2 100644 --- a/keyboards/tkc/portico/config.h +++ b/keyboards/tkc/portico/config.h @@ -39,8 +39,8 @@ along with this program. If not, see . # undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH # undef ENABLE_RGB_MATRIX_DIGITAL_RAIN # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 -# define DRIVER_ADDR_1 0x74 -# define DRIVER_ADDR_2 0x77 +# define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND +# define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_VCC # define IS31FL3731_DRIVER_COUNT 2 # define DRIVER_1_LED_TOTAL 36 # define DRIVER_2_LED_TOTAL 31 diff --git a/keyboards/tkc/portico68v2/config.h b/keyboards/tkc/portico68v2/config.h index 1c9f946cb7..f350af712b 100644 --- a/keyboards/tkc/portico68v2/config.h +++ b/keyboards/tkc/portico68v2/config.h @@ -17,7 +17,7 @@ along with this program. If not, see . #pragma once -#define DRIVER_ADDR_1 0b0110000 +#define DRIVER_ADDR_1 IS31FL3741_I2C_ADDRESS_GND #define IS31FL3741_DRIVER_COUNT 1 #define DRIVER_1_LED_TOTAL 82 #define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h index d00d38e36a..d512608f9c 100644 --- a/keyboards/tkc/portico75/config.h +++ b/keyboards/tkc/portico75/config.h @@ -72,7 +72,7 @@ along with this program. If not, see . // # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 -# define DRIVER_ADDR_1 0b0110000 +# define DRIVER_ADDR_1 IS31FL3741_I2C_ADDRESS_GND # define IS31FL3741_DRIVER_COUNT 1 # define DRIVER_1_LED_TOTAL 98 # define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL -- cgit v1.2.3 From d99dbe4d56a5d414b8d131bf703257172af91b70 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 4 Oct 2023 20:12:50 +1100 Subject: Update ISSI LED types (#22099) --- keyboards/tkc/portico/portico.c | 2 +- keyboards/tkc/portico68v2/portico68v2.c | 2 +- keyboards/tkc/portico75/portico75.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/tkc') diff --git a/keyboards/tkc/portico/portico.c b/keyboards/tkc/portico/portico.c index e41de1c232..bbb09ef8f6 100644 --- a/keyboards/tkc/portico/portico.c +++ b/keyboards/tkc/portico/portico.c @@ -19,7 +19,7 @@ along with this program. If not, see . #ifdef RGB_MATRIX_ENABLE -const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { +const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = { { 0, C2_1, C3_1, C4_1 }, { 0, C1_1, C3_2, C4_2 }, { 0, C1_2, C2_2, C4_3 }, diff --git a/keyboards/tkc/portico68v2/portico68v2.c b/keyboards/tkc/portico68v2/portico68v2.c index 83a365f7c0..90d8c12fca 100644 --- a/keyboards/tkc/portico68v2/portico68v2.c +++ b/keyboards/tkc/portico68v2/portico68v2.c @@ -18,7 +18,7 @@ along with this program. If not, see . #include "quantum.h" #ifdef RGB_MATRIX_ENABLE -const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = { +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 */ diff --git a/keyboards/tkc/portico75/portico75.c b/keyboards/tkc/portico75/portico75.c index 568f75901f..69d6256071 100644 --- a/keyboards/tkc/portico75/portico75.c +++ b/keyboards/tkc/portico75/portico75.c @@ -20,7 +20,7 @@ along with this program. If not, see . #ifdef RGB_MATRIX_ENABLE -const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { +const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { {0, CS18_SW1, CS17_SW1, CS16_SW1}, {0, CS18_SW2, CS17_SW2, CS16_SW2}, {0, CS18_SW3, CS17_SW3, CS16_SW3}, -- cgit v1.2.3 From c157c19b81fbd8b516de0eb5e854d278669cff1a Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 13 Oct 2023 17:25:32 +1100 Subject: Dedupe I2C, SPI, UART driver inclusions (#22253) --- keyboards/tkc/portico/rules.mk | 2 +- keyboards/tkc/portico75/keymaps/via/rules.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/tkc') diff --git a/keyboards/tkc/portico/rules.mk b/keyboards/tkc/portico/rules.mk index 4e382541f4..6bc05372af 100644 --- a/keyboards/tkc/portico/rules.mk +++ b/keyboards/tkc/portico/rules.mk @@ -19,4 +19,4 @@ SRC += keyboards/wilba_tech/wt_main.c \ quantum/color.c \ drivers/led/issi/is31fl3731.c -QUANTUM_LIB_SRC += i2c_master.c +I2C_DRIVER_REQUIRED = yes diff --git a/keyboards/tkc/portico75/keymaps/via/rules.mk b/keyboards/tkc/portico75/keymaps/via/rules.mk index 3e4e4a229d..1706771222 100644 --- a/keyboards/tkc/portico75/keymaps/via/rules.mk +++ b/keyboards/tkc/portico75/keymaps/via/rules.mk @@ -9,4 +9,4 @@ SRC += keyboards/wilba_tech/wt_main.c \ quantum/color.c \ drivers/led/issi/is31fl3741.c -QUANTUM_LIB_SRC += i2c_master.c +I2C_DRIVER_REQUIRED = yes -- cgit v1.2.3 From d56ee70c524b4fc4d1638e5e8c4bdeb89e752993 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 21 Oct 2023 21:41:59 +1000 Subject: Rename `DRIVER_ADDR_n` defines (#22200) Co-authored-by: Nick Brassel --- keyboards/tkc/portico/config.h | 4 ++-- keyboards/tkc/portico68v2/config.h | 2 +- keyboards/tkc/portico75/config.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'keyboards/tkc') diff --git a/keyboards/tkc/portico/config.h b/keyboards/tkc/portico/config.h index 442a0900b2..9a8e19171f 100644 --- a/keyboards/tkc/portico/config.h +++ b/keyboards/tkc/portico/config.h @@ -39,8 +39,8 @@ along with this program. If not, see . # undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH # undef ENABLE_RGB_MATRIX_DIGITAL_RAIN # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 -# define DRIVER_ADDR_1 IS31FL3731_I2C_ADDRESS_GND -# define DRIVER_ADDR_2 IS31FL3731_I2C_ADDRESS_VCC +# define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND +# define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC # define IS31FL3731_DRIVER_COUNT 2 # define DRIVER_1_LED_TOTAL 36 # define DRIVER_2_LED_TOTAL 31 diff --git a/keyboards/tkc/portico68v2/config.h b/keyboards/tkc/portico68v2/config.h index f350af712b..fdd38e3133 100644 --- a/keyboards/tkc/portico68v2/config.h +++ b/keyboards/tkc/portico68v2/config.h @@ -17,7 +17,7 @@ along with this program. If not, see . #pragma once -#define DRIVER_ADDR_1 IS31FL3741_I2C_ADDRESS_GND +#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND #define IS31FL3741_DRIVER_COUNT 1 #define DRIVER_1_LED_TOTAL 82 #define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h index d512608f9c..d5b401704b 100644 --- a/keyboards/tkc/portico75/config.h +++ b/keyboards/tkc/portico75/config.h @@ -72,7 +72,7 @@ along with this program. If not, see . // # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 -# define DRIVER_ADDR_1 IS31FL3741_I2C_ADDRESS_GND +# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND # define IS31FL3741_DRIVER_COUNT 1 # define DRIVER_1_LED_TOTAL 98 # define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL -- cgit v1.2.3 From cf7d3435d7e2cfb8927a1c436320f67bc9914eeb Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 23 Oct 2023 03:32:27 +1000 Subject: Add `_flush()` functions to LED drivers (#22308) --- keyboards/tkc/portico/config.h | 2 ++ keyboards/tkc/portico75/config.h | 1 + 2 files changed, 3 insertions(+) (limited to 'keyboards/tkc') diff --git a/keyboards/tkc/portico/config.h b/keyboards/tkc/portico/config.h index 9a8e19171f..5599f2a36b 100644 --- a/keyboards/tkc/portico/config.h +++ b/keyboards/tkc/portico/config.h @@ -48,6 +48,8 @@ along with this program. If not, see . #else // IS31FL3731 driver +#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND +#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC #define IS31FL3731_DRIVER_COUNT 2 #define RGB_MATRIX_LED_COUNT 67 diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h index d5b401704b..756dfbb54a 100644 --- a/keyboards/tkc/portico75/config.h +++ b/keyboards/tkc/portico75/config.h @@ -79,6 +79,7 @@ along with this program. If not, see . # define DRIVER_INDICATOR_LED_TOTAL 0 #else // WT_RGB IS31FL3741 driver code +# define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND # define IS31FL3741_DRIVER_COUNT 1 # define RGB_MATRIX_LED_COUNT 98 -- cgit v1.2.3 From b52aca0af83fade24c56b4bb7369f18183123bd3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 1 Nov 2023 11:53:45 +1100 Subject: Relocate LED driver init code (#22365) --- keyboards/tkc/portico/config.h | 2 +- keyboards/tkc/portico/portico.c | 2 +- keyboards/tkc/portico75/config.h | 2 +- keyboards/tkc/portico75/portico75.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'keyboards/tkc') diff --git a/keyboards/tkc/portico/config.h b/keyboards/tkc/portico/config.h index 5599f2a36b..2a1056b4a5 100644 --- a/keyboards/tkc/portico/config.h +++ b/keyboards/tkc/portico/config.h @@ -51,7 +51,7 @@ along with this program. If not, see . #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC #define IS31FL3731_DRIVER_COUNT 2 -#define RGB_MATRIX_LED_COUNT 67 +#define IS31FL3731_LED_COUNT 67 #define RGB_BACKLIGHT_ENABLED 1 diff --git a/keyboards/tkc/portico/portico.c b/keyboards/tkc/portico/portico.c index bbb09ef8f6..72f8754f6c 100644 --- a/keyboards/tkc/portico/portico.c +++ b/keyboards/tkc/portico/portico.c @@ -19,7 +19,7 @@ along with this program. If not, see . #ifdef RGB_MATRIX_ENABLE -const is31fl3731_led_t PROGMEM g_is31fl3731_leds[RGB_MATRIX_LED_COUNT] = { +const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { { 0, C2_1, C3_1, C4_1 }, { 0, C1_1, C3_2, C4_2 }, { 0, C1_2, C2_2, C4_3 }, diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h index 756dfbb54a..3a9b50baca 100644 --- a/keyboards/tkc/portico75/config.h +++ b/keyboards/tkc/portico75/config.h @@ -81,7 +81,7 @@ along with this program. If not, see . // WT_RGB IS31FL3741 driver code # define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND # define IS31FL3741_DRIVER_COUNT 1 -# define RGB_MATRIX_LED_COUNT 98 +# define IS31FL3741_LED_COUNT 98 # define RGB_BACKLIGHT_ENABLED 1 diff --git a/keyboards/tkc/portico75/portico75.c b/keyboards/tkc/portico75/portico75.c index 69d6256071..f0751483aa 100644 --- a/keyboards/tkc/portico75/portico75.c +++ b/keyboards/tkc/portico75/portico75.c @@ -20,7 +20,7 @@ along with this program. If not, see . #ifdef RGB_MATRIX_ENABLE -const is31fl3741_led_t PROGMEM g_is31fl3741_leds[RGB_MATRIX_LED_COUNT] = { +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}, -- cgit v1.2.3 From be66e5f2b4fb67b4d0adc18e27f5a91bdf50a429 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Nov 2023 00:58:59 +1100 Subject: WT RGB cleanups (#22379) --- keyboards/tkc/portico/portico.c | 8 +++++++- keyboards/tkc/portico75/portico75.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'keyboards/tkc') diff --git a/keyboards/tkc/portico/portico.c b/keyboards/tkc/portico/portico.c index 72f8754f6c..bd60df13e2 100644 --- a/keyboards/tkc/portico/portico.c +++ b/keyboards/tkc/portico/portico.c @@ -17,7 +17,11 @@ along with this program. If not, see . #include "portico.h" -#ifdef RGB_MATRIX_ENABLE +#ifdef RGB_BACKLIGHT_PORTICO +# include "drivers/led/issi/is31fl3731.h" +#endif + +#if defined(RGB_MATRIX_ENABLE) || defined(RGB_BACKLIGHT_PORTICO) const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { { 0, C2_1, C3_1, C4_1 }, @@ -92,7 +96,9 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { { 1, C9_16, C7_15, C6_15 }, { 1, C8_16, C7_16, C6_16 } }; +#endif +#ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }, diff --git a/keyboards/tkc/portico75/portico75.c b/keyboards/tkc/portico75/portico75.c index f0751483aa..0a22a37d4e 100644 --- a/keyboards/tkc/portico75/portico75.c +++ b/keyboards/tkc/portico75/portico75.c @@ -18,7 +18,11 @@ along with this program. If not, see . #include "portico75.h" -#ifdef RGB_MATRIX_ENABLE +#ifdef RGB_BACKLIGHT_PORTICO75 +# include "drivers/led/issi/is31fl3741.h" +#endif + +#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}, @@ -134,8 +138,10 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = { {0, CS33_SW5, CS32_SW5, CS31_SW5}, {0, CS33_SW6, CS32_SW6, CS31_SW6}, {0, CS33_SW7, CS32_SW7, CS31_SW7}, - }; +#endif + +#ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}, { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29}, -- cgit v1.2.3 From b35bac6afbadc88cf6e8e3d1c8cc7494a510bb60 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 22 Nov 2023 21:37:32 +0000 Subject: Remove unnecessary driver counts (#22435) --- keyboards/tkc/portico/config.h | 2 -- keyboards/tkc/portico68v2/config.h | 1 - keyboards/tkc/portico75/config.h | 2 -- 3 files changed, 5 deletions(-) (limited to 'keyboards/tkc') diff --git a/keyboards/tkc/portico/config.h b/keyboards/tkc/portico/config.h index 2a1056b4a5..265e0abbc3 100644 --- a/keyboards/tkc/portico/config.h +++ b/keyboards/tkc/portico/config.h @@ -41,7 +41,6 @@ along with this program. If not, see . # 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 IS31FL3731_DRIVER_COUNT 2 # 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) @@ -50,7 +49,6 @@ along with this program. If not, see . // IS31FL3731 driver #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC -#define IS31FL3731_DRIVER_COUNT 2 #define IS31FL3731_LED_COUNT 67 #define RGB_BACKLIGHT_ENABLED 1 diff --git a/keyboards/tkc/portico68v2/config.h b/keyboards/tkc/portico68v2/config.h index fdd38e3133..2c8ecf806d 100644 --- a/keyboards/tkc/portico68v2/config.h +++ b/keyboards/tkc/portico68v2/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND -#define IS31FL3741_DRIVER_COUNT 1 #define DRIVER_1_LED_TOTAL 82 #define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL #define DRIVER_INDICATOR_LED_TOTAL 0 diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h index 3a9b50baca..8146141bf0 100644 --- a/keyboards/tkc/portico75/config.h +++ b/keyboards/tkc/portico75/config.h @@ -73,14 +73,12 @@ along with this program. If not, see . # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 # define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND -# define IS31FL3741_DRIVER_COUNT 1 # define DRIVER_1_LED_TOTAL 98 # define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL # define DRIVER_INDICATOR_LED_TOTAL 0 #else // WT_RGB IS31FL3741 driver code # define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND -# define IS31FL3741_DRIVER_COUNT 1 # define IS31FL3741_LED_COUNT 98 # define RGB_BACKLIGHT_ENABLED 1 -- cgit v1.2.3 From 1ed03f498fa204178c2696c510ac6a2cd8524e2d Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 26 Nov 2023 18:36:45 +0000 Subject: Remove userspace keymaps (#22544) --- .../tkc/osav2/keymaps/brandonschlack/config.h | 30 --- .../tkc/osav2/keymaps/brandonschlack/keymap.c | 243 --------------------- .../tkc/osav2/keymaps/brandonschlack/rules.mk | 9 - keyboards/tkc/osav2/keymaps/stanrc85/keymap.c | 58 ----- keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c | 90 -------- keyboards/tkc/tkc1800/keymaps/yanfali/rules.mk | 1 - 6 files changed, 431 deletions(-) delete mode 100644 keyboards/tkc/osav2/keymaps/brandonschlack/config.h delete mode 100755 keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c delete mode 100755 keyboards/tkc/osav2/keymaps/brandonschlack/rules.mk delete mode 100644 keyboards/tkc/osav2/keymaps/stanrc85/keymap.c delete mode 100644 keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c delete mode 100644 keyboards/tkc/tkc1800/keymaps/yanfali/rules.mk (limited to 'keyboards/tkc') diff --git a/keyboards/tkc/osav2/keymaps/brandonschlack/config.h b/keyboards/tkc/osav2/keymaps/brandonschlack/config.h deleted file mode 100644 index e74d93c35f..0000000000 --- a/keyboards/tkc/osav2/keymaps/brandonschlack/config.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 Brandon Schlack - * - * 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 - -#define USE_LEDS_FOR_LAYERS -#define STOPLIGHT_LED - -#define TOP_LED C7 -#define MIDDLE_LED C6 -#define BOTTOM_LED B6 - -// #define LED_PIN_FLIP -#ifdef LED_PIN_FLIP - #define LED_ON(flag) !flag -#else - #define LED_ON(flag) flag -#endif diff --git a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c b/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c deleted file mode 100755 index 4e4d890d06..0000000000 --- a/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c +++ /dev/null @@ -1,243 +0,0 @@ -/* Copyright 2020 Brandon Schlack - * - * 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 . - */ -#include QMK_KEYBOARD_H -#include "brandonschlack.h" - -/** - * Layer Names - * - * Layers mostly used for macro keys - */ -#define _REEDER _M1 -#define _MAIL _M2 -#define _REEDER_FN _M1_FN1 -#define _MAIL_FN _M2_FN1 - -/** - * Keycodes & Macros - */ -#define TG_BASE TO(_BASE) -#define TG_REDR TO(_REEDER) -#define TG_MAIL TO(_MAIL) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Base - * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ - * │Ply│ │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│         │& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│ - * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │VlU│ │Tab  │ Q │ W │ E │ R │ T │         │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│ - * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │VlD│ │HyCaps│ A │ S │ D │ F │ G │         │ H │ J │ K │ L │: ;│" '│   Enter│ - * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - *       │LShift  │ Z │ X │ C │ V │ B │     │ B │ N │ M │< ,│> .│? /│  Shft│Fn │ - *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ - *       │Opt  │     │Cmd  │Spc/Lwr│Ctrl│   │   Spc/Rai│  Cmd│           │  Opt│ - *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ - */ -[_BASE] = LAYOUT_all( - KC_MPLY, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, - KC_VOLU, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, - KC_VOLD, HY_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, LOWER, - KC_LOPT, KC_LCMD, SPC_LWR, KC_LCTL, SPC_RAI, KC_RCMD, KC_ROPT -), -/* Reeder - * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ - * │ H │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ - * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │ K │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ - * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ J │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ - * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ - *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ - *       │     │     │     │       │    │   │          │     │           │     │ - *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ - */ -[_REEDER] = LAYOUT_all( - KC_H, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_K, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_J, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______ - -), -/* Mail - * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ - * │Del│ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ - * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │It+│ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ - * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │It-│ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ - * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ - *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ - *       │     │     │     │       │    │   │          │     │           │     │ - *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ - */ -[_MAIL] = LAYOUT_all( - G(KC_BSPC), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______ - -), -/* Lower - * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ - * │Mut│ │Mke│ F1│ F2│ F3│ F4│ F5│ F6│         │ F7│ F8│ F9│F10│F11│F12│LHP│SLP│ - * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │Nxt│ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │PgU│Hom│End│  Del│ - * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │Prv│ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │Prv│Nxt│PgD│ ↑ │   Play │ - * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - *       │        │LYR│Thm│   │   │   │     │   │   │   │   │ ← │ ↓ │→ Shft│   │ - *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ - *       │     │     │     │       │    │   │          │     │           │     │ - *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ - */ -[_LOWER] = LAYOUT_all( - KC_MUTE, QM_MAKE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MC_LHPD, MC_SLPD, - KC_MNXT, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_END, KC_DEL, - KC_MPRV, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP, KC_MPLY, - _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, RGT_SFT, _______, - _______, _______, _______, _______, _______, _______, _______ - -), -/* Reeder Function - * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ - * │ L │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ - * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │ P │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ - * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │ N │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ - * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ - *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ - *       │     │     │     │       │    │   │          │     │           │     │ - *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ - */ -[_REEDER_FN] = LAYOUT_all( - KC_L, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_P, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - KC_N, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______ - -), -/* Mail - * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ - * │Del│ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ - * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │It+│ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ - * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │It-│ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ - * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ - *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ - *       │     │     │     │       │    │   │          │     │           │     │ - *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ - */ -[_MAIL_FN] = LAYOUT_all( - KC_BSPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - A(G(KC_LBRC)), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - A(G(KC_RBRC)), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______ - -), -/* Raise - * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ - * │   │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ - * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │   │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ - * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │   │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ - * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ - *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ - *       │     │     │     │       │    │   │          │     │           │     │ - *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ - */ -[_RAISE] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______ - -), -/* Adjust - * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ - * │Bse│ │Mke│   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ - * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │Rdr│ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │   │   │   │     │ - * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │Mai│ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │   │   │   │   │        │ - * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - *       │        │LYR│Thm│   │EEP│Rst│     │Rst│   │   │   │   │   │      │   │ - *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ - *       │     │     │     │       │    │   │          │     │           │     │ - *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ - */ -[_ADJUST] = LAYOUT_all( - TG_BASE, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - TG_REDR, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, - TG_MAIL, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_LYR, RGB_THM, _______, EE_CLR, QK_BOOT, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______ - -) -/* Layout - * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐ - * │   │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │ - * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ - * │   │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │ - * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │   │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │ - * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ - *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │ - *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤ - *       │     │     │     │       │    │   │          │     │           │     │ - *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘ - */ -/* -[_BLANK] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______ - -) -*/ -}; - -layer_state_t layer_state_set_keymap(layer_state_t state) { - state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); - state = update_tri_layer_state(state, _REEDER, _LOWER, _REEDER_FN); - state = update_tri_layer_state(state, _MAIL, _LOWER, _MAIL_FN); - return state; -} - -#ifdef USE_LEDS_FOR_LAYERS -bool led_update_keymap(led_t led_state) { - writePin(TOP_LED, LED_ON(IS_LAYER_ON(_REEDER) || IS_LAYER_ON(_MAIL))); // Use for Macro Layer - writePin(MIDDLE_LED, LED_ON(IS_LAYER_ON(_FN1))); // Use for Layer 2 - writePin(BOTTOM_LED, LED_ON(led_state.caps_lock)); // Use for Caps Lock - return false; // Override default set by KB -} -#endif diff --git a/keyboards/tkc/osav2/keymaps/brandonschlack/rules.mk b/keyboards/tkc/osav2/keymaps/brandonschlack/rules.mk deleted file mode 100755 index 9c896e0d81..0000000000 --- a/keyboards/tkc/osav2/keymaps/brandonschlack/rules.mk +++ /dev/null @@ -1,9 +0,0 @@ -# Build Options -# comment out to disable the options. -# -BACKLIGHT_ENABLE = no -MOUSEKEY_ENABLE = yes # Mouse keys -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -VELOCIKEY_ENABLE = no - diff --git a/keyboards/tkc/osav2/keymaps/stanrc85/keymap.c b/keyboards/tkc/osav2/keymaps/stanrc85/keymap.c deleted file mode 100644 index 18d9edb850..0000000000 --- a/keyboards/tkc/osav2/keymaps/stanrc85/keymap.c +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright 2019 jrfhoutx - * - * 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 . - */ - -#include QMK_KEYBOARD_H -#include "stanrc85.h" - - -// Each layer gets a name for readability, which is then used in the keymap matrix below. -// The underscores don't mean anything - you can have a layer called STUFF or any other name. -// Layer names don't all need to be of the same length, obviously, and you can also skip them -// entirely and just use numbers. - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_all( - KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, KC_BSPC, - KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_PGDN, KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN2_60), - KC_LCTL, KC_LALT, LT_BPCF, KC_LGUI, LT_SPCF, TD_TWIN, TD_TCTL - ), - - [_DEFAULT] = LAYOUT_all( - KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, _______, KC_BSPC, - KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FN2_60), - KC_LCTL, KC_LALT, KC_SPC, MO(_FN1_60), KC_SPC, KC_RALT, KC_RCTL - ), - - [_FN1_60] = LAYOUT_all( - _______, KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, - _______, _______, _______, CA_QUOT, KC_VOLU, CA_SCLN, _______, _______, KC_HOME, KC_UP, KC_END, KC_PSCR, _______, _______, KC_INS, - _______, KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_MPLY, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, - _______, KC_RDP, _______, _______, _______, _______, _______, _______, KC_WBAK, KC_WFWD, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______ - ), - - [_FN2_60] = LAYOUT_all( - BL_TOGG, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, - BL_UP, VK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, - BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MAKE, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, TG(_DEFAULT) - ) -}; \ No newline at end of file diff --git a/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c b/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c deleted file mode 100644 index df8f2b9caf..0000000000 --- a/keyboards/tkc/tkc1800/keymaps/yanfali/keymap.c +++ /dev/null @@ -1,90 +0,0 @@ -/* Copyright 2017 Mathias Andersson - * - * 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 . - */ - -#include QMK_KEYBOARD_H - -//Layers - -enum { - BASE = 0, - FUNCTION, -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Keymap BASE: (Base Layer) Default Layer - * ,-------------------------------------------------------. ,-------------------. - * |Esc| F1| F2| F3| F4| | F5| F6| F7| F8| | F9|F10|F11|F12| |Ins |Home|PgUp|PrSc| - * `-------------------------------------------------------' |-------------------| - * |Del |End |PgDn|ScrL| - * ,-----------------------------------------------------------. |-------------------| - * | ~ | 1 | 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp | |NumL| / | * |Paus| - * |-----------------------------------------------------------| |-------------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ | | 7 | 8 | 9 | - | - * |-----------------------------------------------------------| |-------------------| - * |CAPS | A| S| D| F| G| H| J| K| L| ;| '|Return | | 4 | 5 | 6 | + | - * |-----------------------------------------------------------' |-------------------| - * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift | Up | 1 | 2 | 3 | Ent| - * |--------------------------------------------------------'----`--------------| | - * |Ctrl|Gui |Alt | Space |Alt |Gui|Ctr|Left |Down|Rght| 0 | . | | - * `---------------------------------------------------------------------------------' - */ - [BASE] = LAYOUT( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_HOME, KC_PGUP, KC_PSCR, - KC_DEL, KC_END, KC_PGDN, KC_SCRL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, XXXXXXX, KC_NUM, KC_PSLS, KC_PAST, KC_PAUS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, - LCTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, - KC_LSFT, XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, XXXXXXX, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(FUNCTION), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT - ), - [FUNCTION] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, XXXXXXX, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, _______, - _______, XXXXXXX, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), -}; - -#ifdef OLED_ENABLE -bool oled_task_user(void) { - oled_write_P(PSTR("TKC1800\n"),false); - // Host Keyboard Layer Status - oled_write_P(PSTR("Layer: "), false); - - switch (get_highest_layer(layer_state)) { - case BASE: - oled_write_P(PSTR("Base\n"), false); - break; - case FUNCTION: - oled_write_P(PSTR("Function\n"), false); - break; - default: - // Or use the write_ln shortcut over adding '\n' to the end of your string - oled_write_ln_P(PSTR("Undefined"), false); - } - - // Host Keyboard LED Status - led_t led_state = host_keyboard_led_state(); - oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - return false; -} -#endif diff --git a/keyboards/tkc/tkc1800/keymaps/yanfali/rules.mk b/keyboards/tkc/tkc1800/keymaps/yanfali/rules.mk deleted file mode 100644 index 517f469b6d..0000000000 --- a/keyboards/tkc/tkc1800/keymaps/yanfali/rules.mk +++ /dev/null @@ -1 +0,0 @@ -OLED_ENABLE = no -- cgit v1.2.3