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

This commit is contained in:
QMK Bot 2024-04-19 16:25:34 +00:00
commit 39eca60ba1
34 changed files with 105 additions and 169 deletions

View File

@ -11,6 +11,11 @@
},
"processor": "atmega328p",
"bootloader": "usbasploader",
"features": {
"bootmagic": false,
"mousekey": false,
"extrakey": true
},
"layouts": {
"LAYOUT": {
"layout": [

View File

@ -1,16 +1,6 @@
# 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 = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
CUSTOM_MATRIX = lite
# project specific files

View File

@ -46,6 +46,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"features": {
"bootmagic": true,
"mousekey": false,
"extrakey": true,
"backlight": true,
"rgblight": true
},
"layouts": {
"LAYOUT": {
"layout": [

View File

@ -1,14 +1 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # 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
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGBLIGHT_SPLIT = yes

View File

@ -4,6 +4,13 @@
"rows": ["D4", "C6", "D7", "E6"]
},
"diode_direction": "COL2ROW",
"features": {
"bootmagic": false,
"mousekey": true,
"extrakey": true,
"console": true,
"command": true
},
"layouts": {
"LAYOUT_numpad_5x4": {
"layout": [

View File

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

View File

@ -3,14 +3,6 @@
"manufacturer": "kakunpc",
"url": "https://kakunpc.booth.pm/",
"maintainer": "kakunpc",
"features": {
"bootmagic": false,
"command": true,
"console": true,
"extrakey": true,
"mousekey": true,
"nkro": false
},
"usb": {
"vid": "0xFEED",
"pid": "0x0000",

View File

@ -13,6 +13,14 @@
"pin": "D3"
},
"diode_direction": "COL2ROW",
"features": {
"bootmagic": false,
"mousekey": true,
"extrakey": true,
"console": true,
"command": true,
"rgblight": true
},
"layouts": {
"LAYOUT_numpad_5x4": {
"layout": [

View File

@ -1,12 +0,0 @@
# 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 = yes # 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 = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output

View File

@ -32,6 +32,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"features": {
"bootmagic": false,
"mousekey": true,
"extrakey": false,
"rgblight": true,
"oled": true
},
"layouts": {
"LAYOUT": {
"layout": [

View File

@ -32,6 +32,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"features": {
"bootmagic": false,
"mousekey": true,
"extrakey": false,
"rgblight": true,
"oled": true
},
"layouts": {
"LAYOUT_all": {
"layout": [

View File

@ -1,16 +1,3 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # 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 = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
OLED_ENABLE = yes
CUSTOM_MATRIX = yes
SRC += matrix.c

View File

@ -24,6 +24,13 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"features": {
"bootmagic": false,
"mousekey": false,
"extrakey": false,
"rgblight": true,
"oled": true
},
"layouts": {
"LAYOUT": {
"layout": [

View File

@ -1,13 +0,0 @@
# 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 = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
OLED_ENABLE = yes

View File

@ -24,6 +24,13 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"features": {
"bootmagic": false,
"mousekey": false,
"extrakey": false,
"rgblight": true,
"oled": true
},
"layouts": {
"LAYOUT": {
"layout": [

View File

@ -1,13 +0,0 @@
# 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 = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
OLED_ENABLE = yes

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 = 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 = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
DEFAULT_FOLDER = kakunpc/business_card/beta

View File

@ -10,6 +10,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"console": true,
"command": true
},
"layouts": {
"LAYOUT_all": {
"layout": [

View File

@ -1,15 +1,2 @@
# 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 = yes # 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
CUSTOM_MATRIX = lite
SRC += matrix.c

View File

@ -36,6 +36,13 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"features": {
"bootmagic": true,
"mousekey": false,
"extrakey": false,
"rgblight": true,
"oled": true
},
"layouts": {
"LAYOUT": {
"layout": [

View File

@ -1 +0,0 @@
RGBLIGHT_ENABLE = yes

View File

@ -36,6 +36,13 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"features": {
"bootmagic": true,
"mousekey": false,
"extrakey": false,
"rgblight": true,
"oled": true
},
"layouts": {
"LAYOUT": {
"layout": [

View File

@ -1 +0,0 @@
RGBLIGHT_ENABLE = yes

View File

@ -1,15 +1 @@
# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # 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
OLED_ENABLE = yes
DEFAULT_FOLDER = kakunpc/suihankey/rev1

View File

@ -13,6 +13,12 @@
"rows": ["F4", "F5", "F6", "F7"]
},
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"mousekey": false,
"extrakey": false,
"rgblight": true
},
"layout_aliases": {
"LAYOUT": "LAYOUT_split_3x5_3"
},

View File

@ -1 +0,0 @@
RGBLIGHT_ENABLE = yes

View File

@ -25,6 +25,12 @@
"rows": ["D4", "C6", "D7", "E6", "B4"]
},
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"mousekey": false,
"extrakey": false,
"rgblight": true
},
"layout_aliases": {
"LAYOUT": "LAYOUT_split_3x5_3"
},

View File

@ -1 +0,0 @@
RGBLIGHT_ENABLE = yes

View File

@ -1,3 +1 @@
OLED_ENABLE = no
DEFAULT_FOLDER = kakunpc/suihankey/split/rev1

View File

@ -20,6 +20,14 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"features": {
"bootmagic": false,
"mousekey": true,
"extrakey": true,
"console": true,
"command": true,
"rgblight": true
},
"community_layouts": [
"fullsize_ansi"
],

View File

@ -1,15 +1,3 @@
# 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 = yes # 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 = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
CUSTOM_MATRIX = yes
SRC += matrix.c

View File

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

View File

@ -1,4 +0,0 @@
# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
RGB_MATRIX_ENABLE = yes
LTO_ENABLE = yes

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 = 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
DEFAULT_FOLDER = kapl/rev1