Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						3315894269
					
				
					 4 changed files with 6 additions and 10 deletions
				
			
		| 
						 | 
				
			
			@ -23,6 +23,8 @@
 | 
			
		|||
 | 
			
		||||
/* USB Device descriptor parameter */
 | 
			
		||||
#define VENDOR_ID       0x574D // WM
 | 
			
		||||
#define PRODUCT_ID      0x0001
 | 
			
		||||
#define DEVICE_VER      0x0001
 | 
			
		||||
#define MANUFACTURER    WestM
 | 
			
		||||
#define PRODUCT         WestM68
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -41,7 +43,3 @@
 | 
			
		|||
#define LOCKING_SUPPORT_ENABLE
 | 
			
		||||
/* Locking resynchronize hack */
 | 
			
		||||
#define LOCKING_RESYNC_ENABLE
 | 
			
		||||
 | 
			
		||||
/* Hold ESC key (first key of first column) to trigger bootloader */
 | 
			
		||||
#define BOOTMAGIC_LITE_ROW 0
 | 
			
		||||
#define BOOTMAGIC_LITE_COLUMN 0
 | 
			
		||||
| 
						 | 
				
			
			@ -16,9 +16,6 @@
 | 
			
		|||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#define PRODUCT_ID      0x0001
 | 
			
		||||
#define DEVICE_VER      0x0001
 | 
			
		||||
 | 
			
		||||
// The pin connected to the data pin of the LEDs
 | 
			
		||||
#define RGB_DI_PIN A8
 | 
			
		||||
#define RGBLED_NUM 16
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
RGBLIGHT_ENABLE = yes
 | 
			
		||||
| 
						 | 
				
			
			@ -17,5 +17,5 @@ CONSOLE_ENABLE = yes        # Console for debug
 | 
			
		|||
COMMAND_ENABLE = yes        # Commands for debug and configuration
 | 
			
		||||
NKRO_ENABLE = yes           # Enable N-Key Rollover
 | 
			
		||||
BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 | 
			
		||||
RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 | 
			
		||||
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 | 
			
		||||
AUDIO_ENABLE = no           # Audio output
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue