darkkirb/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Resolve info.json/rules.mk feature conflicts in three boards (#18942)

Browse source
This commit is contained in:
Ryan 2022-11-04 05:26:18 +11:00 committed by GitHub
parent db2aa039f1
commit 40122c28e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
keyboards/0_sixty/info.json
View file

@ -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": [

20
keyboards/0_sixty/rules.mk
View file

@ -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

8
keyboards/handwired/reclined/info.json
View file

@ -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"],

19
keyboards/handwired/reclined/rules.mk
View file

@ -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

2
keyboards/makenova/omega/omega4/info.json
View file

@ -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

19
keyboards/makenova/omega/omega4/rules.mk
View file

@ -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