gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-05 01:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot 2024-04-23 03:07:00 +00:00
commit 7aa838052a
36 changed files with 156 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
keyboards/malevolti/lyra/rev1/info.json → keyboards/malevolti/lyra/rev1/keyboard.json
View File

@ -22,6 +22,14 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true
},
"build": {
"lto": true
},
"layouts": {
"LAYOUT": {
"layout": [

14
keyboards/malevolti/lyra/rev1/rules.mk
View File

@ -1,14 +0,0 @@
# 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
LTO_ENABLE = yes

44
keyboards/maple_computing/christmas_tree/info.json
View File

@ -1,44 +0,0 @@
{
"keyboard_name": "Christmas Tree",
"manufacturer": "Maple Computing",
"url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/",
"maintainer": "That-Canadian",
"usb": {
"vid": "0xFEED",
"pid": "0x3070"
},
"features": {
"backlight": true,
"bootmagic": false,
"command": false,
"console": true,
"extrakey": true,
"mousekey": false,
"nkro": false
},
"matrix_pins": {
"cols": ["D1"],
"rows": ["D3", "F4", "D0", "F6", "F5", "D4"]
},
"diode_direction": "COL2ROW",
"backlight": {
"driver": "timer",
"pin": "D2"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 1, "y": 0},
{"matrix": [1, 0], "x": 0.5, "y": 1},
{"matrix": [2, 0], "x": 1.5, "y": 1},
{"matrix": [3, 0], "x": 0, "y": 2},
{"matrix": [4, 0], "x": 1, "y": 2},
{"matrix": [5, 0], "x": 2, "y": 2}
]
}
}
}

5
keyboards/maple_computing/christmas_tree/v2017/info.json
View File

@ -1,5 +0,0 @@
{
"usb": {
"device_version": "20.1.7"
}
}

45
keyboards/maple_computing/christmas_tree/v2017/keyboard.json Normal file
View File

