mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-03-13 06:54:08 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
QMK Bot
commit
db397ee702
keyboards
hadron/ver3
halfcliff
handwired
108key_trackpoint
42
aball
alcor_dactyl
battleship_gamepad
bdn9_ble
cyberstar
d48
dactyl
dactyl_manuform/6x6/blackpill_f411
datahand
dqz11n1g
frenchdev
fruity60
jankrp2040dactyl
lagrange
m40/5x5_macropad
macroboard/f411
meck_tkl
onekey
blackpill_f401
blackpill_f401_tinyuf2
blackpill_f411
blackpill_f411_tinyuf2
bluepill_f103c6
evb_wb32f3g71
evb_wb32fq95
sipeed_longan_nano
teensy_lc
ortho_brass
owlet60
pill60
prkl30/feather
promethium
pterodactyl
riblee_split
slash
split65/stm32
trackpoint
tractyl_manuform
twadlee/tp69
uthol/rev3
wulkan
hardwareabstraction/handwire
hazel/bad_wings
hhkb
hillside
hineybush/hbcp
horrortroll
hotdox
hs60
ibm/model_m_4th_gen/overnumpad_1xb
ingrained
inland/kb83
input_club/ergodox_infinity
@ -1,14 +0,0 @@
|
||||
{
|
||||
"matrix_pins": {
|
||||
"cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"],
|
||||
"rows": ["B15", "A8", "A9", "B14", "A15", "B3"]
|
||||
},
|
||||
"diode_direction": "COL2ROW",
|
||||
"indicators": {
|
||||
"caps_lock": "C13",
|
||||
"on_state": 0
|
||||
},
|
||||
"processor": "STM32F401",
|
||||
"bootloader": "stm32-dfu",
|
||||
"board": "BLACKPILL_STM32_F401"
|
||||
}
|
||||
@ -6,7 +6,10 @@
|
||||
"usb": {
|
||||
"vid": "0x474B",
|
||||
"pid": "0x0001",
|
||||
"device_version": "0.0.1"
|
||||
"device_version": "0.0.1",
|
||||
"shared_endpoint": {
|
||||
"keyboard": true
|
||||
}
|
||||
},
|
||||
"features": {
|
||||
"bootmagic": true,
|
||||
@ -15,6 +18,24 @@
|
||||
"console": true,
|
||||
"nkro": true
|
||||
},
|
||||
"qmk": {
|
||||
"locking": {
|
||||
"enabled": true,
|
||||
"resync": true
|
||||
}
|
||||
},
|
||||
"matrix_pins": {
|
||||
"cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"],
|
||||
"rows": ["B15", "A8", "A9", "B14", "A15", "B3"]
|
||||
},
|
||||
"diode_direction": "COL2ROW",
|
||||
"indicators": {
|
||||
"caps_lock": "C13",
|
||||
"on_state": 0
|
||||
},
|
||||
"processor": "STM32F401",
|
||||
"bootloader": "stm32-dfu",
|
||||
"board": "BLACKPILL_STM32_F401",
|
||||
"layouts": {
|
||||
"LAYOUT_tkl_ansi": {
|
||||
"layout": [
|
||||
@ -1,4 +0,0 @@
|
||||
# Build Options
|
||||
# change yes to no to disable
|
||||
#
|
||||
KEYBOARD_SHARED_EP = yes
|
||||
@ -1,9 +0,0 @@
|
||||
// Copyright 2021 Gabriel Kim (@gabrielkim13)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
||||
#define LOCKING_SUPPORT_ENABLE
|
||||
/* Locking resynchronize hack */
|
||||
#define LOCKING_RESYNC_ENABLE
|
||||
@ -1,6 +1,11 @@
|
||||
{
|
||||
"keyboard_name": "Onekey Blackpill STM32F401",
|
||||
"development_board": "blackpill_f401",
|
||||
"usb": {
|
||||
"shared_endpoint": {
|
||||
"keyboard": true
|
||||
}
|
||||
},
|
||||
"matrix_pins": {
|
||||
"cols": ["B0"],
|
||||
"rows": ["A7"]
|
||||
@ -1 +0,0 @@
|
||||
KEYBOARD_SHARED_EP = yes
|
||||
@ -2,6 +2,11 @@
|
||||
"keyboard_name": "Onekey Blackpill STM32F401 TinyUF2",
|
||||
"development_board": "blackpill_f401",
|
||||
"bootloader": "tinyuf2",
|
||||
"usb": {
|
||||
"shared_endpoint": {
|
||||
"keyboard": true
|
||||
}
|
||||
},
|
||||
"matrix_pins": {
|
||||
"cols": ["B0"],
|
||||
"rows": ["A7"]
|
||||
@ -1 +0,0 @@
|
||||
KEYBOARD_SHARED_EP = yes
|
||||
@ -1,6 +1,11 @@
|
||||
{
|
||||
"keyboard_name": "Onekey Blackpill STM32F411",
|
||||
"development_board": "blackpill_f411",
|
||||
"usb": {
|
||||
"shared_endpoint": {
|
||||
"keyboard": true
|
||||
}
|
||||
},
|
||||
"matrix_pins": {
|
||||
"cols": ["B0"],
|
||||
"rows": ["A7"]
|
||||
@ -1 +0,0 @@
|
||||
KEYBOARD_SHARED_EP = yes
|
||||
@ -2,6 +2,11 @@
|
||||
"keyboard_name": "Onekey Blackpill STM32F411 TinyUF2",
|
||||
"development_board": "blackpill_f411",
|
||||
"bootloader": "tinyuf2",
|
||||
"usb": {
|
||||
"shared_endpoint": {
|
||||
"keyboard": true
|
||||
}
|
||||
},
|
||||
"matrix_pins": {
|
||||
"cols": ["B0"],
|
||||
"rows": ["A7"]
|
||||
@ -1 +0,0 @@
|
||||
KEYBOARD_SHARED_EP = yes
|
||||
@ -1,4 +1,9 @@
|
||||
{
|
||||
"usb": {
|
||||
"shared_endpoint": {
|
||||
"keyboard": true
|
||||
}
|
||||
},
|
||||
"matrix_pins": {
|
||||
"cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
|
||||
"rows": ["B4", "B3", "A15", "B13", "B5"]
|
||||
@ -1,4 +0,0 @@
|
||||
# Build Options
|
||||
# change yes to no to disable
|
||||
#
|
||||
KEYBOARD_SHARED_EP = yes
|
||||
@ -1,4 +1,9 @@
|
||||
{
|
||||
"usb": {
|
||||
"shared_endpoint": {
|
||||
"keyboard": true
|
||||
}
|
||||
},
|
||||
"matrix_pins": {
|
||||
"cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
|
||||
"rows": ["B4", "B3", "A15", "B13", "B5"]
|
||||
@ -1,4 +0,0 @@
|
||||
# Build Options
|
||||
# change yes to no to disable
|
||||
#
|
||||
KEYBOARD_SHARED_EP = yes
|
||||
@ -1,4 +1,14 @@
|
||||
{
|
||||
"features": {
|
||||
"bluetooth": true,
|
||||
"bootmagic": true,
|
||||
"command": true,
|
||||
"console": true,
|
||||
"encoder": true,
|
||||
"extrakey": false,
|
||||
"mousekey": false,
|
||||
"nkro": true
|
||||
},
|
||||
"rgblight": {
|
||||
"saturation_steps": 8,
|
||||
"brightness_steps": 8,
|
||||
@ -1,18 +1,2 @@
|
||||
# Processor frequency
|
||||
F_CPU = 8000000
|
||||
|
||||
# Build Options
|
||||
# change yes to no to disable
|
||||
#
|
||||
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
|
||||
ENCODER_ENABLE = yes
|
||||
MOUSEKEY_ENABLE = no # Mouse keys
|
||||
EXTRAKEY_ENABLE = no # 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
|
||||
AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
|
||||
RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port.
|
||||
|
||||
BLUETOOTH_ENABLE = yes
|
||||
|
||||
@ -1,7 +1,10 @@
|
||||
{
|
||||
"keyboard_name": "UtholThree",
|
||||
"usb": {
|
||||
"device_version": "0.0.3"
|
||||
"device_version": "0.0.3",
|
||||
"shared_endpoint": {
|
||||
"keyboard": true
|
||||
}
|
||||
},
|
||||
"rgblight": {
|
||||
"led_count": 39,
|
||||
@ -1 +0,0 @@
|
||||
KEYBOARD_SHARED_EP = yes
|
||||
@ -1,5 +0,0 @@
|
||||
# If you add a haptic board,
|
||||
# enable it and set its driver here or in your keymap folder
|
||||
# The Pimoroni board's driver is DRV2605L
|
||||
# HAPTIC_ENABLE = yes # Enable haptic driver
|
||||
# HAPTIC_DRIVER = drv2605l
|
||||
@ -1,5 +0,0 @@
|
||||
# If you add a haptic board,
|
||||
# enable it and set its driver here or in your keymap folder
|
||||
# The Pimoroni board's driver is DRV2605L
|
||||
# HAPTIC_ENABLE = yes # Enable haptic driver
|
||||
# HAPTIC_DRIVER = drv2605l
|
||||
@ -1,5 +0,0 @@
|
||||
# If you add a haptic board,
|
||||
# enable it and set its driver here or in your keymap folder
|
||||
# The Pimoroni board's driver is DRV2605L
|
||||
# HAPTIC_ENABLE = yes # Enable haptic driver
|
||||
# HAPTIC_DRIVER = drv2605l
|
||||
@ -1,51 +0,0 @@
|
||||
// !!! DO NOT ADD #pragma once !!! //
|
||||
|
||||
// Step 1.
|
||||
// Declare custom effects using the RGB_MATRIX_EFFECT macro
|
||||
// (note the lack of semicolon after the macro!)
|
||||
|
||||
RGB_MATRIX_EFFECT(turn_off_rgb)
|
||||
RGB_MATRIX_EFFECT(kb_reset_rgb)
|
||||
|
||||
// Step 2.
|
||||
// Define effects inside the `RGB_MATRIX_CUSTOM_EFFECT_IMPLS` ifdef block
|
||||
|
||||
#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
|
||||
|
||||
// e.g: A simple effect, self-contained within a single method
|
||||
static bool turn_off_rgb(effect_params_t *params) {
|
||||
RGB_MATRIX_USE_LIMITS(led_min, led_max);
|
||||
for (uint8_t i = led_min; i < led_max; i++) {
|
||||
rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
|
||||
}
|
||||
return rgb_matrix_check_finished_leds(led_max);
|
||||
}
|
||||
|
||||
// e.g: A more complex effect, relying on external methods and state, with
|
||||
// dedicated init and run methods
|
||||
static uint8_t some_global_state;
|
||||
static void kb_reset_rgb_init(effect_params_t* params) {
|
||||
some_global_state = 0;
|
||||
}
|
||||
static bool kb_reset_rgb_run(effect_params_t* params) {
|
||||
RGB_MATRIX_USE_LIMITS(led_min, led_max);
|
||||
some_global_state++;
|
||||
if(some_global_state&0x01){
|
||||
for (uint8_t i = led_min; i < led_max; i++)
|
||||
rgb_matrix_set_color(i, 0, 0, 0);
|
||||
}
|
||||
else{
|
||||
for (uint8_t i = led_min; i < led_max; i++)
|
||||
rgb_matrix_set_color(i, 0xc0, 0xc0, 0xc0);
|
||||
}
|
||||
if(some_global_state>=7)
|
||||
rgb_matrix_init();
|
||||
return rgb_matrix_check_finished_leds(led_max);
|
||||
}
|
||||
|
||||
static bool kb_reset_rgb(effect_params_t* params) {
|
||||
if (params->init) kb_reset_rgb_init(params);
|
||||
return kb_reset_rgb_run(params);
|
||||
}
|
||||
|
||||
#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
|
||||
@ -1 +0,0 @@
|
||||
#RGB_MATRIX_CUSTOM_USER = yes
|
||||
Loading…
Reference in New Issue
Block a user