Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Nov 3, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
878a8b6
Resolve info.json/rules.mk feature conflicts in two boards
fauxpark Nov 3, 2022
8dbc200
Fix 0_sixty/underglow too
fauxpark Nov 3, 2022
ee5a485
Template for empty rules.mk
fauxpark Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions keyboards/0_sixty/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
20 changes: 0 additions & 20 deletions keyboards/0_sixty/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 1 addition & 7 deletions keyboards/handwired/reclined/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
19 changes: 1 addition & 18 deletions keyboards/handwired/reclined/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +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
fauxpark marked this conversation as resolved.
Show resolved Hide resolved
# This file intentionally left blank
2 changes: 0 additions & 2 deletions keyboards/makenova/omega/omega4/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true
Expand Down
19 changes: 1 addition & 18 deletions keyboards/makenova/omega/omega4/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1 @@
# MCU name
fauxpark marked this conversation as resolved.
Show resolved Hide resolved
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