From 997a6747ee83c87de92d9444e2bc57c981dbf260 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 2 Oct 2023 11:49:53 +0100 Subject: [PATCH] Miscellaneous fixes for recently merged keyboards (#22179) --- keyboards/bastardkb/dilemma/4x6_4/config.h | 8 ----- keyboards/bastardkb/dilemma/4x6_4/info.json | 3 +- keyboards/bastardkb/dilemma/4x6_4/rules.mk | 2 -- keyboards/doio/kb12/config.h | 1 - keyboards/era/klein/config.h | 2 -- keyboards/keychron/q9_plus/config.h | 4 --- keyboards/keychron/q9_plus/q9_plus.c | 1 - keyboards/qck75/v1/config.h | 2 -- keyboards/sofle_choc/info.json | 36 ++++++++++++++++++++- keyboards/sofle_choc/keymaps/via/rules.mk | 5 +++ 10 files changed, 42 insertions(+), 22 deletions(-) diff --git a/keyboards/bastardkb/dilemma/4x6_4/config.h b/keyboards/bastardkb/dilemma/4x6_4/config.h index a8240177505..9c76cb76f9e 100644 --- a/keyboards/bastardkb/dilemma/4x6_4/config.h +++ b/keyboards/bastardkb/dilemma/4x6_4/config.h @@ -50,13 +50,5 @@ #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Startup values. -#define RGB_MATRIX_DEFAULT_HUE 0 -#define RGB_MATRIX_DEFAULT_SAT 255 #define RGB_MATRIX_DEFAULT_VAL 64 - -// Rainbow swirl as startup mode. -#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT - -// Slow swirl at startup. #define RGB_MATRIX_DEFAULT_SPD 32 diff --git a/keyboards/bastardkb/dilemma/4x6_4/info.json b/keyboards/bastardkb/dilemma/4x6_4/info.json index 7b3aaf55673..ba07a7fccf2 100644 --- a/keyboards/bastardkb/dilemma/4x6_4/info.json +++ b/keyboards/bastardkb/dilemma/4x6_4/info.json @@ -33,7 +33,8 @@ "mousekey": true, "nkro": true, "rgb_matrix": true, - "caps_word": true + "caps_word": true, + "tri_layer": true }, "ws2812": { "pin": "GP10", diff --git a/keyboards/bastardkb/dilemma/4x6_4/rules.mk b/keyboards/bastardkb/dilemma/4x6_4/rules.mk index 9f83631e63d..4923c2c84a5 100644 --- a/keyboards/bastardkb/dilemma/4x6_4/rules.mk +++ b/keyboards/bastardkb/dilemma/4x6_4/rules.mk @@ -1,5 +1,3 @@ -TRI_LAYER_ENABLE = yes # Tri Layers - SERIAL_DRIVER = vendor POINTING_DEVICE_ENABLE = yes diff --git a/keyboards/doio/kb12/config.h b/keyboards/doio/kb12/config.h index c7ea434320e..d853409b858 100644 --- a/keyboards/doio/kb12/config.h +++ b/keyboards/doio/kb12/config.h @@ -19,7 +19,6 @@ /* RGB Matrix config */ #define RGB_MATRIX_LED_COUNT 12 -#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN #define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/era/klein/config.h b/keyboards/era/klein/config.h index e74b7d73d3c..1033bc738e7 100644 --- a/keyboards/era/klein/config.h +++ b/keyboards/era/klein/config.h @@ -21,9 +21,7 @@ #define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B /* RGB Matrix */ -#define WS2812_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the WS2812 implementation uses the PIO0 peripheral #define RGB_MATRIX_DEFAULT_VAL 60 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_KEYPRESSES #define RGB_DISABLE_WHEN_USB_SUSPENDED -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT \ No newline at end of file diff --git a/keyboards/keychron/q9_plus/config.h b/keyboards/keychron/q9_plus/config.h index c6cd09b3881..a8cba07e902 100755 --- a/keyboards/keychron/q9_plus/config.h +++ b/keyboards/keychron/q9_plus/config.h @@ -52,7 +52,3 @@ /* Old default behavior of mod-taps */ #define HOLD_ON_OTHER_KEY_PRESS - -/* Factory test keys */ -#define F_RESET_KEY1 KC_7 -#define FN_KEY1 MO(4) diff --git a/keyboards/keychron/q9_plus/q9_plus.c b/keyboards/keychron/q9_plus/q9_plus.c index f0f304def68..848117d323b 100755 --- a/keyboards/keychron/q9_plus/q9_plus.c +++ b/keyboards/keychron/q9_plus/q9_plus.c @@ -67,7 +67,6 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { return false; } - // RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue); if (host_keyboard_led_state().caps_lock) { RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 255, 255, 255); diff --git a/keyboards/qck75/v1/config.h b/keyboards/qck75/v1/config.h index 01d875e3d4c..06d945ebf74 100644 --- a/keyboards/qck75/v1/config.h +++ b/keyboards/qck75/v1/config.h @@ -16,5 +16,3 @@ #define OLED_TIMEOUT 120000 #define OLED_BRIGHTNESS 120 - -#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 21 diff --git a/keyboards/sofle_choc/info.json b/keyboards/sofle_choc/info.json index 172f60256eb..b59def38b0d 100644 --- a/keyboards/sofle_choc/info.json +++ b/keyboards/sofle_choc/info.json @@ -13,14 +13,48 @@ ] }, "features": { + "bootmagic": true, "oled": true, "rgb_matrix": true, - "extrakey": true + "extrakey": true, + "mousekey": true }, "development_board": "promicro", "rgb_matrix": { "driver": "ws2812", "split_count": [29, 29], + "animations": { + "solid_color": true, + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "rainbow_moving_chevron": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_fractal": true, + "pixel_flow": true, + "pixel_rain": true + }, "layout": [ { "flags": 4, "matrix": [0, 5], "x": 95, "y": 7 }, { "flags": 4, "matrix": [1, 5], "x": 95, "y": 21 }, diff --git a/keyboards/sofle_choc/keymaps/via/rules.mk b/keyboards/sofle_choc/keymaps/via/rules.mk index 715838ecc5d..8a52d2aa542 100644 --- a/keyboards/sofle_choc/keymaps/via/rules.mk +++ b/keyboards/sofle_choc/keymaps/via/rules.mk @@ -1,2 +1,7 @@ ENCODER_MAP_ENABLE = yes VIA_ENABLE = yes + +# Reduce compiled size +MOUSEKEY_ENABLE = no +SPACE_CADET_ENABLE = no +GRAVE_ESC_ENABLE = no