Merge remote-tracking branch 'upstream/master' into develop
This commit is contained in:
		
						commit
						922c8071e4
					
				
					 540 changed files with 0 additions and 552 deletions
				
			
		| 
						 | 
				
			
			@ -18,7 +18,6 @@ CONSOLE_ENABLE = yes        # Console for debug
 | 
			
		|||
COMMAND_ENABLE = no         # Commands for debug and configuration
 | 
			
		||||
NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 | 
			
		||||
AUDIO_ENABLE = no           # Audio output
 | 
			
		||||
UNICODE_ENABLE = no         # Unicode
 | 
			
		||||
 | 
			
		||||
WS2812_DRIVER = pwm
 | 
			
		||||
RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -89,7 +89,6 @@ LED_MIRRORED = yes          # Mirror LEDs across halves (enable DIP 1 on slave,
 | 
			
		|||
RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight (+8500)
 | 
			
		||||
RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects. Can be very laggy (+1500)
 | 
			
		||||
RGBLIGHT_FULL_POWER = no    # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port
 | 
			
		||||
UNICODE_ENABLE = no         # Unicode
 | 
			
		||||
SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 | 
			
		||||
 | 
			
		||||
OLED_ENABLE = no     # Enable the OLED Driver (+5000)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,7 +4,6 @@
 | 
			
		|||
BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 | 
			
		||||
MOUSEKEY_ENABLE         = no        # Mouse keys
 | 
			
		||||
EXTRAKEY_ENABLE         = yes       # Audio control and System control
 | 
			
		||||
UNICODE_ENABLE          = no        # Unicode keycodes
 | 
			
		||||
NKRO_ENABLE             = no        # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 | 
			
		||||
 | 
			
		||||
# Debug Options
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,7 +4,6 @@
 | 
			
		|||
BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 | 
			
		||||
MOUSEKEY_ENABLE         = no        # Mouse keys
 | 
			
		||||
EXTRAKEY_ENABLE         = yes       # Audio control and System control
 | 
			
		||||
UNICODE_ENABLE          = no        # Unicode keycodes
 | 
			
		||||
NKRO_ENABLE             = no        # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 | 
			
		||||
 | 
			
		||||
# Debug Options
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -15,7 +15,6 @@ CONSOLE_ENABLE = no         # Console for debug
 | 
			
		|||
COMMAND_ENABLE = yes        # Commands for debug and configuration
 | 
			
		||||
NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 | 
			
		||||
AUDIO_ENABLE = no           # Audio output
 | 
			
		||||
UNICODE_ENABLE = no         # Unicode
 | 
			
		||||
 | 
			
		||||
SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -95,7 +95,6 @@ RGBLIGHT_ANIMATIONS = yes   # LED animations
 | 
			
		|||
RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight (+8500)
 | 
			
		||||
RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects. Can be very laggy (+1500)
 | 
			
		||||
RGBLIGHT_FULL_POWER = yes   # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port
 | 
			
		||||
UNICODE_ENABLE = no         # Unicode
 | 
			
		||||
SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 | 
			
		||||
ENCODER_ENABLE = yes        # Enable rotary encoder (+90)
 | 
			
		||||
OLED_ENABLE = yes
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,7 +14,6 @@ RGBLIGHT_SPLIT_ENABLE = no  # Split RGBLight Support
 | 
			
		|||
RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
 | 
			
		||||
RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects.
 | 
			
		||||
RGBLIGHT_FULL_POWER = yes   # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port
 | 
			
		||||
UNICODE_ENABLE = no         # Unicode
 | 
			
		||||
SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 | 
			
		||||
ENCODER_ENABLE = yes        # Enable rotary encoder
 | 
			
		||||
OLED_ENABLE = no     # Enable the OLED Driver
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,7 +14,6 @@ RGBLIGHT_SPLIT_ENABLE = no  # Split RGBLight Support
 | 
			
		|||
RGB_MATRIX_ENABLE = no      # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
 | 
			
		||||
RGB_MATRIX_KEYPRESSES = no  # Enable reactive per-key effects.
 | 
			
		||||
RGBLIGHT_FULL_POWER = yes   # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port
 | 
			
		||||
UNICODE_ENABLE = no         # Unicode
 | 
			
		||||
SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 | 
			
		||||
ENCODER_ENABLE = yes        # Enable rotary encoder
 | 
			
		||||
OLED_ENABLE = yes
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 | 
			
		|||
NKRO_ENABLE = no            # USB Nkey Rollover
 | 
			
		||||
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 | 
			
		||||
RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 | 
			
		||||
UNICODE_ENABLE = no         # Unicode
 | 
			
		||||
AUDIO_ENABLE = no           # Audio output
 | 
			
		||||
RGB_MATRIX_DRIVER = WS2812
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue