qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-09-18 00:29:15 +02:00
Code Issues Packages Projects Releases Wiki Activity
21,411 Commits 57 Branches 1,721 Tags
4d48300ade216865aeeb4346ce79a59cd753ebce
Commit Graph
21411 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
QMK Bot 4d48300ade Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 21:39:08 +00:00
QMK Bot f9e97fd3c3 Merge remote-tracking branch 'origin/master' into develop 2022-05-31 21:38:36 +00:00
Carlo Sala 5b16671d7a move RESET to QK_BOOT (#17278) 
* move RESET to QK_BOOT

* fix tapping_term
 2022-05-31 22:37:28 +01:00
zvecr d923483769 Bodge for breakpoint branch name 2022-05-31 18:43:21 +01:00
QMK Bot 1248afd956 Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 11:33:01 +00:00
QMK Bot 38839a9105 Merge remote-tracking branch 'origin/master' into develop 2022-05-31 11:32:26 +00:00
Forrest Cahoon 8153b55e07 Add trailing parens to get_oneshot_mods in feature_advanced_keycodes.md (#17211) 2022-05-31 21:31:47 +10:00
QMK Bot 72458dcd76 Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 08:23:30 +00:00
QMK Bot 6fdce80822 Merge remote-tracking branch 'origin/master' into develop 2022-05-31 08:22:54 +00:00
moyi4681 d5ed3ae967 [Keyboard] fix dz64rgb rgb sleep (#17209) 2022-05-31 01:22:07 -07:00
QMK Bot a06820a18d Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 06:20:46 +00:00
Thomas Preisner bbab8eb993 Make bootloader_jump for dualbank STM32 respect STM32_BOOTLOADER_DUAL_BANK_DELAY (#17178) 2022-05-30 23:20:10 -07:00
QMK Bot 995921443a Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 06:15:52 +00:00
Andrew Dunai ecce9900c9 Improve PS/2 mouse performance (#17111) 2022-05-30 23:15:17 -07:00
QMK Bot 292995c8ba Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 05:56:05 +00:00
precondition d44a950c10 Use TAP_HOLD_CAPS_DELAY for KC_LOCKING_CAPS_LOCK (#17099) 2022-05-30 22:55:33 -07:00
QMK Bot 6579526ace Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 05:38:38 +00:00
Nick Brassel 8545473307 Removes terminal from QMK. (#17258) 2022-05-30 22:38:08 -07:00
QMK Bot f227208634 Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 05:29:28 +00:00
trwnh 9e2fe4eff6 Make SPI Mode configurable and change default mode to 3 (#17263) 2022-05-31 15:28:55 +10:00
QMK Bot d5d72135e4 Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 05:04:02 +00:00
QMK Bot e869d089b7 Merge remote-tracking branch 'origin/master' into develop 2022-05-31 05:03:28 +00:00
Drashna Jaelre cda343acbe [Keymap] Drashna update for post Q2 merge (#17241) 2022-05-30 22:02:55 -07:00
QMK Bot df0d0bd2ce Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 04:47:33 +00:00
QMK Bot f663f84413 Merge remote-tracking branch 'origin/master' into develop 2022-05-31 04:47:02 +00:00
trwnh b554e4b612 Change AW20216 SPI Mode from 0 to 3, to fix RGB LEDs on GMMK Pro (#17262) 2022-05-31 14:46:21 +10:00
QMK Bot 9302ee0f81 Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 04:09:52 +00:00
QMK Bot 044486500c Merge remote-tracking branch 'origin/master' into develop 2022-05-31 04:09:14 +00:00
Sergey Vlasov 650be92cf9 Nix shell updates (#17243) 2022-05-31 14:08:23 +10:00
QMK Bot 9aadf14b31 Merge remote-tracking branch 'origin/develop' into xap 2022-05-31 02:10:05 +00:00
QMK Bot a099579aa0 Merge remote-tracking branch 'origin/master' into develop 2022-05-31 02:09:37 +00:00
Joel Challis 0e11b511e4 Convert ergodone to use core mcp23018 driver (#17005) 2022-05-31 03:08:56 +01:00
QMK Bot 03ca0cc8c9 Merge remote-tracking branch 'origin/develop' into xap 2022-05-30 22:44:39 +00:00
QMK Bot 67e80780bb Merge remote-tracking branch 'origin/master' into develop 2022-05-30 22:44:05 +00:00
Joel Challis 2879573688 Fix various lint errors (#17255) 
* Fix various lint errors

* reduce complexity
 2022-05-30 23:43:36 +01:00
Nick Brassel 33d779cc16 Merge remote-tracking branch 'upstream/develop' into xap 2022-05-31 08:08:22 +10:00
QMK Bot 6e4e50d5aa Merge remote-tracking branch 'origin/master' into develop 2022-05-30 22:06:28 +00:00
Dasky 25ec68c408 Fix docs typo (#17254) 2022-05-30 23:05:57 +01:00
Dasky 2de70e6f2d Add uf2-split-* make targets. (#17257) 2022-05-31 08:04:50 +10:00
QMK Bot 31fb141528 Merge remote-tracking branch 'origin/master' into develop 2022-05-30 21:46:00 +00:00
chalexDrashna JaelreRyanAlexander Leechalex
 		3826fca637 [Keyboard] Add str.merro60 pcb (#17097) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Alexander Lee <aclee3@CGHan-Macbook-2015.local>
Co-authored-by: chalex <chlxbsmt@gmail.com>
 2022-05-30 14:45:27 -07:00
QMK Bot 6b640db4bb Merge remote-tracking branch 'origin/master' into develop 2022-05-30 18:29:09 +00:00
Juno Nguyen 15a86d5c53 [Keymap] Updates to layouts/community/ortho_4x12/junonum (#17249) 2022-05-30 11:28:35 -07:00
QMK Bot e4be4d282c Merge remote-tracking branch 'origin/master' into develop 2022-05-30 18:07:56 +00:00
Seth Barberee cc7a3f8dc7 [Keymap] Update sethbarberee code to QK_BOOT and try out DVVORAK (#17230) 2022-05-30 11:07:16 -07:00
QMK Bot 9a2943d221 Merge remote-tracking branch 'origin/master' into develop 2022-05-30 14:34:54 +00:00
Joel Challis a06b5cae41 Fix API errors (#17239) 2022-05-30 15:34:20 +01:00
QMK Bot f03fe5b917 Merge remote-tracking branch 'origin/master' into develop 2022-05-29 19:16:27 +00:00
Joel Challis e22a183329 Use correct container for unit test workflow (#17242) 2022-05-29 20:15:54 +01:00
QMK Bot 6123698270 Merge remote-tracking branch 'origin/master' into develop 2022-05-29 05:18:24 +00:00