mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-04 07:12:33 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						4466261895
					
				@ -15,7 +15,6 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control
 | 
				
			|||||||
CONSOLE_ENABLE = yes	# Console for debug
 | 
					CONSOLE_ENABLE = yes	# Console for debug
 | 
				
			||||||
COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
					COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
					NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
				
			||||||
CUSTOM_MATRIX = no # Custom matrix file
 | 
					 | 
				
			||||||
# BACKLIGHT_ENABLE = yes
 | 
					# BACKLIGHT_ENABLE = yes
 | 
				
			||||||
# RGBLIGHT_ENABLE = yes
 | 
					# RGBLIGHT_ENABLE = yes
 | 
				
			||||||
NO_USB_STARTUP_CHECK = yes # Workaround for issue 6369
 | 
					NO_USB_STARTUP_CHECK = yes # Workaround for issue 6369
 | 
				
			||||||
 | 
				
			|||||||
@ -18,7 +18,6 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control
 | 
				
			|||||||
CONSOLE_ENABLE = yes	# Console for debug
 | 
					CONSOLE_ENABLE = yes	# Console for debug
 | 
				
			||||||
COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
					COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
					NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
				
			||||||
CUSTOM_MATRIX = no # Custom matrix file
 | 
					 | 
				
			||||||
BACKLIGHT_ENABLE = yes
 | 
					BACKLIGHT_ENABLE = yes
 | 
				
			||||||
RGBLIGHT_ENABLE = yes
 | 
					RGBLIGHT_ENABLE = yes
 | 
				
			||||||
WS2812_DRIVER = spi
 | 
					WS2812_DRIVER = spi
 | 
				
			||||||
 | 
				
			|||||||
@ -12,7 +12,6 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control
 | 
				
			|||||||
CONSOLE_ENABLE = yes        # Console for debug
 | 
					CONSOLE_ENABLE = yes        # Console for debug
 | 
				
			||||||
COMMAND_ENABLE = yes        # Commands for debug and configuration
 | 
					COMMAND_ENABLE = yes        # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = yes           # USB Nkey Rollover
 | 
					NKRO_ENABLE = yes           # USB Nkey Rollover
 | 
				
			||||||
CUSTOM_MATRIX = no          # Custom matrix file
 | 
					 | 
				
			||||||
BACKLIGHT_ENABLE = no
 | 
					BACKLIGHT_ENABLE = no
 | 
				
			||||||
RGBLIGHT_ENABLE = yes
 | 
					RGBLIGHT_ENABLE = yes
 | 
				
			||||||
WS2812_DRIVER = spi
 | 
					WS2812_DRIVER = spi
 | 
				
			||||||
 | 
				
			|||||||
@ -15,7 +15,6 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control
 | 
				
			|||||||
CONSOLE_ENABLE = yes	# Console for debug
 | 
					CONSOLE_ENABLE = yes	# Console for debug
 | 
				
			||||||
COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
					COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
					NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
				
			||||||
CUSTOM_MATRIX = no # Custom matrix file
 | 
					 | 
				
			||||||
BACKLIGHT_ENABLE = yes
 | 
					BACKLIGHT_ENABLE = yes
 | 
				
			||||||
RGBLIGHT_ENABLE = no
 | 
					RGBLIGHT_ENABLE = no
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -16,7 +16,6 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control
 | 
				
			|||||||
CONSOLE_ENABLE = yes	# Console for debug
 | 
					CONSOLE_ENABLE = yes	# Console for debug
 | 
				
			||||||
COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
					COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
					NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
				
			||||||
CUSTOM_MATRIX = no # Custom matrix file
 | 
					 | 
				
			||||||
BACKLIGHT_ENABLE = yes
 | 
					BACKLIGHT_ENABLE = yes
 | 
				
			||||||
RGBLIGHT_ENABLE = yes
 | 
					RGBLIGHT_ENABLE = yes
 | 
				
			||||||
