Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity
24,110 commits 2 branches 1 tag 294 MiB
Commit graph

24,110 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Skidmore
9a587275cf
 		keyboards: fix malformed info.json files (#17292) 2022-06-02 17:50:08 +01:00
QMK Bot
344b8410f7 Merge remote-tracking branch 'origin/master' into develop 2022-06-02 16:38:09 +00:00
Aidan Gauland
7c3cb99164
 		[Keymap] Fix maddie layout for ploopy/trackball_nano (#17213) 2022-06-02 09:37:28 -07:00
QMK Bot
8bb2c66c88 Merge remote-tracking branch 'origin/master' into develop 2022-06-02 16:18:53 +00:00
Václav Kučera
7ff666340c
 		[Keyboard] Acheron Shark alpha Encoder support (#17266) 2022-06-02 09:17:47 -07:00
QMK Bot
73bd3dff8c Merge remote-tracking branch 'origin/master' into develop 2022-06-02 13:03:13 +00:00
wavtype
f330ef12b6
 		Add wavtype/p01_ultra (#16513) 
* new fork (manta and foundation)

added foundation and manta firmware

* removed manta

* VIA compliant changes

added readme, info.json edits

* Update keyboards/wavtype/foundation/config.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/foundation/readme.md

Co-authored-by: Joel Challis <git@zvecr.com>

* removed via.json and updated readme

* Update keyboards/wavtype/foundation/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/wavtype/foundation/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/wavtype/foundation/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keymap.c

* added p01 ultra

* updated diode direction

proto used opposite diode direction

* removed foundation

* Update keyboards/wavtype/p01_ultra/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/wavtype/p01_ultra/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/wavtype/p01_ultra/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/wavtype/p01_ultra/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/wavtype/p01_ultra/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/wavtype/p01_ultra/readme.md

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/wavtype/p01_ultra/info.json

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/p01_ultra/keymaps/via/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/p01_ultra/keymaps/default/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/wavtype/p01_ultra/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/wavtype/p01_ultra/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/wavtype/p01_ultra/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-06-02 14:02:36 +01:00
Dasky
af02baae78
 		Allow larger SPLIT_USB_TIMEOUT with default SPLIT_USB_TIMEOUT_POLL (#17272) 
* Switch SPLIT_USB_DETECT loop to uint16_t

* Add assertion
 2022-06-01 00:10:05 +01: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
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
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
Thomas Preisner
bbab8eb993
 		Make bootloader_jump for dualbank STM32 respect STM32_BOOTLOADER_DUAL_BANK_DELAY (#17178) 2022-05-30 23:20:10 -07:00
Andrew Dunai
ecce9900c9
 		Improve PS/2 mouse performance (#17111) 2022-05-30 23:15:17 -07:00
precondition
d44a950c10
 		Use TAP_HOLD_CAPS_DELAY for KC_LOCKING_CAPS_LOCK (#17099) 2022-05-30 22:55:33 -07:00
Nick Brassel
8545473307
 		Removes terminal from QMK. (#17258) 2022-05-30 22:38:08 -07:00
trwnh
9e2fe4eff6
 		Make SPI Mode configurable and change default mode to 3 (#17263) 2022-05-31 15:28:55 +10: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
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
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
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
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
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
chalex
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
Joel Challis
6a0ed63eb1
 		Fix quark_lp via firmware size (#17233) 2022-05-29 06:17:49 +01:00
QMK Bot
a765f730b1 Merge remote-tracking branch 'origin/master' into develop 2022-05-29 05:10:23 +00:00
jack
07f5147621
 		Fixup iron165r2 (#17119) 
* initial

* revert some defines

* formatting

* apply changes

* update readme

* suggestion
 2022-05-29 06:09:42 +01:00
QMK Bot
3ce029c7fd Merge remote-tracking branch 'origin/master' into develop 2022-05-28 23:07:45 +00:00
Nick Brassel
89a5d5aea0
 		Fixup command sequencing for master/develop. (#17227) 2022-05-29 09:07:11 +10:00
Nick Brassel
87c3a53716 Branch point after 2022-05-28 Breaking Change. 2022-05-29 08:16:00 +10:00
Nick Brassel
103c08cc75 Merge branch 'master' into develop 2022-05-29 08:13:56 +10:00