~ruther/qmk_firmware

40122c28e026ab2da6dd784b66fd8de2b6dc1fed — Ryan 2 years ago db2aa03
Resolve info.json/rules.mk feature conflicts in three boards (#18942)

M keyboards/0_sixty/info.json => keyboards/0_sixty/info.json +9 -0
@@ 6,6 6,15 @@
        "vid": "0x7654",
        "device_version": "0.0.1"
    },
    "features": {
        "extrakey": true,
        "console": true,
        "command": true,
        "nkro": true,
        "lto": true
    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
	"LAYOUT_1x2uC": {
            "layout": [

M keyboards/0_sixty/rules.mk => keyboards/0_sixty/rules.mk +0 -20
@@ 1,21 1,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

M keyboards/handwired/reclined/info.json => keyboards/handwired/reclined/info.json +1 -7
@@ 6,16 6,10 @@
  "debounce": 5,
  "diode_direction": "ROW2COL",
  "features": {
    "audio": false,
    "backlight": false,
    "bootmagic": false,
    "command": true,
    "console": true,
    "extrakey": true,
    "mousekey": true,
    "nkro": false,
    "sleep_led": false,
    "unicode": false
    "mousekey": true
  },
  "matrix_pins": {
    "cols": ["B2", "F4", "B3", "F5", "B1", "F6", "D4", "D7", "D0", "E6", "D1", "B4"],

M keyboards/handwired/reclined/rules.mk => keyboards/handwired/reclined/rules.mk +1 -18
@@ 1,18 1,1 @@
# MCU name
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
# This file intentionally left blank

M keyboards/makenova/omega/omega4/info.json => keyboards/makenova/omega/omega4/info.json +0 -2
@@ 6,8 6,6 @@
    "diode_direction": "COL2ROW",
    "features": {
        "bootmagic": true,
        "command": false,
        "console": false,
        "extrakey": true,
        "mousekey": true,
        "nkro": true

M keyboards/makenova/omega/omega4/rules.mk => keyboards/makenova/omega/omega4/rules.mk +1 -18
@@ 1,18 1,1 @@
# MCU name
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
# This file intentionally left blank