TheWanderingCrow/vial-qmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'qmk/master' into merge-2024-06-23

Browse source
This commit is contained in:
Ilya Zhuravlev 2024-06-23 22:54:29 -06:00
commit e9d70b410a
15675 changed files with 653160 additions and 679575 deletions
Download patch file Download diff file Expand all files Collapse all files

0
keyboards/keycapsss/3w6_2040/info.json → keyboards/keycapsss/3w6_2040/keyboard.json
View file

5
keyboards/keycapsss/kimiko/rev1/config.h
View file

@ -22,8 +22,3 @@
#else
#define RGBLIGHT_LIMIT_VAL 80
#endif
/* 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

6
keyboards/keycapsss/kimiko/rev1/info.json → keyboards/keycapsss/kimiko/rev1/keyboard.json
View file

@ -12,6 +12,12 @@
"cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["C6", "D7", "E6", "B4", "B5"]
},
"qmk": {
"locking": {
"enabled": true,
"resync": true
}
},
"diode_direction": "COL2ROW",
"encoder": {
"rotary": [

2
keyboards/keycapsss/kimiko/rev1/keymaps/default/keymap.c
View file

@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_ADJUST] = LAYOUT(
QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX,
RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,

1
keyboards/keycapsss/kimiko/rev1/rules.mk
View file

@ -1 +0,0 @@

0
keyboards/keycapsss/kimiko/rev2/info.json → keyboards/keycapsss/kimiko/rev2/keyboard.json
View file

2
keyboards/keycapsss/kimiko/rev2/keymaps/default/keymap.c
View file

@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `----------------------------------' '---------------------------------'
*/
[_ADJUST] = LAYOUT(
QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX,
RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,

1
keyboards/keycapsss/kimiko/rev2/rules.mk
View file

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

22
keyboards/keycapsss/o4l_5x12/config.h
View file

@ -1,22 +0,0 @@
#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
/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
/* disable debug print */
//#define NO_DEBUG
/* disable print */
//#define NO_PRINT
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT

15
keyboards/keycapsss/o4l_5x12/info.json → keyboards/keycapsss/o4l_5x12/keyboard.json
View file

@ -29,6 +29,21 @@
"ws2812": {
"pin": "D3"
},
"features": {
"bootmagic": false,
"command": true,
"console": false,
"extrakey": true,
"mousekey": false,
"nkro": false,
"rgblight": true
},
"qmk": {
"locking": {
"enabled": true,
"resync": true
}
},
"matrix_pins": {
"cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "F6", "F5", "F4"],
"rows": ["F7", "B1", "B3", "B2", "B6"]

2
keyboards/keycapsss/o4l_5x12/keymaps/2x2u/keymap.c
View file

@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, KC_DEL,
RGB_M_P, KC_LCBR, KC_LBRC, KC_LPRN, KC_SLSH, KC_BSLS, KC_RPRN, KC_RBRC, KC_RCBR, _______, _______, KC_PIPE,
RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
RGB_TOG, QK_BOOT, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
RGB_TOG, QK_BOOT, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
)
};

12
keyboards/keycapsss/o4l_5x12/rules.mk
View file

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

2
keyboards/keycapsss/plaid_pad/keymaps/default/keymap.c
View file

@ -28,7 +28,7 @@ LAYOUT_ortho_4x4(
// Only for Rev1 & Rev2
#ifdef LED_RED
void keyboard_post_init_user(void) {
writePinHigh(LED_RED);
gpio_write_pin_high(LED_RED);
}
#endif

2
keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c
View file

@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Only for Rev1 & Rev2
#ifdef LED_RED
void keyboard_post_init_user(void) {
writePinHigh(LED_RED);
gpio_write_pin_high(LED_RED);
}
#endif

9
keyboards/keycapsss/plaid_pad/rev1/info.json → keyboards/keycapsss/plaid_pad/rev1/keyboard.json
View file

@ -8,5 +8,14 @@
{"pin_a": "D1", "pin_b": "D0"},
{"pin_a": "B2", "pin_b": "B1"}
]
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
"encoder": true
}
}

1
keyboards/keycapsss/plaid_pad/rev1/rules.mk
View file

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

9
keyboards/keycapsss/plaid_pad/rev2/info.json → keyboards/keycapsss/plaid_pad/rev2/keyboard.json
View file

@ -10,5 +10,14 @@
{"pin_a": "B4", "pin_b": "B3"},
{"pin_a": "D4", "pin_b": "B5"}
]
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
"encoder": true
}
}

1
keyboards/keycapsss/plaid_pad/rev2/rules.mk
View file

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

10
keyboards/keycapsss/plaid_pad/rev3/info.json → keyboards/keycapsss/plaid_pad/rev3/keyboard.json
View file

@ -10,5 +10,15 @@
{"pin_a": "B4", "pin_b": "B3"},
{"pin_a": "D4", "pin_b": "B5"}
]
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
"encoder": true,
"oled": true
}
}

2
keyboards/keycapsss/plaid_pad/rev3/rules.mk
View file

@ -1,2 +0,0 @@
ENCODER_ENABLE = yes
OLED_ENABLE = yes

13
keyboards/keycapsss/plaid_pad/rules.mk
View file

@ -1,14 +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
AUDIO_ENABLE = no # Audio output
DEFAULT_FOLDER = keycapsss/plaid_pad/rev1