From d983251c10c4bb152c746dc4e94bc954b1b82c8c Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 29 Aug 2022 02:59:40 +1000 Subject: Switch over MANUFACTURER and PRODUCT to string literals (#18183) --- keyboards/wilba_tech/wt75_b/keymaps/madhatter/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/wilba_tech') diff --git a/keyboards/wilba_tech/wt75_b/keymaps/madhatter/config.h b/keyboards/wilba_tech/wt75_b/keymaps/madhatter/config.h index afb1d86d6c..dc2a125b1e 100644 --- a/keyboards/wilba_tech/wt75_b/keymaps/madhatter/config.h +++ b/keyboards/wilba_tech/wt75_b/keymaps/madhatter/config.h @@ -1,4 +1,4 @@ #pragma once #undef PRODUCT -#define PRODUCT MadHatter\x27s Custom Singa V3 +#define PRODUCT "MadHatter's Custom Singa V3" -- cgit v1.2.3 From 36c410592dbd35da33ccc5fd6d2a5cbf4b25a708 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 23 Sep 2022 22:46:23 +1000 Subject: Change `DRIVER_LED_COUNT` to `{LED,RGB}_MATRIX_LED_COUNT` (#18399) --- keyboards/wilba_tech/rama_works_kara/config.h | 2 +- keyboards/wilba_tech/rama_works_koyu/config.h | 2 +- keyboards/wilba_tech/rama_works_m10_c/config.h | 2 +- keyboards/wilba_tech/rama_works_m50_a/config.h | 2 +- keyboards/wilba_tech/rama_works_m60_a/config.h | 2 +- keyboards/wilba_tech/rama_works_m65_b/config.h | 2 +- keyboards/wilba_tech/rama_works_m65_bx/config.h | 2 +- keyboards/wilba_tech/rama_works_u80_a/config.h | 2 +- keyboards/wilba_tech/wt60_b/config.h | 2 +- keyboards/wilba_tech/wt60_bx/config.h | 2 +- keyboards/wilba_tech/wt60_c/config.h | 2 +- keyboards/wilba_tech/wt_rgb_backlight.c | 44 ++++++++++++------------- keyboards/wilba_tech/zeal60/config.h | 2 +- keyboards/wilba_tech/zeal65/config.h | 2 +- 14 files changed, 35 insertions(+), 35 deletions(-) (limited to 'keyboards/wilba_tech') diff --git a/keyboards/wilba_tech/rama_works_kara/config.h b/keyboards/wilba_tech/rama_works_kara/config.h index 3ce58330ed..7c9489e922 100644 --- a/keyboards/wilba_tech/rama_works_kara/config.h +++ b/keyboards/wilba_tech/rama_works_kara/config.h @@ -27,7 +27,7 @@ // IS31FL3731 driver #define DRIVER_COUNT 2 -#define DRIVER_LED_TOTAL 72 +#define RGB_MATRIX_LED_COUNT 72 // COL2ROW or ROW2COL #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/wilba_tech/rama_works_koyu/config.h b/keyboards/wilba_tech/rama_works_koyu/config.h index 8a02f0bd98..9b5048d11a 100644 --- a/keyboards/wilba_tech/rama_works_koyu/config.h +++ b/keyboards/wilba_tech/rama_works_koyu/config.h @@ -27,7 +27,7 @@ // IS31FL3731 driver #define DRIVER_COUNT 2 -#define DRIVER_LED_TOTAL 72 +#define RGB_MATRIX_LED_COUNT 72 // COL2ROW or ROW2COL #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/wilba_tech/rama_works_m10_c/config.h b/keyboards/wilba_tech/rama_works_m10_c/config.h index d42c329b96..456023d414 100644 --- a/keyboards/wilba_tech/rama_works_m10_c/config.h +++ b/keyboards/wilba_tech/rama_works_m10_c/config.h @@ -47,7 +47,7 @@ // IS31FL3731 driver #define DRIVER_COUNT 1 -#define DRIVER_LED_TOTAL 12 +#define RGB_MATRIX_LED_COUNT 12 // Enable WT RGB backlight #define RGB_BACKLIGHT_ENABLED 1 diff --git a/keyboards/wilba_tech/rama_works_m50_a/config.h b/keyboards/wilba_tech/rama_works_m50_a/config.h index fb6ffd8aba..6284a4027a 100644 --- a/keyboards/wilba_tech/rama_works_m50_a/config.h +++ b/keyboards/wilba_tech/rama_works_m50_a/config.h @@ -47,7 +47,7 @@ // IS31FL3731 driver #define DRIVER_COUNT 2 -#define DRIVER_LED_TOTAL 72 +#define RGB_MATRIX_LED_COUNT 72 // Enable WT RGB backlight #define RGB_BACKLIGHT_ENABLED 1 diff --git a/keyboards/wilba_tech/rama_works_m60_a/config.h b/keyboards/wilba_tech/rama_works_m60_a/config.h index 55fa484716..22abe6ee60 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/config.h +++ b/keyboards/wilba_tech/rama_works_m60_a/config.h @@ -27,7 +27,7 @@ // IS31FL3731 driver #define DRIVER_COUNT 2 -#define DRIVER_LED_TOTAL 72 +#define RGB_MATRIX_LED_COUNT 72 // COL2ROW or ROW2COL #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/wilba_tech/rama_works_m65_b/config.h b/keyboards/wilba_tech/rama_works_m65_b/config.h index c753a93841..1982b2e8e1 100644 --- a/keyboards/wilba_tech/rama_works_m65_b/config.h +++ b/keyboards/wilba_tech/rama_works_m65_b/config.h @@ -47,7 +47,7 @@ // IS31FL3731 driver #define DRIVER_COUNT 2 -#define DRIVER_LED_TOTAL 72 +#define RGB_MATRIX_LED_COUNT 72 // Enable WT RGB backlight #define RGB_BACKLIGHT_ENABLED 1 diff --git a/keyboards/wilba_tech/rama_works_m65_bx/config.h b/keyboards/wilba_tech/rama_works_m65_bx/config.h index f0eb52940c..83c2be2001 100644 --- a/keyboards/wilba_tech/rama_works_m65_bx/config.h +++ b/keyboards/wilba_tech/rama_works_m65_bx/config.h @@ -47,7 +47,7 @@ // IS31FL3731 driver #define DRIVER_COUNT 2 -#define DRIVER_LED_TOTAL 72 +#define RGB_MATRIX_LED_COUNT 72 // Enable WT RGB backlight #define RGB_BACKLIGHT_ENABLED 1 diff --git a/keyboards/wilba_tech/rama_works_u80_a/config.h b/keyboards/wilba_tech/rama_works_u80_a/config.h index 44582ada4f..4653556190 100644 --- a/keyboards/wilba_tech/rama_works_u80_a/config.h +++ b/keyboards/wilba_tech/rama_works_u80_a/config.h @@ -99,7 +99,7 @@ // IS31FL3731 driver #define DRIVER_COUNT 3 -#define DRIVER_LED_TOTAL 108 +#define RGB_MATRIX_LED_COUNT 108 #define RGB_BACKLIGHT_ENABLED 1 diff --git a/keyboards/wilba_tech/wt60_b/config.h b/keyboards/wilba_tech/wt60_b/config.h index a68cfa5ec2..43a10844da 100644 --- a/keyboards/wilba_tech/wt60_b/config.h +++ b/keyboards/wilba_tech/wt60_b/config.h @@ -50,7 +50,7 @@ // IS31FL3731 driver #define DRIVER_COUNT 2 -#define DRIVER_LED_TOTAL 72 +#define RGB_MATRIX_LED_COUNT 72 #define RGB_BACKLIGHT_ENABLED 1 diff --git a/keyboards/wilba_tech/wt60_bx/config.h b/keyboards/wilba_tech/wt60_bx/config.h index cab8276545..d26b3a02ba 100644 --- a/keyboards/wilba_tech/wt60_bx/config.h +++ b/keyboards/wilba_tech/wt60_bx/config.h @@ -50,7 +50,7 @@ // IS31FL3731 driver #define DRIVER_COUNT 2 -#define DRIVER_LED_TOTAL 72 +#define RGB_MATRIX_LED_COUNT 72 #define RGB_BACKLIGHT_ENABLED 1 diff --git a/keyboards/wilba_tech/wt60_c/config.h b/keyboards/wilba_tech/wt60_c/config.h index 47636eef4b..489207d56c 100644 --- a/keyboards/wilba_tech/wt60_c/config.h +++ b/keyboards/wilba_tech/wt60_c/config.h @@ -50,7 +50,7 @@ // IS31FL3731 driver #define DRIVER_COUNT 2 -#define DRIVER_LED_TOTAL 72 +#define RGB_MATRIX_LED_COUNT 72 #define RGB_BACKLIGHT_ENABLED 1 diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c index a696fe7ed4..e0a04ce32c 100644 --- a/keyboards/wilba_tech/wt_rgb_backlight.c +++ b/keyboards/wilba_tech/wt_rgb_backlight.c @@ -162,7 +162,7 @@ uint32_t g_any_key_hit = 0; // ADDR_2 is not needed. it is here as a dummy #define ISSI_ADDR_1 0x50 -const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location @@ -243,7 +243,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { #define ISSI_ADDR_1 0x50 #define ISSI_ADDR_2 0x52 -const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location @@ -386,7 +386,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { // set to 0 for write, 1 for read (as per I2C protocol) #define ISSI_ADDR_1 0x74 -const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location @@ -418,7 +418,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { #define ISSI_ADDR_2 0x76 // 11101[10] <- SDA #define ISSI_ADDR_3 0x75 // 11101[01] <- SCL -const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location @@ -545,7 +545,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { #define ISSI_ADDR_1 0x74 #define ISSI_ADDR_2 0x76 -const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location @@ -626,7 +626,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { #define ISSI_ADDR_1 0x74 #define ISSI_ADDR_2 0x77 -const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location @@ -712,7 +712,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { #define ISSI_ADDR_1 0x30 #define ISSI_ADDR_2 -const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location @@ -842,7 +842,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { #define ISSI_ADDR_1 0x74 #define ISSI_ADDR_2 -const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { {0, C1_9, C3_10, C4_10}, // LB1 {0, C1_10, C2_10, C4_11}, // LB2 {0, C1_11, C2_11, C3_11}, // LB3 @@ -862,7 +862,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { #define ISSI_ADDR_1 0x74 #define ISSI_ADDR_2 0x76 -const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { +const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location @@ -1832,12 +1832,12 @@ void backlight_set_color( int index, uint8_t red, uint8_t green, uint8_t blue ) IS31FL3733_set_color( index, red, green, blue ); } #elif defined(RGB_BACKLIGHT_DAWN60) - if( index < DRIVER_LED_TOTAL ) { + if( index < RGB_MATRIX_LED_COUNT ) { IS31FL3731_set_color( index, red, green, blue ); } else { - g_ws2812_leds[index - DRIVER_LED_TOTAL].r = red; - g_ws2812_leds[index - DRIVER_LED_TOTAL].g = green; - g_ws2812_leds[index - DRIVER_LED_TOTAL].b = blue; + g_ws2812_leds[index - RGB_MATRIX_LED_COUNT].r = red; + g_ws2812_leds[index - RGB_MATRIX_LED_COUNT].g = green; + g_ws2812_leds[index - RGB_MATRIX_LED_COUNT].b = blue; ws2812_setleds(g_ws2812_leds, WS2812_LED_TOTAL); } #else @@ -2131,9 +2131,9 @@ void backlight_effect_alphas_mods(void) for (int i = 0; i < WS2812_LED_TOTAL; i++) { if ((RGB_UNDERGLOW_ALPHA_TOP_START <= i && i <= RGB_UNDERGLOW_ALPHA_TOP_END) || (RGB_UNDERGLOW_ALPHA_BOT_START <= i && i <= RGB_UNDERGLOW_ALPHA_BOT_END)) { - backlight_set_color(i + DRIVER_LED_TOTAL, rgb1.r, rgb1.g, rgb1.b); + backlight_set_color(i + RGB_MATRIX_LED_COUNT, rgb1.r, rgb1.g, rgb1.b); } else { - backlight_set_color(i + DRIVER_LED_TOTAL, rgb2.r, rgb2.g, rgb2.b); + backlight_set_color(i + RGB_MATRIX_LED_COUNT, rgb2.r, rgb2.g, rgb2.b); } } #endif @@ -2927,7 +2927,7 @@ void backlight_init_drivers(void) #elif defined(RGB_BACKLIGHT_HS60) IS31FL3733_init( ISSI_ADDR_1, 0 ); - for ( int index = 0; index < DRIVER_LED_TOTAL; index++ ) + for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ ) { #if defined(HS60_ANSI) bool enabled = !( ( index == 48-1 ) || //LA48 @@ -2949,7 +2949,7 @@ void backlight_init_drivers(void) IS31FL3733_init( ISSI_ADDR_1, 0 ); IS31FL3733_init( ISSI_ADDR_2, 0 ); - for ( int index = 0; index < DRIVER_LED_TOTAL; index++ ) + for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ ) { bool enabled = !( ( index == 61-1 ) || //LA61 ( index > 6+64-1 ) ); //LB7-LB64 @@ -2964,7 +2964,7 @@ void backlight_init_drivers(void) IS31FL3733_init( ISSI_ADDR_1, 0 ); IS31FL3733_init( ISSI_ADDR_2, 0 ); - for ( int index = 0; index < DRIVER_LED_TOTAL; index++ ) + for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ ) { bool enabled = !( ( index == 61-1 ) || //LA61 ( (index >= 2+64-1) && (index <= 4+64-1) ) || @@ -2994,7 +2994,7 @@ void backlight_init_drivers(void) IS31FL3733_init( ISSI_ADDR_1, 0 ); IS31FL3733_init( ISSI_ADDR_2, 0 ); - for ( int index = 0; index < DRIVER_LED_TOTAL; index++ ) + for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ ) { bool enabled = !( ( index == 61-1 ) || //LA61 ( index > 5+64-1 ) ); //LB6-LB64 @@ -3007,7 +3007,7 @@ void backlight_init_drivers(void) #elif defined(RGB_BACKLIGHT_PORTICO75) IS31FL3741_init( ISSI_ADDR_1 ); bool enabled = true; - for ( int index = 0; index < DRIVER_LED_TOTAL; index++ ) + for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ ) { IS31FL3741_set_led_control_register( index, enabled, enabled, enabled ); } @@ -3017,7 +3017,7 @@ void backlight_init_drivers(void) IS31FL3733_init( ISSI_ADDR_1, 0 ); IS31FL3733_init( ISSI_ADDR_2, 0 ); - for ( int index = 0; index < DRIVER_LED_TOTAL; index++ ) + for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ ) { bool enabled = !( ( index == 61-1 ) || //LA61 ( index > 6+64-1 ) ); //LB7-LB64 @@ -3044,7 +3044,7 @@ void backlight_init_drivers(void) bool disable_spacebar_stab_leds = false; #endif - for ( int index = 0; index < DRIVER_LED_TOTAL; index++ ) + for ( int index = 0; index < RGB_MATRIX_LED_COUNT; index++ ) { // OR the possible "disabled" cases together, then NOT the result to get the enabled state // LC6 LD13 not present on Zeal65 diff --git a/keyboards/wilba_tech/zeal60/config.h b/keyboards/wilba_tech/zeal60/config.h index b3c0477342..eaf7b76504 100644 --- a/keyboards/wilba_tech/zeal60/config.h +++ b/keyboards/wilba_tech/zeal60/config.h @@ -27,7 +27,7 @@ // IS31FL3731 driver #define DRIVER_COUNT 2 -#define DRIVER_LED_TOTAL 72 +#define RGB_MATRIX_LED_COUNT 72 // COL2ROW or ROW2COL #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/wilba_tech/zeal65/config.h b/keyboards/wilba_tech/zeal65/config.h index 27f4fd4b44..d5e83a11e3 100644 --- a/keyboards/wilba_tech/zeal65/config.h +++ b/keyboards/wilba_tech/zeal65/config.h @@ -27,7 +27,7 @@ // IS31FL3731 driver #define DRIVER_COUNT 2 -#define DRIVER_LED_TOTAL 72 +#define RGB_MATRIX_LED_COUNT 72 // COL2ROW or ROW2COL #define DIODE_DIRECTION COL2ROW -- cgit v1.2.3 From 2791ceb6aa000bce07638ad117a73eba4df0e3f6 Mon Sep 17 00:00:00 2001 From: Wilba Date: Sat, 24 Sep 2022 09:39:55 +1000 Subject: Add caps lock and scroll lock indicators (#17725) --- keyboards/wilba_tech/wt60_a/config.h | 4 ++-- keyboards/wilba_tech/wt65_a/config.h | 3 +++ keyboards/wilba_tech/wt65_b/config.h | 3 +++ keyboards/wilba_tech/wt75_b/config.h | 3 +++ keyboards/wilba_tech/wt75_c/config.h | 3 +++ keyboards/wilba_tech/wt80_a/config.h | 3 +++ keyboards/wilba_tech/wt_mono_backlight.c | 27 +++++++++++++++++++++++++++ 7 files changed, 44 insertions(+), 2 deletions(-) (limited to 'keyboards/wilba_tech') diff --git a/keyboards/wilba_tech/wt60_a/config.h b/keyboards/wilba_tech/wt60_a/config.h index 8bd0e08508..c2b85fee76 100644 --- a/keyboards/wilba_tech/wt60_a/config.h +++ b/keyboards/wilba_tech/wt60_a/config.h @@ -100,8 +100,8 @@ // enable the mono backlight #define MONO_BACKLIGHT_ENABLED 1 -// enable the RGB indicator for WT75-A -#define MONO_BACKLIGHT_WT75_A +// enable the specific indicators +#define MONO_BACKLIGHT_WT60_A // disable backlight when USB suspended (PC sleep/hibernate/shutdown) #define MONO_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0 diff --git a/keyboards/wilba_tech/wt65_a/config.h b/keyboards/wilba_tech/wt65_a/config.h index 5a03ec52c1..062e2d8564 100644 --- a/keyboards/wilba_tech/wt65_a/config.h +++ b/keyboards/wilba_tech/wt65_a/config.h @@ -100,6 +100,9 @@ // enable the mono backlight #define MONO_BACKLIGHT_ENABLED 1 +// enable the specific indicators +#define MONO_BACKLIGHT_WT65_A + // disable backlight when USB suspended (PC sleep/hibernate/shutdown) #define MONO_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0 diff --git a/keyboards/wilba_tech/wt65_b/config.h b/keyboards/wilba_tech/wt65_b/config.h index 426a0b824b..8320daef0a 100644 --- a/keyboards/wilba_tech/wt65_b/config.h +++ b/keyboards/wilba_tech/wt65_b/config.h @@ -100,6 +100,9 @@ // enable the mono backlight #define MONO_BACKLIGHT_ENABLED 1 +// enable the specific indicators +#define MONO_BACKLIGHT_WT65_B + // disable backlight when USB suspended (PC sleep/hibernate/shutdown) #define MONO_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0 diff --git a/keyboards/wilba_tech/wt75_b/config.h b/keyboards/wilba_tech/wt75_b/config.h index d7abac199e..98b3d937f9 100644 --- a/keyboards/wilba_tech/wt75_b/config.h +++ b/keyboards/wilba_tech/wt75_b/config.h @@ -100,6 +100,9 @@ // enable the mono backlight #define MONO_BACKLIGHT_ENABLED 1 +// enable the specific indicators +#define MONO_BACKLIGHT_WT75_B + // disable backlight when USB suspended (PC sleep/hibernate/shutdown) #define MONO_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0 diff --git a/keyboards/wilba_tech/wt75_c/config.h b/keyboards/wilba_tech/wt75_c/config.h index 8562e8e18a..d8cf5a1a95 100644 --- a/keyboards/wilba_tech/wt75_c/config.h +++ b/keyboards/wilba_tech/wt75_c/config.h @@ -100,6 +100,9 @@ // enable the mono backlight #define MONO_BACKLIGHT_ENABLED 1 +// enable the specific indicators +#define MONO_BACKLIGHT_WT75_C + // disable backlight when USB suspended (PC sleep/hibernate/shutdown) #define MONO_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0 diff --git a/keyboards/wilba_tech/wt80_a/config.h b/keyboards/wilba_tech/wt80_a/config.h index f9708ab33b..2bc81b2fa5 100644 --- a/keyboards/wilba_tech/wt80_a/config.h +++ b/keyboards/wilba_tech/wt80_a/config.h @@ -100,6 +100,9 @@ // enable the mono backlight #define MONO_BACKLIGHT_ENABLED 1 +// enable the specific indicators +#define MONO_BACKLIGHT_WT80_A + // disable backlight when USB suspended (PC sleep/hibernate/shutdown) #define MONO_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0 diff --git a/keyboards/wilba_tech/wt_mono_backlight.c b/keyboards/wilba_tech/wt_mono_backlight.c index 5e2fde810c..71bf8e0284 100644 --- a/keyboards/wilba_tech/wt_mono_backlight.c +++ b/keyboards/wilba_tech/wt_mono_backlight.c @@ -173,6 +173,33 @@ void backlight_effect_indicators(void) IS31FL3736_mono_set_brightness(63, rgb.g); IS31FL3736_mono_set_brightness(71, rgb.b); #endif // MONO_BACKLIGHT_WT75_A + +// This pairs with "All Off" already setting zero brightness, +// and "All On" already setting non-zero brightness. +#if defined(MONO_BACKLIGHT_WT60_A) || \ +defined(MONO_BACKLIGHT_WT65_A) || \ +defined(MONO_BACKLIGHT_WT65_B) || \ +defined(MONO_BACKLIGHT_WT75_A) || \ +defined(MONO_BACKLIGHT_WT75_B) || \ +defined(MONO_BACKLIGHT_WT75_C) || \ +defined(MONO_BACKLIGHT_WT80_A) + if ( g_indicator_state & (1< (4*8+0) + IS31FL3736_mono_set_brightness(32, 255); + } +#endif +#if defined(MONO_BACKLIGHT_WT80_A) + if ( g_indicator_state & (1< (6*8+6) + IS31FL3736_mono_set_brightness(54, 255); + } +#endif +#if defined(MONO_BACKLIGHT_WT75_C) + if ( g_indicator_state & (1< (6*8+7) + IS31FL3736_mono_set_brightness(55, 255); + } +#endif } ISR(TIMER3_COMPA_vect) -- cgit v1.2.3 From adcdacf93c7d83306e794fad8f6c3c1ba19bd414 Mon Sep 17 00:00:00 2001 From: ZyberSE Date: Fri, 30 Sep 2022 04:01:33 +0200 Subject: [Keymap] Personal user space code and keymaps by ZyBeR (#18512) Co-authored-by: ZyBeR --- .../rama_works_m60_a/keymaps/zyber/config.h | 8 +++++ .../rama_works_m60_a/keymaps/zyber/keymap.c | 42 ++++++++++++++++++++++ .../rama_works_m60_a/keymaps/zyber/rules.mk | 1 + keyboards/wilba_tech/zeal65/keymaps/zyber/config.h | 31 ++++++++++++++++ keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c | 39 ++++++++++++++++++++ 5 files changed, 121 insertions(+) create mode 100644 keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/config.h create mode 100644 keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c create mode 100644 keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/rules.mk create mode 100644 keyboards/wilba_tech/zeal65/keymaps/zyber/config.h create mode 100644 keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c (limited to 'keyboards/wilba_tech') diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/config.h b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/config.h new file mode 100644 index 0000000000..9ad052aab4 --- /dev/null +++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/config.h @@ -0,0 +1,8 @@ +// Copyright 2022 ZyBeR (@ZyberSE) +// SPDX-License-Identifier: GPL-2.0 + +#pragma once +#undef PRODUCT +#define PRODUCT RAMA WORKS M60-A Seq2 +#undef DESCRIPTION +#define DESCRIPTION RAMA WORKS M60-A Seq2 diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c new file mode 100644 index 0000000000..ea1f771b2c --- /dev/null +++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c @@ -0,0 +1,42 @@ +// Copyright 2022 ZyBeR (@ZyberSE) +// SPDX-License-Identifier: GPL-2.0 + +#include "zyber.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +// Default layer +[0] = LAYOUT_60_hhkb( + KC_ESC, KC_1, KC_2, KC_3,TD(SSHT), KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, TD(LBRC), KC_RBRC, KC_BSPC, + CTRL_C_UP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TD(SCLN), TD(QUOT), KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, FN_MO13, + KC_LALT, KC_LGUI, KC_SPC, KC_RALT, FN_MO23), + +// Fn1 Layer +[1] = LAYOUT_60_hhkb( + KC_GRV, 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_DEL, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, + KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + +// Fn2 Layer +[2] = LAYOUT_60_hhkb( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + +// Fn3 Layer (zeal60 Configuration) +[3] = LAYOUT_60_hhkb( + RESET, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC, BR_INC, KC_TRNS, EEP_RST, + KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, ES_DEC, ES_INC, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + +}; + + diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/rules.mk b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/rules.mk new file mode 100644 index 0000000000..961bb9bab8 --- /dev/null +++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/rules.mk @@ -0,0 +1 @@ +DYNAMIC_KEYMAP_ENABLE = no \ No newline at end of file diff --git a/keyboards/wilba_tech/zeal65/keymaps/zyber/config.h b/keyboards/wilba_tech/zeal65/keymaps/zyber/config.h new file mode 100644 index 0000000000..2d35bacc56 --- /dev/null +++ b/keyboards/wilba_tech/zeal65/keymaps/zyber/config.h @@ -0,0 +1,31 @@ +// Copyright 2022 ZyBeR (@ZyberSE) +// SPDX-License-Identifier: GPL-2.0 + +#pragma once + +/** + * Enable/disable LEDs based on layout + */ +#undef RGB_BACKLIGHT_USE_SPLIT_BACKSPACE +#define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 0 + + +/** + * Switch off Backlight when computer is suspended + */ +#undef RGB_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED +#define RGB_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 1 + + +/** + * Use http://colorizer.org/ to get a 0-360 hue value + * then convert it into a 0-255 value with n = (hue / 360 * 255). + */ +#undef RGB_BACKLIGHT_CAPS_LOCK_INDICATOR +#define RGB_BACKLIGHT_CAPS_LOCK_INDICATOR { .color = { .h = 255, .s = 255 }, .index = 254 } +#undef RGB_BACKLIGHT_LAYER_1_INDICATOR +#define RGB_BACKLIGHT_LAYER_1_INDICATOR { .color = { .h = 87, .s = 255 }, .index = 254 } +#undef RGB_BACKLIGHT_LAYER_2_INDICATOR +#define RGB_BACKLIGHT_LAYER_2_INDICATOR { .color = { .h = 167, .s = 255 }, .index = 254 } +#undef RGB_BACKLIGHT_LAYER_3_INDICATOR +#define RGB_BACKLIGHT_LAYER_3_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 } diff --git a/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c new file mode 100644 index 0000000000..747f2dd00c --- /dev/null +++ b/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c @@ -0,0 +1,39 @@ +// Copyright 2022 ZyBeR (@ZyberSE) +// SPDX-License-Identifier: GPL-2.0 + +#include "zyber.h" + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // Default layer + [0] = LAYOUT_65_normie( + QK_GESC, KC_1, KC_2, KC_3, TD(SSHT),KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, TD(LBRC), KC_RBRC, KC_BSLS, TD(END_HOME), + CTRL_C_UP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, TD(SCLN), TD(QUOT), KC_ENT, KC_PGUP, + KC_LSFT, 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_PGDN, + KC_LALT, KC_LCMD, KC_SPC, FN_MO23, FN_MO13, KC_LEFT, KC_DOWN, KC_RGHT), + + // Fn1 Layer + [1] = LAYOUT_65_normie( + KC_GRV, 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_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + // Fn2 Layer + [2] = LAYOUT_65_normie( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + // Fn3 Layer (zeal60 Configuration) + [3] = LAYOUT_65_normie( + RESET, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC, BR_INC, EEP_RST, KC_TRNS, + C_BLK, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +}; -- cgit v1.2.3 From e068f7a8d1ff3a849011cf090ce63ad1fe063e7b Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 1 Oct 2022 17:47:12 +0100 Subject: RESET -> QK_BOOT user keymaps (#18560) --- keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c | 2 +- keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/wilba_tech') diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c index ea1f771b2c..36d2d6efcd 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c +++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn3 Layer (zeal60 Configuration) [3] = LAYOUT_60_hhkb( - RESET, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC, BR_INC, KC_TRNS, EEP_RST, + QK_BOOT, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC, BR_INC, KC_TRNS, EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, ES_DEC, ES_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c b/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c index 747f2dd00c..4129317289 100644 --- a/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c +++ b/keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn3 Layer (zeal60 Configuration) [3] = LAYOUT_65_normie( - RESET, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC, BR_INC, EEP_RST, KC_TRNS, + QK_BOOT, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC, BR_INC, EEP_RST, KC_TRNS, C_BLK, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -- cgit v1.2.3 From e96d8297246f6858adf257a8892e719695f83c45 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 12 Oct 2022 00:21:47 +1100 Subject: Remove legacy keycodes, part 3 (#18669) * `KC__VOLDOWN` -> `KC_VOLD` * `KC__VOLUP` -> `KC_VOLU` * `KC__MUTE` -> `KC_MUTE` * `KC_POWER` -> `KC_PWR` --- keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/wilba_tech') diff --git a/keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c b/keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c index d4f7e3448a..0a3e7b936e 100644 --- a/keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c +++ b/keyboards/wilba_tech/wt8_a/keymaps/rys/keymap.c @@ -55,8 +55,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `---------------------------' */ [_BL0] = LAYOUT( - STOKEN1, STOKEN2, STOKEN3, STOKEN4, - MO(_FL1), MACOSLK, KC__VOLDOWN, KC__VOLUP), + STOKEN1, STOKEN2, STOKEN3, STOKEN4, + MO(_FL1), MACOSLK, KC_VOLD, KC_VOLU), /* Keymap base layer (_FL1) - function layer 1 * ,---------------------------. * | | | | | -- cgit v1.2.3 From a9e5e230634e61210401631a60369b346e76381a Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 13 Oct 2022 04:17:20 +0100 Subject: Remove keymaps that still reference legacy macros (#18693) --- .../wilba_tech/zeal60/keymaps/ryanmaclean/config.h | 21 ------ .../wilba_tech/zeal60/keymaps/ryanmaclean/keymap.c | 84 ---------------------- 2 files changed, 105 deletions(-) delete mode 100644 keyboards/wilba_tech/zeal60/keymaps/ryanmaclean/config.h delete mode 100644 keyboards/wilba_tech/zeal60/keymaps/ryanmaclean/keymap.c (limited to 'keyboards/wilba_tech') diff --git a/keyboards/wilba_tech/zeal60/keymaps/ryanmaclean/config.h b/keyboards/wilba_tech/zeal60/keymaps/ryanmaclean/config.h deleted file mode 100644 index f1531eb345..0000000000 --- a/keyboards/wilba_tech/zeal60/keymaps/ryanmaclean/config.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -/* enable/disable LEDs based on layout */ -#undef RGB_BACKLIGHT_USE_SPLIT_BACKSPACE -#define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 1 - -#undef RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT -#define RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT 0 - -#undef RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT -#define RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT 1 - -#undef RGB_BACKLIGHT_USE_7U_SPACEBAR -#define RGB_BACKLIGHT_USE_7U_SPACEBAR 0 - -#undef RGB_BACKLIGHT_USE_ISO_ENTER -#define RGB_BACKLIGHT_USE_ISO_ENTER 0 - -#undef RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS -#define RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS 0 - diff --git a/keyboards/wilba_tech/zeal60/keymaps/ryanmaclean/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/ryanmaclean/keymap.c deleted file mode 100644 index 2e342b497c..0000000000 --- a/keyboards/wilba_tech/zeal60/keymaps/ryanmaclean/keymap.c +++ /dev/null @@ -1,84 +0,0 @@ -// Ryan MacLean's layout for Zeal60 -// Note that LGUI and RGUI are swapped with LALT and RALT respectively, for use with Macs -// Also note that Control has replaced Caps Lock, and that pressing left or right shift once -// will output left parenthese and right parenthese respectively. -#include QMK_KEYBOARD_H - -// [0,13] is either left key of split backspace (e.g. HHKB \| key) or 2U backspace -// [1,13] is either backslash or ISO Enter -// [2,12] is either ANSI Enter or key left of ISO Enter -// [2,13] is right key of split backspace (e.g. HHKB `~ key) -// [3,1] is right key of split left-shift (e.g ISO key) -// [3,13] is right key of split right-shift (e.g. HHKB Fn key) - - - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) // this is the function signature -- just copy/paste it into your keymap file as it is. KC_LSFT KC_LALT KC_LGUI KC_4 -{ - switch(id) { - case 0: // macOS screenshot to capture are to clipboard - this would trigger when you hit a key mapped as M(0) - if (record->event.pressed) { - return MACRO( D(LSFT), D(LCTL), D(LGUI), T(4), U(LSFT), U(LCTL), U(LGUI), W(255), END ); // this sends the string 'hello' when the macro executes - } - break; - case 1: // macOS screenshot capture area to file - this would trigger when you hit a key mapped as M(1) - if (record->event.pressed) { - return MACRO( D(LSFT), D(LGUI), T(4), U(LSFT), U(LGUI), W(255), END ); // this sends the string 'hello' when the macro executes - } - break; - case 2: // macOS screenshot to clipboard - this would trigger when you hit a key mapped as M(2) - if (record->event.pressed) { - return MACRO( D(LSFT), D(LCTL), D(LGUI), T(3), U(LSFT), U(LCTL), U(LGUI), W(255), END ); // this sends the string 'hello' when the macro executes - } - break; - case 3: // macOS screenshot to file - this would trigger when you hit a key mapped as M(3) - if (record->event.pressed) { - return MACRO( D(LSFT), D(LGUI), T(3), U(LSFT), U(LGUI), W(255), END ); // this sends the string 'hello' when the macro executes - } - break; - } - return MACRO_NONE; -}; - -#define CADETL MT(KC_LSFT, KC_LBRC) -#define CADETR MT(KC_RSFT, KC_RBRC) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -// Default layer -[0] = { - {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_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_LGUI, 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_GRV}, - {KC_LSPO, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, FN_MO13}, - {KC_LCTL, KC_LALT, KC_LGUI, KC_NO, KC_NO, KC_NO, KC_NO, KC_SPC, KC_NO, KC_NO, KC_RGUI, KC_RALT, KC_RCTL, FN_MO23} -}, - -// Fn1 Layer -[1] = { - {KC_GRV, 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_TRNS}, - {KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL}, - {KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS}, - {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, KC_PGDN, KC_TRNS, KC_TRNS}, - {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} -}, - -// Fn2 Layer -[2] = { - {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}, - {KC_TRNS, M(2), M(3), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}, - {KC_TRNS, M(1), M(0), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}, - {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}, - {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} -}, - -// Fn3 Layer (zeal60 Configuration) -[3] = { - {KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BR_DEC, BR_INC, KC_TRNS}, - {KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}, - {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}, - {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS}, - {KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS} -} - -}; -- cgit v1.2.3 From 4a74e3d02d585ff099c5f900eb05ce3c16c985d7 Mon Sep 17 00:00:00 2001 From: Wilba Date: Thu, 13 Oct 2022 18:14:58 +1100 Subject: Fix Caps Lock indicators on Wilba Tech PCBs (#18695) --- keyboards/wilba_tech/wt_main.c | 8 -------- keyboards/wilba_tech/wt_mono_backlight.c | 24 ++++++++++-------------- keyboards/wilba_tech/wt_mono_backlight.h | 1 - keyboards/wilba_tech/wt_rgb_backlight.c | 9 +-------- keyboards/wilba_tech/wt_rgb_backlight.h | 1 - 5 files changed, 11 insertions(+), 32 deletions(-) (limited to 'keyboards/wilba_tech') diff --git a/keyboards/wilba_tech/wt_main.c b/keyboards/wilba_tech/wt_main.c index a7afeb5907..bc1a1d3c87 100644 --- a/keyboards/wilba_tech/wt_main.c +++ b/keyboards/wilba_tech/wt_main.c @@ -115,14 +115,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) return process_record_user(keycode, record); } -void led_set_kb(uint8_t usb_led) -{ -#if RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED - backlight_set_indicator_state(usb_led); -#endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED - led_set_user(usb_led); -} - void suspend_power_down_kb(void) { #if RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED diff --git a/keyboards/wilba_tech/wt_mono_backlight.c b/keyboards/wilba_tech/wt_mono_backlight.c index 71bf8e0284..0fc6e346a1 100644 --- a/keyboards/wilba_tech/wt_mono_backlight.c +++ b/keyboards/wilba_tech/wt_mono_backlight.c @@ -53,7 +53,6 @@ backlight_config g_config = { }; bool g_suspend_state = false; -uint8_t g_indicator_state = 0; // Global tick at 20 Hz uint32_t g_tick = 0; @@ -118,11 +117,6 @@ void backlight_set_suspend_state(bool state) g_suspend_state = state; } -void backlight_set_indicator_state(uint8_t state) -{ - g_indicator_state = state; -} - void backlight_set_brightness_all( uint8_t value ) { IS31FL3736_mono_set_brightness_all( value ); @@ -168,7 +162,9 @@ void backlight_effect_indicators(void) #if defined(MONO_BACKLIGHT_WT75_A) HSV hsv = { .h = g_config.color_1.h, .s = g_config.color_1.s, .v = g_config.brightness }; RGB rgb = hsv_to_rgb( hsv ); - // G8, H8, I8 -> (6*8+7) (7*8+7), (8*8+7) + // SW7,CS8 = (6*8+7) = 55 + // SW8,CS8 = (7*8+7) = 63 + // SW9,CS8 = (8*8+7) = 71 IS31FL3736_mono_set_brightness(55, rgb.r); IS31FL3736_mono_set_brightness(63, rgb.g); IS31FL3736_mono_set_brightness(71, rgb.b); @@ -183,20 +179,20 @@ defined(MONO_BACKLIGHT_WT75_A) || \ defined(MONO_BACKLIGHT_WT75_B) || \ defined(MONO_BACKLIGHT_WT75_C) || \ defined(MONO_BACKLIGHT_WT80_A) - if ( g_indicator_state & (1< (4*8+0) - IS31FL3736_mono_set_brightness(32, 255); + if ( host_keyboard_led_state().caps_lock ) { + // SW3,CS1 = (2*8+0) = 16 + IS31FL3736_mono_set_brightness(16, 255); } #endif #if defined(MONO_BACKLIGHT_WT80_A) - if ( g_indicator_state & (1< (6*8+6) + if ( host_keyboard_led_state().scroll_lock ) { + // SW7,CS7 = (6*8+6) = 54 IS31FL3736_mono_set_brightness(54, 255); } #endif #if defined(MONO_BACKLIGHT_WT75_C) - if ( g_indicator_state & (1< (6*8+7) + if ( host_keyboard_led_state().scroll_lock ) { + // SW7,CS8 = (6*8+7) = 55 IS31FL3736_mono_set_brightness(55, 255); } #endif diff --git a/keyboards/wilba_tech/wt_mono_backlight.h b/keyboards/wilba_tech/wt_mono_backlight.h index 2f913d2cb6..88183fd847 100644 --- a/keyboards/wilba_tech/wt_mono_backlight.h +++ b/keyboards/wilba_tech/wt_mono_backlight.h @@ -56,7 +56,6 @@ void backlight_timer_enable(void); void backlight_timer_disable(void); void backlight_set_suspend_state(bool state); -void backlight_set_indicator_state(uint8_t state); // This should not be called from an interrupt // (eg. from a timer interrupt). diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c index a696fe7ed4..af4b84c5cf 100644 --- a/keyboards/wilba_tech/wt_rgb_backlight.c +++ b/keyboards/wilba_tech/wt_rgb_backlight.c @@ -144,7 +144,6 @@ backlight_config g_config = { }; bool g_suspend_state = false; -uint8_t g_indicator_state = 0; // Global tick at 20 Hz uint32_t g_tick = 0; @@ -1982,11 +1981,6 @@ void backlight_set_suspend_state(bool state) g_suspend_state = state; } -void backlight_set_indicator_state(uint8_t state) -{ - g_indicator_state = state; -} - void backlight_effect_rgb_test(void) { // Mask out bits 4 and 5 @@ -2425,8 +2419,7 @@ void backlight_effect_indicators_set_colors( uint8_t index, HS color ) // colors already set void backlight_effect_indicators(void) { - if ( g_config.caps_lock_indicator.index != 255 && - ( g_indicator_state & (1< Date: Sat, 15 Oct 2022 09:55:53 -0700 Subject: Remove RGBLIGHT_ANIMATION and clean up effect defines for R-Z (#18728) --- keyboards/wilba_tech/wt70_jb/config.h | 11 ++++++++++- keyboards/wilba_tech/zeal60/keymaps/tusing/README.md | 3 +-- keyboards/wilba_tech/zeal60/keymaps/tusing/config.h | 11 ++++++++++- 3 files changed, 21 insertions(+), 4 deletions(-) (limited to 'keyboards/wilba_tech') diff --git a/keyboards/wilba_tech/wt70_jb/config.h b/keyboards/wilba_tech/wt70_jb/config.h index fbcfdc77ba..d75e258889 100644 --- a/keyboards/wilba_tech/wt70_jb/config.h +++ b/keyboards/wilba_tech/wt70_jb/config.h @@ -52,5 +52,14 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 - #define RGBLIGHT_ANIMATIONS +#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 #endif diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md b/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md index edddf1c58f..8688892e59 100644 --- a/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md +++ b/keyboards/wilba_tech/zeal60/keymaps/tusing/README.md @@ -37,7 +37,6 @@ You might find the [**full PCB image**](https://cdn.shopify.com/s/files/1/0490/7 ```c // Set up RGB underglow. #define RGB_DI_PIN B0 // The pin your RGB strip is wired to - #define RGBLIGHT_ANIMATIONS // Require for fancier stuff (not compatible with audio) #define RGBLED_NUM 35 // Number of LEDs #define RGBLIGHT_HUE_STEP 5 // How much each press of rgb_hue changes hue #define RGBLIGHT_SAT_STEP 10 // How much each press of rgb_sat changes sat @@ -77,4 +76,4 @@ USB 2.0 ports on laptops provide up to 500mA max, but USB 3.0 ports can provide * [A selection of 900mA-1.5A current hold fuses - look for an SMD 0805-sized fuse.](https://goo.gl/748avG) * [Video detailing technique to solder 0805 resistors](https://www.youtube.com/watch?v=PU7wLcuqc-I&t=123s&list=FLheMlKEVQ5cmVXazUt6HrxQ&index=2) * [QMK feature request to implement max power draw limits in ```config.h```](https://github.com/jackhumbert/qmk_firmware/issues/954) -* [Commit enabling max power draw limits in ```config.h```](https://github.com/jackhumbert/qmk_firmware/commit/83e613ad239459582ae28f78b6c81535b9b138d7) \ No newline at end of file +* [Commit enabling max power draw limits in ```config.h```](https://github.com/jackhumbert/qmk_firmware/commit/83e613ad239459582ae28f78b6c81535b9b138d7) diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h b/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h index 64aaece501..b106ebc181 100644 --- a/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h +++ b/keyboards/wilba_tech/zeal60/keymaps/tusing/config.h @@ -21,7 +21,16 @@ // Set up RGB underglow. #define RGB_DI_PIN B0 // The pin your RGB strip is wired to -#define RGBLIGHT_ANIMATIONS // Require for fancier stuff (not compatible with audio) +#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 35 // Number of LEDs #define RGBLIGHT_HUE_STEP 5 // How much each press of rgb_hue changes hue #define RGBLIGHT_SAT_STEP 10 // How much each press of rgb_sat changes sat -- cgit v1.2.3 From 5e4b076af3c99d36632d6b92f3ddd046f38a01af Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 16 Oct 2022 08:29:43 +1100 Subject: Remove legacy keycodes, part 5 (#18710) * `KC_SLCK` -> `KC_SCRL` * `KC_NLCK` -> `KC_NUM` --- keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/rama_works_koyu/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/rama_works_koyu/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c | 2 +- keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c | 2 +- keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c | 2 +- keyboards/wilba_tech/rama_works_m65_b/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/rama_works_m65_b/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/rama_works_m65_bx/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/rama_works_m65_bx/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/rama_works_u80_a/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/rama_works_u80_a/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/wt60_a/keymaps/ansi_split_bs_rshift/keymap.c | 2 +- keyboards/wilba_tech/wt60_a/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt60_a/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/wt60_d/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt60_d/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/wt60_g/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt60_g2/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt60_h2/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt60_h3/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt60_xt/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt60_xt/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/wt65_a/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt65_a/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/wt65_b/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt65_b/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/wt65_d/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt65_f/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt65_fx/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt65_g/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt65_g2/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt65_h1/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt65_xt/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt65_xt/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/wt65_xtx/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt65_xtx/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/wt69_a/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt69_a/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/wt70_jb/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt80_a/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt80_a/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/wt80_bc/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/wt80_bc/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/wt80_g/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c | 2 +- keyboards/wilba_tech/zeal60/keymaps/crd/keymap.c | 2 +- keyboards/wilba_tech/zeal60/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c | 2 +- keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c | 2 +- keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c | 2 +- keyboards/wilba_tech/zeal60/keymaps/tusing/keymap.c | 2 +- keyboards/wilba_tech/zeal60/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/zeal65/keymaps/default/keymap.c | 2 +- keyboards/wilba_tech/zeal65/keymaps/split_bs/keymap.c | 2 +- keyboards/wilba_tech/zeal65/keymaps/via/keymap.c | 2 +- keyboards/wilba_tech/zeal65/keymaps/zyber/keymap.c | 2 +- 66 files changed, 66 insertions(+), 66 deletions(-) (limited to 'keyboards/wilba_tech') diff --git a/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c index 15f654de0c..27dc90f721 100644 --- a/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c +++ b/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_60_hhkb( KC_GRV, 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_DEL, - KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/wilba_tech/rama_works_koyu/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_koyu/keymaps/default/keymap.c index f6bc94fbd6..cec0cf4b76 100644 --- a/keyboards/wilba_tech/rama_works_koyu/keymaps/default/keymap.c +++ b/keyboards/wilba_tech/rama_works_koyu/keymaps/default/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_all( KC_GRV, 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_DEL, KC_TRNS, - KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/wilba_tech/rama_works_koyu/keymaps/via/keymap.c b/keyboards/wilba_tech/rama_works_koyu/keymaps/via/keymap.c index f6bc94fbd6..cec0cf4b76 100644 --- a/keyboards/wilba_tech/rama_works_koyu/keymaps/via/keymap.c +++ b/keyboards/wilba_tech/rama_works_koyu/keymaps/via/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_all( KC_GRV, 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_DEL, KC_TRNS, - KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c index 7b6d9b756c..c3ff625388 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c +++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_60_hhkb( KC_GRV, 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_DEL, - KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c index b1ed28b001..03f0eaad2f 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c +++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/mguterl/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [HHKB] = LAYOUT_60_hhkb( KC_GRV, 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_DEL, - KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, _______, _______, _______, _______), diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c index 7b6d9b756c..c3ff625388 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c +++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_60_hhkb( KC_GRV, 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_DEL, - KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c index 7b6d9b756c..c3ff625388 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c +++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_60_hhkb( KC_GRV, 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_DEL, - KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c index 36d2d6efcd..2973f2eced 100644 --- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c +++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c @@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_60_hhkb( KC_GRV, 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_DEL, - KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/wilba_tech/rama_works_m65_b/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_m65_b/keymaps/default/keymap.c index 6af46ab132..3705a733bf 100644 --- a/keyboards/wilba_tech/rama_works_m65_b/keymaps/default/keymap.c +++ b/keyboards/wilba_tech/rama_works_m65_b/keymaps/default/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Fn1 Layer [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, K