Merge remote-tracking branch 'qmk/master' into merge-2025-06-21

This commit is contained in:
Ilya Zhuravlev 2025-06-21 16:00:42 -06:00
commit 7b247bc800
3559 changed files with 29294 additions and 11618 deletions

View file

@ -59,8 +59,7 @@
"build": {
"lto": true
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [

View file

@ -11,7 +11,6 @@
"features": {
"bootmagic": true,
"command": true,
"console": false,
"extrakey": true,
"mousekey": false,
"nkro": false,
@ -57,8 +56,7 @@
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [

View file

@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": false
@ -36,8 +34,7 @@
"pin": "D2"
}
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [

View file

@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
@ -57,8 +55,7 @@
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [

View file

@ -21,5 +21,5 @@
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 180
#define OLED_FONT_H "keyboards/getta25/keymaps/oled/glcdfont.c"
#define OLED_FONT_H "keyboards/salicylic_acid3/getta25/keymaps/oled/glcdfont.c"

View file

@ -46,8 +46,7 @@
"rows": ["D4", "C6", "D7", "E6", "B2"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [

View file

@ -2,12 +2,10 @@
"manufacturer": "Salicylic-acid3",
"keyboard_name": "guide68",
"maintainer": "Salicylic-acid3",
"bootloader": "caterina",
"development_board": "promicro",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"rgblight": true,
@ -17,8 +15,6 @@
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
},
"processor": "atmega32u4",
"url": "",
"usb": {
"vid": "0x04D8",
"pid": "0xE6DD",
@ -39,7 +35,6 @@
"twinkle": true
},
"sleep": true,
"max_brightness": 255,
"split": true,
"split_count": [6, 6]
},

View file

@ -56,8 +56,7 @@
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [

View file

@ -30,7 +30,6 @@
"features": {
"bootmagic": false,
"command": true,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
@ -47,8 +46,7 @@
"rows": ["D1", "D0", "D4"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [

View file

@ -63,8 +63,7 @@
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [

View file

@ -37,8 +37,7 @@
}
}
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [

View file

@ -51,8 +51,7 @@
"ws2812": {
"pin": "B6"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [

View file

@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
@ -57,8 +55,7 @@
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [

View file

@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
@ -57,8 +55,7 @@
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [

View file

@ -76,8 +76,7 @@
"rows": ["D4", "C6", "D7", "E6"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"development_board": "promicro",
"community_layouts": ["numpad_6x4"],
"layouts": {
"LAYOUT_numpad_6x4": {