Resolve info.json/rules.mk feature conflicts in three boards (#18942)
This commit is contained in:
		
							parent
							
								
									db2aa039f1
								
							
						
					
					
						commit
						40122c28e0
					
				| @ -6,6 +6,15 @@ | |||||||
|         "vid": "0x7654", |         "vid": "0x7654", | ||||||
|         "device_version": "0.0.1" |         "device_version": "0.0.1" | ||||||
|     }, |     }, | ||||||
|  |     "features": { | ||||||
|  |         "extrakey": true, | ||||||
|  |         "console": true, | ||||||
|  |         "command": true, | ||||||
|  |         "nkro": true, | ||||||
|  |         "lto": true | ||||||
|  |     }, | ||||||
|  |     "processor": "atmega32u4", | ||||||
|  |     "bootloader": "caterina", | ||||||
|     "layouts": { |     "layouts": { | ||||||
| 	"LAYOUT_1x2uC": { | 	"LAYOUT_1x2uC": { | ||||||
|             "layout": [ |             "layout": [ | ||||||
|  | |||||||
| @ -1,21 +1 @@ | |||||||
| # MCU name
 |  | ||||||
| MCU = atmega32u4 |  | ||||||
| 
 |  | ||||||
| # Bootloader selection
 |  | ||||||
| BOOTLOADER = caterina |  | ||||||
| 
 |  | ||||||
| # Build Options
 |  | ||||||
| #   change yes to no to disable
 |  | ||||||
| #
 |  | ||||||
| BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite |  | ||||||
| EXTRAKEY_ENABLE = yes       # Audio control and System control |  | ||||||
| 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 = no        # Enable keyboard RGB underglow |  | ||||||
| AUDIO_ENABLE = no           # Audio output |  | ||||||
| 
 |  | ||||||
| LTO_ENABLE = yes            # Link-time opt |  | ||||||
| 
 |  | ||||||
| DEFAULT_FOLDER = 0_sixty/base | DEFAULT_FOLDER = 0_sixty/base | ||||||
|  | |||||||
| @ -6,16 +6,10 @@ | |||||||
|   "debounce": 5, |   "debounce": 5, | ||||||
|   "diode_direction": "ROW2COL", |   "diode_direction": "ROW2COL", | ||||||
|   "features": { |   "features": { | ||||||
|     "audio": false, |  | ||||||
|     "backlight": false, |  | ||||||
|     "bootmagic": false, |  | ||||||
|     "command": true, |     "command": true, | ||||||
|     "console": true, |     "console": true, | ||||||
|     "extrakey": true, |     "extrakey": true, | ||||||
|     "mousekey": true, |     "mousekey": true | ||||||
|     "nkro": false, |  | ||||||
|     "sleep_led": false, |  | ||||||
|     "unicode": false |  | ||||||
|   }, |   }, | ||||||
|   "matrix_pins": { |   "matrix_pins": { | ||||||
|     "cols": ["B2", "F4", "B3", "F5", "B1", "F6", "D4", "D7", "D0", "E6", "D1", "B4"], |     "cols": ["B2", "F4", "B3", "F5", "B1", "F6", "D4", "D7", "D0", "E6", "D1", "B4"], | ||||||
|  | |||||||
| @ -1,18 +1 @@ | |||||||
| # MCU name
 | # This file intentionally left blank
 | ||||||
| MCU = atmega32u4 |  | ||||||
| 
 |  | ||||||
| # Bootloader selection
 |  | ||||||
| BOOTLOADER = atmel-dfu |  | ||||||
| 
 |  | ||||||
| # Build Options
 |  | ||||||
| #   change yes to no to disable
 |  | ||||||
| #
 |  | ||||||
| BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite |  | ||||||
| MOUSEKEY_ENABLE = no        # Mouse keys |  | ||||||
| EXTRAKEY_ENABLE = no        # Audio control and System control |  | ||||||
| CONSOLE_ENABLE = no         # Console for debug |  | ||||||
| COMMAND_ENABLE = no         # Commands for debug and configuration |  | ||||||
| NKRO_ENABLE = no            # Enable N-Key Rollover |  | ||||||
| BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality |  | ||||||
| RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow |  | ||||||
| AUDIO_ENABLE = no           # Audio output |  | ||||||
|  | |||||||
| @ -6,8 +6,6 @@ | |||||||
|     "diode_direction": "COL2ROW", |     "diode_direction": "COL2ROW", | ||||||
|     "features": { |     "features": { | ||||||
|         "bootmagic": true, |         "bootmagic": true, | ||||||
|         "command": false, |  | ||||||
|         "console": false, |  | ||||||
|         "extrakey": true, |         "extrakey": true, | ||||||
|         "mousekey": true, |         "mousekey": true, | ||||||
|         "nkro": true |         "nkro": true | ||||||
|  | |||||||
| @ -1,18 +1 @@ | |||||||
| # MCU name
 | # This file intentionally left blank
 | ||||||
| MCU = atmega32u4 |  | ||||||
| 
 |  | ||||||
| # Bootloader selection
 |  | ||||||
| BOOTLOADER = caterina |  | ||||||
| 
 |  | ||||||
| # Build Options
 |  | ||||||
| #   change yes to no to disable
 |  | ||||||
| #
 |  | ||||||
| BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite |  | ||||||
| MOUSEKEY_ENABLE = yes       # Mouse keys |  | ||||||
| EXTRAKEY_ENABLE = yes       # Audio control and System control |  | ||||||
| CONSOLE_ENABLE = no         # Console for debug |  | ||||||
| COMMAND_ENABLE = no         # Commands for debug and configuration |  | ||||||
| NKRO_ENABLE = no            # Enable N-Key Rollover |  | ||||||
| BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality |  | ||||||
| RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow |  | ||||||
| AUDIO_ENABLE = no           # Audio output |  | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user