WS2812_DRIVER = spi
 | 
					WS2812_DRIVER = spi
 | 
				
			||||||
 | 
				
			|||||||
@ -17,7 +17,6 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control
 | 
				
			|||||||
CONSOLE_ENABLE = yes	# Console for debug
 | 
					CONSOLE_ENABLE = yes	# Console for debug
 | 
				
			||||||
COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
					COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
					NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
				
			||||||
CUSTOM_MATRIX = no # Custom matrix file
 | 
					 | 
				
			||||||
BACKLIGHT_ENABLE = yes
 | 
					BACKLIGHT_ENABLE = yes
 | 
				
			||||||
RGBLIGHT_ENABLE = yes
 | 
					RGBLIGHT_ENABLE = yes
 | 
				
			||||||
WS2812_DRIVER = spi
 | 
					WS2812_DRIVER = spi
 | 
				
			||||||
 | 
				
			|||||||
@ -13,7 +13,6 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control
 | 
				
			|||||||
CONSOLE_ENABLE = yes	# Console for debug
 | 
					CONSOLE_ENABLE = yes	# Console for debug
 | 
				
			||||||
COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
					COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
					NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
				
			||||||
CUSTOM_MATRIX = no # Custom matrix file
 | 
					 | 
				
			||||||
BACKLIGHT_ENABLE = yes
 | 
					BACKLIGHT_ENABLE = yes
 | 
				
			||||||
RGBLIGHT_ENABLE = no
 | 
					RGBLIGHT_ENABLE = no
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -16,7 +16,6 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control
 | 
				
			|||||||
CONSOLE_ENABLE = yes        # Console for debug
 | 
					CONSOLE_ENABLE = yes        # Console for debug
 | 
				
			||||||
COMMAND_ENABLE = yes        # Commands for debug and configuration
 | 
					COMMAND_ENABLE = yes        # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = yes           # USB Nkey Rollover
 | 
					NKRO_ENABLE = yes           # USB Nkey Rollover
 | 
				
			||||||
CUSTOM_MATRIX = no          # Custom matrix file
 | 
					 | 
				
			||||||
BACKLIGHT_ENABLE = yes
 | 
					BACKLIGHT_ENABLE = yes
 | 
				
			||||||
RGBLIGHT_ENABLE = no
 | 
					RGBLIGHT_ENABLE = no
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -18,7 +18,6 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control
 | 
				
			|||||||
CONSOLE_ENABLE = yes	# Console for debug
 | 
					CONSOLE_ENABLE = yes	# Console for debug
 | 
				
			||||||
COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
					COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
					NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
				
			||||||
CUSTOM_MATRIX = no # Custom matrix file
 | 
					 | 
				
			||||||
BACKLIGHT_ENABLE = yes
 | 
					BACKLIGHT_ENABLE = yes
 | 
				
			||||||
RGBLIGHT_ENABLE = yes
 | 
					RGBLIGHT_ENABLE = yes
 | 
				
			||||||
WS2812_DRIVER = spi
 | 
					WS2812_DRIVER = spi
 | 
				
			||||||
 | 
				
			|||||||
@ -18,7 +18,6 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control
 | 
				
			|||||||
CONSOLE_ENABLE = yes	# Console for debug
 | 
					CONSOLE_ENABLE = yes	# Console for debug
 | 
				
			||||||
COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
					COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
					NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
				
			||||||
CUSTOM_MATRIX = no # Custom matrix file
 | 
					 | 
				
			||||||
BACKLIGHT_ENABLE = yes
 | 
					BACKLIGHT_ENABLE = yes
 | 
				
			||||||
RGBLIGHT_ENABLE = yes
 | 
					RGBLIGHT_ENABLE = yes
 | 
				
			||||||
WS2812_DRIVER = spi
 | 
					WS2812_DRIVER = spi
 | 
				
			||||||
 | 
				
			|||||||