@ -0,0 +1,45 @@
{
"keyboard_name": "Christmas Tree",
"manufacturer": "Maple Computing",
"url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/",
"maintainer": "That-Canadian",
"usb": {
"vid": "0xFEED",
"pid": "0x3070",
"device_version": "20.1.7"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"features": {
"backlight": true,
"bootmagic": false,
"command": false,
"console": true,
"extrakey": true,
"mousekey": false,
"nkro": false
},
"matrix_pins": {
"cols": ["D1"],
"rows": ["D3", "F4", "D0", "F6", "F5", "D4"]
},
"diode_direction": "COL2ROW",
"backlight": {
"driver": "timer",
"pin": "D2"
},
"layouts": {
"LAYOUT": {
"layout": [
{"matrix": [ 0, 0 ], "x": 1, "y": 0},
{"matrix": [ 1, 0 ], "x": 0.5, "y": 1},
{"matrix": [ 2, 0 ], "x": 1.5, "y": 1},
{"matrix": [ 3, 0 ], "x": 0, "y": 2},
{"matrix": [ 4, 0 ], "x": 1, "y": 2},
{"matrix": [ 5, 0 ], "x": 2, "y": 2}
]
}
}
}

3
keyboards/maple_computing/christmas_tree/v2017/rules.mk
View File

@ -1,3 +0,0 @@
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
AUDIO_ENABLE = no # Audio output

6
keyboards/maple_computing/ivy/rev1/keyboard.json
View File

@ -19,6 +19,12 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
"features": {
"bootmagic": false,
"mousekey": false,
"extrakey": true,
"backlight": true
},
"layouts": {
"LAYOUT": {
"layout": [

13
keyboards/maple_computing/ivy/rules.mk
View File

@ -1,14 +1 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # 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 = yes # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
DEFAULT_FOLDER = maple_computing/ivy/rev1

8
keyboards/maple_computing/jnao/info.json
View File

@ -19,6 +19,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"features": {
"bootmagic": false,
"mousekey": false,
"extrakey": true,
"console": true,
"command": true,
"backlight": true
},
"community_layouts": ["ortho_5x12", "ortho_4x12"],
"layouts": {
"LAYOUT_ortho_5x12": {

13
keyboards/maple_computing/jnao/rules.mk
View File

@ -1,16 +1,3 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no

6
keyboards/maple_computing/launchpad/rev1/keyboard.json
View File

@ -33,6 +33,12 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"features": {
"bootmagic": false,
"mousekey": false,
"extrakey": true,
"nkro": true
},
"layouts": {
"LAYOUT": {
"layout": [

13
keyboards/maple_computing/launchpad/rules.mk
View File

@ -1,14 +1 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # 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 = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
DEFAULT_FOLDER = maple_computing/launchpad/rev1

8
keyboards/maple_computing/lets_split_eh/eh/info.json
View File

@ -41,6 +41,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"features": {
"bootmagic": false,
"mousekey": false,
"extrakey": true,
"nkro": true,
"backlight": true,
"rgblight": true
},
"community_layouts": ["ortho_4x12"],
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_4x12"

3
keyboards/maple_computing/lets_split_eh/eh/rules.mk
View File

@ -1,5 +1,2 @@
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
# Disable unsupported hardware
AUDIO_SUPPORTED = no

13
keyboards/maple_computing/lets_split_eh/rules.mk
View File

@ -1,14 +1 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # 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 = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
DEFAULT_FOLDER = maple_computing/lets_split_eh/eh

6
keyboards/maple_computing/minidox/rev1/info.json → keyboards/maple_computing/minidox/rev1/keyboard.json
View File

@ -19,6 +19,12 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
"features": {
"bootmagic": false,
"mousekey": true,
"extrakey": true,
"command": true
},
"community_layouts": ["split_3x5_3"],
"layout_aliases": {
"LAYOUT": "LAYOUT_split_3x5_3"

1
keyboards/maple_computing/minidox/rev1/rules.mk
View File

@ -1 +0,0 @@
BACKLIGHT_ENABLE = no

13
keyboards/maple_computing/minidox/rules.mk
View File

@ -1,14 +1 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = yes # 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
DEFAULT_FOLDER = maple_computing/minidox/rev1

6
keyboards/marksard/rhymestone/rev1/keyboard.json
View File

@ -44,6 +44,12 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
"features": {
"bootmagic": false,
"mousekey": false,
"extrakey": false,
"nkro": true
},
"community_layouts": ["ortho_4x10"],
"layouts": {
"LAYOUT_ortho_4x10": {

14
keyboards/marksard/rhymestone/rules.mk
View File

@ -1,15 +1 @@
# 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 = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = no
DEFAULT_FOLDER = marksard/rhymestone/rev1

7
keyboards/marksard/treadstone48/rev1/keyboard.json
View File

@ -34,6 +34,13 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
"features": {
"bootmagic": false,
"mousekey": true,
"extrakey": false,
"rgblight": true,
"oled": true
},
"layouts": {
"LAYOUT_base": {
"layout": [

7
keyboards/marksard/treadstone48/rev2/info.json
View File

@ -31,6 +31,13 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"features": {
"bootmagic": false,
"mousekey": true,
"extrakey": false,
"rgblight": true,
"oled": true
},
"layout_aliases": {
"LAYOUT_full": "LAYOUT_base"
},

1
keyboards/marksard/treadstone48/rev2/rules.mk
View File

@ -1 +0,0 @@
# File intentionally blank

16
keyboards/marksard/treadstone48/rules.mk
View File

@ -1,17 +1 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
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
AUDIO_ENABLE = no # Audio output
MOUSEKEY_ENABLE = yes # Mouse keys
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
OLED_ENABLE = yes
DEFAULT_FOLDER = marksard/treadstone48/rev1

7
keyboards/massdrop/alt/info.json
View File

@ -17,6 +17,13 @@
},
"diode_direction": "COL2ROW",
"community_layouts": ["65_ansi_blocker"],
"features": {
"bootmagic": false,
"mousekey": false,
"extrakey": true,
"nkro": true,
"rgb_matrix": true
},
"layout_aliases": {
"LAYOUT": "LAYOUT_65_ansi_blocker"
},

18
keyboards/massdrop/alt/rules.mk
View File

@ -7,21 +7,3 @@ MCU = cortex-m4
# Bootloader selection
BOOTLOADER = md-boot
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # 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 = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
VIRTSER_ENABLE = no # USB Serial Driver
AUTO_SHIFT_ENABLE = no # Auto Shift
# Custom RGB matrix handling
RGB_MATRIX_ENABLE = yes

7
keyboards/massdrop/ctrl/info.json
View File

@ -16,6 +16,13 @@
"rows": ["B04", "B05", "B06", "B07", "B08", "B09", "A10", "A11", "B10", "B11", "B12"]
},
"diode_direction": "COL2ROW",
"features": {
"bootmagic": false,
"mousekey": false,
"extrakey": true,
"nkro": true,
"rgb_matrix": true
},
"layouts": {
"LAYOUT": {
"layout": [

18
keyboards/massdrop/ctrl/rules.mk
View File

@ -7,21 +7,3 @@ MCU = cortex-m4
# Bootloader selection
BOOTLOADER = md-boot
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # 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 = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
VIRTSER_ENABLE = no # USB Serial Driver
AUTO_SHIFT_ENABLE = no # Auto Shift
# Custom RGB matrix handling
RGB_MATRIX_ENABLE = yes

9
keyboards/matrix/abelx/info.json
View File

@ -6,7 +6,8 @@
"usb": {
"vid": "0x4D58",
"pid": "0xAB87",
"device_version": "0.0.1"
"device_version": "0.0.1",
"no_startup_check": true
},
"rgblight": {
"led_count": 9,
@ -27,6 +28,12 @@
"ws2812": {
"pin": "B4"
},
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"rgblight": true
},
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [

16
keyboards/matrix/abelx/rules.mk
View File

@ -1,4 +1,4 @@
## chip/board settings
#
# - the next two should match the directories in
# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
@ -28,20 +28,6 @@ USE_FPU = yes
# Bootloader selection
BOOTLOADER = custom
# 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 = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in
CUSTOM_MATRIX = lite
# project specific files
SRC += matrix.c tca6424.c aw9523b.c

9
keyboards/matrix/m12og/rev1/info.json
View File

@ -31,6 +31,15 @@
"ws2812": {
"pin": "B8"
},
"features": {
"bootmagic": false,
"mousekey": false,
"extrakey": true,
"rgblight": true
},
"build": {
"lto": true
},
"layout_aliases": {
"LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
},

14
keyboards/matrix/m12og/rev1/rules.mk
View File

@ -8,19 +8,5 @@ BOARD = m12og_v1
# Bootloader selection
BOOTLOADER = custom
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # 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 = yes # HAS TO BE ON! Otherwise the custom matrix doesn't work
AUDIO_ENABLE = no # Audio output
LTO_ENABLE = yes
CUSTOM_MATRIX = lite
SRC += matrix.c

9
keyboards/matrix/m20add/info.json
View File

@ -6,7 +6,8 @@
"usb": {
"vid": "0x4D58",
"pid": "0x20AD",
"device_version": "0.0.1"
"device_version": "0.0.1",
"no_startup_check": true
},
"rgblight": {
"led_count": 20,
@ -27,6 +28,12 @@
"ws2812": {
"pin": "B4"
},
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"rgblight": true
},
"layouts": {
"LAYOUT_tkl_ansi_tsangan": {
"layout": [

13
keyboards/matrix/m20add/rules.mk
View File

@ -13,19 +13,6 @@ BOARD = ST_NUCLEO64_F411RE
# Bootloader selection
BOOTLOADER = custom
# 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
NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in
RGBLIGHT_ENABLE = yes
CUSTOM_MATRIX = lite
# project specific files
SRC += matrix.c tca6424.c rgb_ring.c drivers/led/issi/is31fl3731.c

10
keyboards/matrix/noah/info.json
View File

@ -6,7 +6,8 @@
"usb": {
"vid": "0x4D58",
"pid": "0x0065",
"device_version": "0.0.1"
"device_version": "0.0.1",
"no_startup_check": true
},
"rgblight": {
"driver": "custom",
@ -75,6 +76,13 @@
},
"driver": "is31fl3731"
},
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"rgblight": true,
"rgb_matrix": true
},
"community_layouts": ["65_iso_blocker"],
"layouts": {
"LAYOUT_default": {

14
keyboards/matrix/noah/rules.mk
View File

@ -13,20 +13,6 @@ BOARD = ST_NUCLEO64_F411RE
# Bootloader selection
BOOTLOADER = custom
# 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
NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in
RGB_MATRIX_ENABLE = yes
RGBLIGHT_ENABLE = yes
WS2812_DRIVER_REQUIRED = yes
CUSTOM_MATRIX = yes