Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Miscellaneous fixes for recently merged keyboards #22179

Merged
merged 3 commits into from
Oct 2, 2023
Merged

Miscellaneous fixes for recently merged keyboards #22179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bada8df
Miscellaneous fixes for recently merged keyboards
zvecr Oct 1, 2023
ed8dc25
revert
zvecr Oct 1, 2023
bae6b29
Reduce size
zvecr Oct 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions keyboards/bastardkb/dilemma/4x6_4/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion keyboards/bastardkb/dilemma/4x6_4/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
"mousekey": true,
"nkro": true,
"rgb_matrix": true,
"caps_word": true
"caps_word": true,
"tri_layer": true
},
"ws2812": {
"pin": "GP10",
Expand Down
2 changes: 0 additions & 2 deletions keyboards/bastardkb/dilemma/4x6_4/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
TRI_LAYER_ENABLE = yes # Tri Layers

SERIAL_DRIVER = vendor

POINTING_DEVICE_ENABLE = yes
Expand Down
1 change: 0 additions & 1 deletion keyboards/doio/kb12/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions keyboards/era/klein/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions keyboards/keychron/q9_plus/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
1 change: 0 additions & 1 deletion keyboards/keychron/q9_plus/q9_plus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions keyboards/qck75/v1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,3 @@

#define OLED_TIMEOUT 120000
#define OLED_BRIGHTNESS 120

#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 21
36 changes: 35 additions & 1 deletion keyboards/sofle_choc/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
5 changes: 5 additions & 0 deletions keyboards/sofle_choc/keymaps/via/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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