forked from mirrors/qmk_userspace
		
	Miscellaneous fixes for recently merged keyboards (#22179)
This commit is contained in:
		
					parent
					
						
							
								1b7a538353
							
						
					
				
			
			
				commit
				
					
						997a6747ee
					
				
			
		
					 10 changed files with 42 additions and 22 deletions
				
			
		| 
						 | 
					@ -50,13 +50,5 @@
 | 
				
			||||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 | 
					#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Startup values.
 | 
					// Startup values.
 | 
				
			||||||
#define RGB_MATRIX_DEFAULT_HUE 0
 | 
					 | 
				
			||||||
#define RGB_MATRIX_DEFAULT_SAT 255
 | 
					 | 
				
			||||||
#define RGB_MATRIX_DEFAULT_VAL 64
 | 
					#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
 | 
					#define RGB_MATRIX_DEFAULT_SPD 32
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -33,7 +33,8 @@
 | 
				
			||||||
        "mousekey": true,
 | 
					        "mousekey": true,
 | 
				
			||||||
        "nkro": true,
 | 
					        "nkro": true,
 | 
				
			||||||
        "rgb_matrix": true,
 | 
					        "rgb_matrix": true,
 | 
				
			||||||
        "caps_word": true
 | 
					        "caps_word": true,
 | 
				
			||||||
 | 
					        "tri_layer": true
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "ws2812": {
 | 
					    "ws2812": {
 | 
				
			||||||
        "pin": "GP10",
 | 
					        "pin": "GP10",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,3 @@
 | 
				
			||||||
TRI_LAYER_ENABLE = yes		# Tri Layers
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
SERIAL_DRIVER = vendor
 | 
					SERIAL_DRIVER = vendor
 | 
				
			||||||
 | 
					
 | 
				
			||||||
POINTING_DEVICE_ENABLE = yes
 | 
					POINTING_DEVICE_ENABLE = yes
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -19,7 +19,6 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* RGB Matrix config */
 | 
					/* RGB Matrix config */
 | 
				
			||||||
#define RGB_MATRIX_LED_COUNT 12
 | 
					#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_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_UP_DOWN
 | 
				
			||||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED
 | 
					#define RGB_DISABLE_WHEN_USB_SUSPENDED
 | 
				
			||||||
#define RGB_MATRIX_KEYPRESSES
 | 
					#define RGB_MATRIX_KEYPRESSES
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -21,9 +21,7 @@
 | 
				
			||||||
#define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B
 | 
					#define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* RGB Matrix */
 | 
					/* 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_DEFAULT_VAL 60
 | 
				
			||||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 | 
					#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 | 
				
			||||||
#define RGB_MATRIX_KEYPRESSES
 | 
					#define RGB_MATRIX_KEYPRESSES
 | 
				
			||||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED
 | 
					#define RGB_DISABLE_WHEN_USB_SUSPENDED
 | 
				
			||||||
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
 | 
					 | 
				
			||||||
| 
						 | 
					@ -52,7 +52,3 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Old default behavior of mod-taps */
 | 
					/* Old default behavior of mod-taps */
 | 
				
			||||||
#define HOLD_ON_OTHER_KEY_PRESS
 | 
					#define HOLD_ON_OTHER_KEY_PRESS
 | 
				
			||||||
 | 
					 | 
				
			||||||
/* Factory test keys */
 | 
					 | 
				
			||||||
#define F_RESET_KEY1 KC_7
 | 
					 | 
				
			||||||
#define FN_KEY1 MO(4)
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -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)) {
 | 
					    if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
 | 
				
			||||||
        return false;
 | 
					        return false;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    // RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (host_keyboard_led_state().caps_lock) {
 | 
					    if (host_keyboard_led_state().caps_lock) {
 | 
				
			||||||
        RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 255, 255, 255);
 | 
					        RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 255, 255, 255);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -16,5 +16,3 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define OLED_TIMEOUT 120000
 | 
					#define OLED_TIMEOUT 120000
 | 
				
			||||||
#define OLED_BRIGHTNESS 120
 | 
					#define OLED_BRIGHTNESS 120
 | 
				
			||||||
 | 
					 | 
				
			||||||
#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 21
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,14 +13,48 @@
 | 
				
			||||||
        ]
 | 
					        ]
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "features": {
 | 
					    "features": {
 | 
				
			||||||
 | 
					        "bootmagic": true,
 | 
				
			||||||
        "oled": true,
 | 
					        "oled": true,
 | 
				
			||||||
        "rgb_matrix": true,
 | 
					        "rgb_matrix": true,
 | 
				
			||||||
        "extrakey": true
 | 
					        "extrakey": true,
 | 
				
			||||||
 | 
					        "mousekey": true
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "development_board": "promicro",
 | 
					    "development_board": "promicro",
 | 
				
			||||||
    "rgb_matrix": {
 | 
					    "rgb_matrix": {
 | 
				
			||||||
        "driver": "ws2812",
 | 
					        "driver": "ws2812",
 | 
				
			||||||
        "split_count": [29, 29],
 | 
					        "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": [
 | 
					        "layout": [
 | 
				
			||||||
            { "flags": 4, "matrix": [0, 5], "x": 95, "y":  7 },
 | 
					            { "flags": 4, "matrix": [0, 5], "x": 95, "y":  7 },
 | 
				
			||||||
            { "flags": 4, "matrix": [1, 5], "x": 95, "y": 21 },
 | 
					            { "flags": 4, "matrix": [1, 5], "x": 95, "y": 21 },
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,2 +1,7 @@
 | 
				
			||||||
ENCODER_MAP_ENABLE = yes
 | 
					ENCODER_MAP_ENABLE = yes
 | 
				
			||||||
VIA_ENABLE = yes
 | 
					VIA_ENABLE = yes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Reduce compiled size
 | 
				
			||||||
 | 
					MOUSEKEY_ENABLE = no
 | 
				
			||||||
 | 
					SPACE_CADET_ENABLE = no
 | 
				
			||||||
 | 
					GRAVE_ESC_ENABLE = no
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue