mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-05 01:15:19 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
38639c37f1
@ -16,6 +16,18 @@
|
||||
},
|
||||
"processor": "atmega32u4",
|
||||
"bootloader": "lufa-dfu",
|
||||
"features": {
|
||||
"bootmagic": false,
|
||||
"mousekey": true,
|
||||
"extrakey": true,
|
||||
"console": true,
|
||||
"command": true,
|
||||
"key_lock": true,
|
||||
"dynamic_macro": true
|
||||
},
|
||||
"build": {
|
||||
"lto": true
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
|
@ -1,20 +1,4 @@
|
||||
# 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
|
||||
|
||||
CUSTOM_MATRIX = lite
|
||||
KEY_LOCK_ENABLE = yes
|
||||
|
||||
DYNAMIC_MACRO_ENABLE = yes
|
||||
|
||||
UART_DEBUG = no
|
||||
|
||||
@ -22,8 +6,6 @@ SRC += matrix.c
|
||||
UART_DRIVER_REQUIRED = yes
|
||||
SPI_DRIVER_REQUIRED = yes
|
||||
|
||||
OPT_DEFS += -DSLEEP_LED_ENABLE # we need our own sleep callbacks to turn of WS2812 LEDs
|
||||
|
||||
LTO_ENABLE = yes
|
||||
OPT_DEFS += -DSLEEP_LED_ENABLE
|
||||
|
||||
DEFAULT_FOLDER = ibm/model_m/mschwingen/led_wired
|
||||
|
@ -15,6 +15,11 @@
|
||||
"diode_direction": "ROW2COL",
|
||||
"processor": "at90usb1286",
|
||||
"bootloader": "halfkay",
|
||||
"features": {
|
||||
"bootmagic": false,
|
||||
"mousekey": false,
|
||||
"extrakey": false
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
@ -1,12 +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 = no # Enable keyboard RGB underglow
|
||||
AUDIO_ENABLE = no # Audio output
|
@ -6,7 +6,10 @@
|
||||
"usb": {
|
||||
"vid": "0x16C0",
|
||||
"pid": "0x27DB",
|
||||
"device_version": "0.0.1"
|
||||
"device_version": "0.0.1",
|
||||
"shared_endpoint": {
|
||||
"keyboard": true
|
||||
}
|
||||
},
|
||||
"indicators": {
|
||||
"caps_lock": "C11",
|
||||
@ -16,6 +19,12 @@
|
||||
"processor": "STM32F446", // RET6
|
||||
"bootloader": "stm32-dfu",
|
||||
"diode_direction": "ROW2COL",
|
||||
"features": {
|
||||
"bootmagic": true,
|
||||
"mousekey": true,
|
||||
"extrakey": true,
|
||||
"haptic": true
|
||||
},
|
||||
"matrix_pins": {
|
||||
// All pins in order from left-to-right, as seen on the keyboard:
|
||||
// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10,
|
||||
|
@ -1,17 +1 @@
|
||||
# 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
|
||||
ENCODER_ENABLE = no # Enable rotary encoder support
|
||||
AUDIO_ENABLE = no # Audio output
|
||||
KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
|
||||
|
||||
HAPTIC_ENABLE = yes
|
||||
HAPTIC_DRIVER = solenoid
|
||||
|
@ -19,6 +19,12 @@
|
||||
},
|
||||
"processor": "atmega32u4",
|
||||
"bootloader": "caterina",
|
||||
"features": {
|
||||
"bootmagic": false,
|
||||
"mousekey": false,
|
||||
"extrakey": false,
|
||||
"console": true
|
||||
},
|
||||
"community_layouts": ["split_3x5_3"],
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
@ -1,12 +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 = yes # 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
|
@ -10,7 +10,8 @@
|
||||
"extrakey": true,
|
||||
"console": false,
|
||||
"command": false,
|
||||
"nkro": true
|
||||
"nkro": true,
|
||||
"rgb_matrix": true
|
||||
},
|
||||
"ws2812": {
|
||||
"pin": "B3"
|
@ -1,4 +0,0 @@
|
||||
# This file intentionally left blank
|
||||
# ** settings are data driven & stored in `info.json` **
|
||||
|
||||
RGB_MATRIX_ENABLE = yes
|
@ -10,7 +10,8 @@
|
||||
"console": false,
|
||||
"extrakey": true,
|
||||
"mousekey": true,
|
||||
"nkro": true
|
||||
"nkro": true,
|
||||
"rgb_matrix": true
|
||||
},
|
||||
"ws2812": {
|
||||
"pin": "F0"
|
@ -1,5 +0,0 @@
|
||||
# Copyright 2022 Vino Rodrigues (@vinorodrigues)
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# ** settings are data driven & stored in `info.json` **
|
||||
|
||||
RGB_MATRIX_ENABLE = yes
|
@ -10,7 +10,8 @@
|
||||
"console": false,
|
||||
"extrakey": true,
|
||||
"mousekey": true,
|
||||
"nkro": true
|
||||
"nkro": true,
|
||||
"rgb_matrix": true
|
||||
},
|
||||
"ws2812": {
|
||||
"pin": "B7"
|
@ -1,4 +0,0 @@
|
||||
# This file intentionally left blank
|
||||
# ** settings are data driven & stored in `info.json` **
|
||||
|
||||
RGB_MATRIX_ENABLE = yes
|
@ -10,7 +10,8 @@
|
||||
"extrakey": true,
|
||||
"command": false,
|
||||
"console": false,
|
||||
"nkro": true
|
||||
"nkro": true,
|
||||
"rgb_matrix": true
|
||||
},
|
||||
"ws2812": {
|
||||
"pin": "F0"
|
@ -1,4 +0,0 @@
|
||||
# Build Options
|
||||
# change yes to no to disable
|
||||
#
|
||||
RGB_MATRIX_ENABLE = yes # Enable RGB Matrix feature
|
@ -10,7 +10,8 @@
|
||||
"extrakey": true,
|
||||
"console": false,
|
||||
"command": false,
|
||||
"nkro": true
|
||||
"nkro": true,
|
||||
"rgb_matrix": true
|
||||
},
|
||||
"rgb_matrix": {
|
||||
"animations": {
|
@ -1,4 +0,0 @@
|
||||
# This file intentionally left blank
|
||||
# ** settings are data driven & stored in `info.json` **
|
||||
|
||||
RGB_MATRIX_ENABLE = yes
|
@ -10,7 +10,8 @@
|
||||
"extrakey": true,
|
||||
"console": false,
|
||||
"command": false,
|
||||
"nkro": true
|
||||
"nkro": true,
|
||||
"rgb_matrix": true
|
||||
},
|
||||
"ws2812": {
|
||||
"pin": "E2"
|
@ -1,4 +0,0 @@
|
||||
# This file intentionally left blank
|
||||
# ** settings are data driven & stored in `info.json` **
|
||||
|
||||
RGB_MATRIX_ENABLE = yes
|
@ -10,7 +10,8 @@
|
||||
"console": false,
|
||||
"extrakey": true,
|
||||
"mousekey": true,
|
||||
"nkro": true
|
||||
"nkro": true,
|
||||
"rgb_matrix": true
|
||||
},
|
||||
"ws2812": {
|
||||
"pin": "B1"
|
@ -1,4 +0,0 @@
|
||||
# This file intentionally mostly left blank
|
||||
# ** settings are data driven & stored in `info.json` **
|
||||
|
||||
RGB_MATRIX_ENABLE = yes
|
@ -6,10 +6,20 @@
|
||||
"usb": {
|
||||
"vid": "0xB33F",
|
||||
"pid": "0x58E4",
|
||||
"device_version": "0.0.1"
|
||||
"device_version": "0.0.1",
|
||||
"no_startup_check": true
|
||||
},
|
||||
"processor": "atmega32u4",
|
||||
"bootloader": "atmel-dfu",
|
||||
"features": {
|
||||
"bootmagic": false,
|
||||
"mousekey": true,
|
||||
"extrakey": true,
|
||||
"unicode": true
|
||||
},
|
||||
"build": {
|
||||
"lto": true
|
||||
},
|
||||
"community_layouts": ["split_3x5_3", "split_3x6_3"],
|
||||
"layouts": {
|
||||
"LAYOUT_split_3x6_3": {
|
||||
|
@ -1,19 +1,4 @@
|
||||
# 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
|
||||
UNICODE_ENABLE = yes
|
||||
CUSTOM_MATRIX = lite
|
||||
NO_USB_STARTUP_CHECK = yes
|
||||
LTO_ENABLE = yes
|
||||
|
||||
SRC += matrix.c
|
||||
I2C_DRIVER_REQUIRED = yes
|
||||
|
@ -34,6 +34,15 @@
|
||||
},
|
||||
"processor": "WB32FQ95",
|
||||
"bootloader": "wb32-dfu",
|
||||
"features": {
|
||||
"bootmagic": true,
|
||||
"mousekey": false,
|
||||
"extrakey": true,
|
||||
"nkro": true,
|
||||
"rgb_matrix": true,
|
||||
"dip_switch": true,
|
||||
"encoder": true
|
||||
},
|
||||
"matrix_pins": {
|
||||
"cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"],
|
||||
"rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
|
||||
|
@ -1,17 +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
|
||||
KEYBOARD_SHARED_EP = no
|
||||
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
|
||||
DIP_SWITCH_ENABLE = yes # DPI Switch
|
||||
ENCODER_ENABLE = yes
|
||||
RGB_MATRIX_ENABLE = yes
|
||||
#RGB_MATRIX_CUSTOM_USER = yes #Add turnoff LED
|
||||
#RGB_MATRIX_CUSTOM_USER = yes
|
||||
|
@ -43,6 +43,18 @@
|
||||
},
|
||||
"processor": "MK20DX256",
|
||||
"bootloader": "kiibohd",
|
||||
"features": {
|
||||
"bootmagic": false,
|
||||
"mousekey": true,
|
||||
"extrakey": true,
|
||||
"command": true,
|
||||
"nkro": true,
|
||||
"led_matrix": true,
|
||||
"unicode": true,
|
||||
"swap_hands": true,
|
||||
"sleep_led": true,
|
||||
"st7565": true
|
||||
},
|
||||
"board": "IC_TEENSY_3_1",
|
||||
"tapping": {
|
||||
"toggle": 1
|
||||
|
@ -1,20 +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 = yes # Enable N-Key Rollover
|
||||
UNICODE_ENABLE = yes # Unicode
|
||||
SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard
|
||||
SLEEP_LED_ENABLE = yes
|
||||
|
||||
RGBLIGHT_ENABLE = no
|
||||
|
||||
SERIAL_DRIVER = usart
|
||||
|
||||
ST7565_ENABLE = yes
|
||||
|
||||
LED_MATRIX_ENABLE = yes
|
||||
|
Loading…
Reference in New Issue
Block a user