@ -15,7 +15,6 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control
 | 
				
			|||||||
CONSOLE_ENABLE = no	# Console for debug
 | 
					CONSOLE_ENABLE = no	# Console for debug
 | 
				
			||||||
COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
					COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
					NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
				
			||||||
CUSTOM_MATRIX = no # Custom matrix file
 | 
					 | 
				
			||||||
AUDIO_ENABLE = yes
 | 
					AUDIO_ENABLE = yes
 | 
				
			||||||
RGBLIGHT_ENABLE = yes
 | 
					RGBLIGHT_ENABLE = yes
 | 
				
			||||||
RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
 | 
					RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
 | 
				
			||||||
 | 
				
			|||||||
@ -14,7 +14,6 @@ EXTRAKEY_ENABLE = yes	# Audio control and System control
 | 
				
			|||||||
CONSOLE_ENABLE = yes	# Console for debug
 | 
					CONSOLE_ENABLE = yes	# Console for debug
 | 
				
			||||||
COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
					COMMAND_ENABLE = yes    # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
					NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
				
			||||||
CUSTOM_MATRIX = no # Custom matrix file
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
DEFAULT_FOLDER = handwired/ck4x4
 | 
					DEFAULT_FOLDER = handwired/ck4x4
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -19,7 +19,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
				
			|||||||
AUDIO_ENABLE = no           # Audio output
 | 
					AUDIO_ENABLE = no           # Audio output
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DEBUG_ENABLE = no
 | 
					DEBUG_ENABLE = no
 | 
				
			||||||
CUSTOM_MATRIX = no         # Use custom matrix code
 | 
					 | 
				
			||||||
SPLIT_KEYBOARD = yes        # Use shared split_common code
 | 
					SPLIT_KEYBOARD = yes        # Use shared split_common code
 | 
				
			||||||
 | 
					
 | 
				
			||||||
LAYOUTS = split_3x5_3
 | 
					LAYOUTS = split_3x5_3
 | 
				
			||||||
 | 
				
			|||||||
@ -14,7 +14,6 @@ CONSOLE_ENABLE = no	# Console for debug
 | 
				
			|||||||
COMMAND_ENABLE = no    # Commands for debug and configuration
 | 
					COMMAND_ENABLE = no    # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
					NKRO_ENABLE = yes	    # USB Nkey Rollover
 | 
				
			||||||
SLEEP_LED_ENABLE = yes
 | 
					SLEEP_LED_ENABLE = yes
 | 
				
			||||||
CUSTOM_MATRIX = no # Custom matrix file
 | 
					 | 
				
			||||||
BACKLIGHT_ENABLE = no
 | 
					BACKLIGHT_ENABLE = no
 | 
				
			||||||
RGBLIGHT_ENABLE = no
 | 
					RGBLIGHT_ENABLE = no
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -12,6 +12,5 @@ EXTRAKEY_ENABLE = no	# Audio control and System control
 | 
				
			|||||||
CONSOLE_ENABLE = no	# Console for debug
 | 
					CONSOLE_ENABLE = no	# Console for debug
 | 
				
			||||||
COMMAND_ENABLE = no    # Commands for debug and configuration
 | 
					COMMAND_ENABLE = no    # Commands for debug and configuration
 | 
				
			||||||
NKRO_ENABLE = no	    # USB Nkey Rollover
 | 
					NKRO_ENABLE = no	    # USB Nkey Rollover
 | 
				
			||||||
CUSTOM_MATRIX = no # Custom matrix file
 | 
					 | 
				
			||||||
# BACKLIGHT_ENABLE = yes # This is broken on 072 for some reason
 | 
					# BACKLIGHT_ENABLE = yes # This is broken on 072 for some reason
 | 
				
			||||||
RGBLIGHT_ENABLE = no
 | 
					RGBLIGHT_ENABLE = no
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user