gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-19 14:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot 2025-06-02 18:24:41 +00:00
commit 54ea703d03
41 changed files with 45 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
keyboards/pabile/p18/keyboard.json
View File

@ -27,8 +27,7 @@
{"pin_a": "F6", "pin_b": "F5"} {"pin_a": "F6", "pin_b": "F5"}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

3
keyboards/pabile/p20/ver1/keyboard.json
View File

@ -22,8 +22,7 @@
{"pin_a": "F7", "pin_b": "B1"} {"pin_a": "F7", "pin_b": "B1"}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_numpad_5x4": { "LAYOUT_numpad_5x4": {
"layout": [ "layout": [

3
keyboards/pabile/p20/ver2/keyboard.json
View File

@ -15,8 +15,7 @@
"rows": ["C6", "D7", "E6", "B4", "B5"] "rows": ["C6", "D7", "E6", "B4", "B5"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_numpad_5x4": { "LAYOUT_numpad_5x4": {
"layout": [ "layout": [

3
keyboards/pabile/p40/keyboard.json
View File

@ -20,8 +20,7 @@
"rows": ["F6", "B3", "B2", "B6"] "rows": ["F6", "B3", "B2", "B6"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"community_layouts": ["ortho_4x10"], "community_layouts": ["ortho_4x10"],
"layouts": { "layouts": {
"LAYOUT_ortho_4x10": { "LAYOUT_ortho_4x10": {

3
keyboards/pabile/p40_ortho/keyboard.json
View File

@ -19,8 +19,7 @@
"rows": ["D1", "D0", "F4", "F5"] "rows": ["D1", "D0", "F4", "F5"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_ortho_4x10": { "LAYOUT_ortho_4x10": {
"layout": [ "layout": [

3
keyboards/pabile/p42/keyboard.json
View File

@ -20,8 +20,7 @@
"rows": ["D1", "D0", "D4", "C6"] "rows": ["D1", "D0", "D4", "C6"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

3
keyboards/peej/tripel/info.json
View File

@ -20,6 +20,5 @@
"rows": ["C6", "D4", "D0", "B4", "E6", "D7", "D1", "D2", "D3"] "rows": ["C6", "D4", "D0", "B4", "E6", "D7", "D1", "D2", "D3"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro"
"bootloader": "caterina"
} }

3
keyboards/peranekofactory/tone/rev1/keyboard.json
View File

@ -27,8 +27,7 @@
}, },
"tap_keycode_delay": 100 "tap_keycode_delay": 100
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"matrix_pins": { "matrix_pins": {
"direct": [ "direct": [
["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"] ["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"]

3
keyboards/peranekofactory/tone/rev2/keyboard.json
View File

@ -27,8 +27,7 @@
}, },
"tap_keycode_delay": 100 "tap_keycode_delay": 100
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"matrix_pins": { "matrix_pins": {
"direct": [ "direct": [
["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"] ["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"]

3
keyboards/pica40/rev1/keyboard.json
View File

@ -1,6 +1,5 @@
{ {
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"matrix_pins": { "matrix_pins": {
"cols": ["D2", "B5", "B4", "E6", "D7"], "cols": ["D2", "B5", "B4", "E6", "D7"],

3
keyboards/pimentoso/paddino02/rev1/keyboard.json
View File

@ -24,8 +24,7 @@
"rows": ["D1", "D0", "D4"] "rows": ["D1", "D0", "D4"]
}, },
"diode_direction": "ROW2COL", "diode_direction": "ROW2COL",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

3
keyboards/pimentoso/paddino02/rev2/left/keyboard.json
View File

@ -24,8 +24,7 @@
"rows": ["D0", "D4", "D1"] "rows": ["D0", "D4", "D1"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

3
keyboards/pimentoso/paddino02/rev2/right/keyboard.json
View File

@ -24,8 +24,7 @@
"rows": ["F4", "F6", "F5"] "rows": ["F4", "F6", "F5"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

3
keyboards/pimentoso/touhoupad/keyboard.json
View File

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

3
keyboards/pinky/3/keyboard.json
View File

@ -17,8 +17,7 @@
"pin": "D2" "pin": "D2"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layout_aliases": { "layout_aliases": {
"LAYOUT": "LAYOUT_split_3x7_4" "LAYOUT": "LAYOUT_split_3x7_4"
}, },

3
keyboards/pinky/4/keyboard.json
View File

@ -17,8 +17,7 @@
"pin": "D2" "pin": "D2"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layout_aliases": { "layout_aliases": {
"LAYOUT": "LAYOUT_split_4x7_4" "LAYOUT": "LAYOUT_split_4x7_4"
}, },

3
keyboards/plum47/keyboard.json
View File

@ -2,7 +2,7 @@
"manufacturer": "Masayuki Takagi", "manufacturer": "Masayuki Takagi",
"keyboard_name": "plum47", "keyboard_name": "plum47",
"maintainer": "awh-tokyo", "maintainer": "awh-tokyo",
"bootloader": "caterina", "development_board": "promicro",
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
@ -14,7 +14,6 @@
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7"], "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7"],
"rows": ["D1", "D0", "D4", "C6"] "rows": ["D1", "D0", "D4", "C6"]
}, },
"processor": "atmega32u4",
"url": "ihttps://github.com/takagi/plum47_buildguide", "url": "ihttps://github.com/takagi/plum47_buildguide",
"usb": { "usb": {
"device_version": "1.0.0", "device_version": "1.0.0",

3
keyboards/psuieee/pluto12/keyboard.json
View File

@ -31,8 +31,7 @@
{"pin_a": "B6", "pin_b": "B2"} {"pin_a": "B6", "pin_b": "B2"}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

3
keyboards/pteron36/keyboard.json
View File

@ -54,8 +54,7 @@
"ws2812": { "ws2812": {
"pin": "B6" "pin": "B6"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"community_layouts": ["split_3x5_3"], "community_layouts": ["split_3x5_3"],
"layouts": { "layouts": {
"LAYOUT_split_3x5_3": { "LAYOUT_split_3x5_3": {

3
keyboards/rainkeebs/rainkeeb/keyboard.json
View File

@ -32,8 +32,7 @@
{"pin_a": "B2", "pin_b": "B6"} {"pin_a": "B2", "pin_b": "B6"}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

3
keyboards/rart/rart4x4/keyboard.json
View File

@ -54,8 +54,7 @@
{"pin_a": "D7", "pin_b": "E6"} {"pin_a": "D7", "pin_b": "E6"}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"community_layouts": ["ortho_4x4"], "community_layouts": ["ortho_4x4"],
"layouts": { "layouts": {
"LAYOUT_ortho_4x4": { "LAYOUT_ortho_4x4": {

3
keyboards/rart/rart67m/keyboard.json
View File

@ -26,8 +26,7 @@
"rows": ["D3", "D2", "D4", "F6", "B3", "B4", "B2", "B5"] "rows": ["D3", "D2", "D4", "F6", "B3", "B4", "B2", "B5"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layout_aliases": { "layout_aliases": {
"LAYOUT_all": "LAYOUT" "LAYOUT_all": "LAYOUT"
}, },

3
keyboards/rart/rartlite/keyboard.json
View File

@ -29,8 +29,7 @@
"num_lock": "F6", "num_lock": "F6",
"on_state": 0 "on_state": 0
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_right_numpad": { "LAYOUT_right_numpad": {
"layout": [ "layout": [

3
keyboards/rart/rartpad/keyboard.json
View File

@ -57,8 +57,7 @@
"twinkle": true "twinkle": true
} }
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"community_layouts": ["ortho_5x4", "numpad_5x4"], "community_layouts": ["ortho_5x4", "numpad_5x4"],
"layouts": { "layouts": {
"LAYOUT_ortho_5x4": { "LAYOUT_ortho_5x4": {

3
keyboards/rate/pistachio_mp/keyboard.json
View File

@ -39,8 +39,7 @@
{"pin_a": "F4", "pin_b": "F5"} {"pin_a": "F4", "pin_b": "F5"}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

3
keyboards/recompile_keys/choco60/rev1/keyboard.json
View File

@ -19,6 +19,5 @@
"pin": "D3" "pin": "D3"
} }
}, },
"processor": "atmega32u4", "development_board": "promicro"
"bootloader": "caterina"
} }

3
keyboards/recompile_keys/cocoa40/keyboard.json
View File

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

3
keyboards/recompile_keys/nomu30/rev1/keyboard.json
View File

@ -10,6 +10,5 @@
"rows": ["D1", "D0", "D4"] "rows": ["D1", "D0", "D4"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro"
"bootloader": "caterina"
} }

3
keyboards/rect44/keyboard.json
View File

@ -37,8 +37,7 @@
"rows": ["D3", "D2", "F5", "F4"] "rows": ["D3", "D2", "F5", "F4"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layouts": { "layouts": {
"LAYOUT_all": { "LAYOUT_all": {
"layout": [ "layout": [

3
keyboards/redox_media/keyboard.json
View File

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

3
keyboards/reviung/reviung34/keyboard.json
View File

@ -26,8 +26,7 @@
"rows": ["F4", "F5", "F6", "F7"] "rows": ["F4", "F5", "F6", "F7"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"community_layouts": [ "community_layouts": [
"split_3x5_2" "split_3x5_2"
], ],

3
keyboards/reviung/reviung39/keyboard.json
View File

@ -49,8 +49,7 @@
"rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"] "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layout_aliases": { "layout_aliases": {
"LAYOUT_reviung39": "LAYOUT" "LAYOUT_reviung39": "LAYOUT"
}, },

3
keyboards/reviung/reviung41/keyboard.json
View File

@ -49,8 +49,7 @@
"rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"] "rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layout_aliases": { "layout_aliases": {
"LAYOUT_reviung41": "LAYOUT" "LAYOUT_reviung41": "LAYOUT"
}, },

3
keyboards/reviung/reviung5/keyboard.json
View File

@ -53,8 +53,7 @@
{"pin_a": "D0", "pin_b": "D1"} {"pin_a": "D0", "pin_b": "D1"}
] ]
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layout_aliases": { "layout_aliases": {
"LAYOUT_reviung5": "LAYOUT" "LAYOUT_reviung5": "LAYOUT"
}, },

3
keyboards/reviung/reviung53/keyboard.json
View File

@ -47,8 +47,7 @@
"rows": ["D0", "D4", "C6", "D7", "E6", "B4", "B5"] "rows": ["D0", "D4", "C6", "D7", "E6", "B4", "B5"]
}, },
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"layout_aliases": { "layout_aliases": {
"LAYOUT_reviung53": "LAYOUT" "LAYOUT_reviung53": "LAYOUT"
}, },

3
keyboards/rgbkb/zen/rev1/keyboard.json
View File

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

3
keyboards/rgbkb/zen/rev2/keyboard.json
View File

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

3
keyboards/rpiguy9907/southpaw66/keyboard.json
View File

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

3
keyboards/rura66/rev1/keyboard.json
View File

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

3
keyboards/ryanbaekr/rb1/keyboard.json
View File

@ -7,8 +7,7 @@
"pid": "0x0001", "pid": "0x0001",
"device_version": "0.0.3" "device_version": "0.0.3"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina",
"features": { "features": {
"bootmagic": true, "bootmagic": true,
"extrakey": true, "extrakey": true,

9
quantum/quantum.c
View File

@ -461,8 +461,8 @@ bool process_record_quantum(keyrecord_t *record) {
} else { } else {
print("DEBUG: disabled.\n"); print("DEBUG: disabled.\n");
} }
#endif
return false; return false;
#endif
case QK_CLEAR_EEPROM: case QK_CLEAR_EEPROM:
#ifdef NO_RESET #ifdef NO_RESET
eeconfig_init(); eeconfig_init();
@ -479,13 +479,13 @@ bool process_record_quantum(keyrecord_t *record) {
#ifndef NO_ACTION_ONESHOT #ifndef NO_ACTION_ONESHOT
case QK_ONE_SHOT_TOGGLE: case QK_ONE_SHOT_TOGGLE:
oneshot_toggle(); oneshot_toggle();
break; return false;
case QK_ONE_SHOT_ON: case QK_ONE_SHOT_ON:
oneshot_enable(); oneshot_enable();
break; return false;
case QK_ONE_SHOT_OFF: case QK_ONE_SHOT_OFF:
oneshot_disable(); oneshot_disable();
break; return false;
#endif #endif
#ifdef ENABLE_COMPILE_KEYCODE #ifdef ENABLE_COMPILE_KEYCODE
case QK_MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader case QK_MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader
@ -512,6 +512,7 @@ bool process_record_quantum(keyrecord_t *record) {
if (temp_mod & MOD_MASK_SHIFT && temp_mod & MOD_MASK_CTRL) { if (temp_mod & MOD_MASK_SHIFT && temp_mod & MOD_MASK_CTRL) {
reset_keyboard(); reset_keyboard();
} }
return false;
} }
#endif #endif
} }