36b7a13be9
Merge remote-tracking branch 'origin/master' into develop
2022-01-20 17:25:31 +00:00
39a5ffd782
[Keyboard] add Plexus75_HE ( #15634 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-01-20 09:24:51 -08:00
6ebb44f17e
[Bug][Core] Fix optical sensor firmware upload ( #15919 )
2022-01-20 09:23:16 -08:00
24324378a8
Merge remote-tracking branch 'origin/master' into develop
2022-01-19 20:54:25 +00:00
6156e6da8d
Small code improvements, fix KVM switch issues with GMMK Pro on andrebrait's keymap ( #15943 )
...
* Add LED table
* Make constants constant
* Disable Mousekey to fix issues with KVM
Fixes #15939
* Update GMMK/pro/ansi/andrebrait README
2022-01-19 20:53:21 +00:00
d840ef2b28
Relocate matrix_scan_quantum tasks ( #15882 )
...
* Move matrix_scan_quantum tasks
* Fix tests
* Fix up missing refs
2022-01-19 17:38:48 +00:00
dcb0c4e51e
Add example implementations for compatible MCUs list ( #15935 )
...
* Add example implementations for compatible MCUs list
* Update docs/compatible_microcontrollers.md
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-01-19 20:34:59 +11:00
bb75c10e28
Merge remote-tracking branch 'origin/master' into develop
2022-01-19 00:21:45 +00:00
91e50209e7
Fixup build. ( #15931 )
2022-01-19 11:21:08 +11:00
3a01f51063
Merge remote-tracking branch 'origin/master' into develop
2022-01-19 00:19:22 +00:00
47f978e9cc
Remove `keyboard_folder` instances from `info.json` files ( #15932 )
...
* remove `keyboard_folder` instance from caffeinated/serpent65
* remove `keyboard_folder` instances from dumbpad
* remove `keyboard_folder` instances from mlego directory
* remove `keyboard_folder` instance from neopad/rev1
* remove `keyboard_folder` instance from spaceman/pancake/rev2
2022-01-19 00:18:45 +00:00
b825af0728
Merge remote-tracking branch 'origin/master' into develop
2022-01-18 18:25:03 +00:00
f6a7f4d4ac
update the Chinese translation based on the latest English version ( #14924 )
...
Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com>
Co-authored-by: Joy Lee <chang.li@westberrytech.com>
Co-authored-by: LitoMore <LitoMore@users.noreply.github.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
2022-01-18 18:24:02 +00:00
9a65cc39da
Merge remote-tracking branch 'origin/master' into develop
2022-01-17 19:01:26 +00:00
8a3dfe2246
[Keyboard] fix odin rgb light error ( #15914 )
2022-01-17 11:00:48 -08:00
fb65f07832
Merge remote-tracking branch 'origin/master' into develop
2022-01-17 14:12:32 +00:00
b8951a0458
Add LAYOUTS entry to rules.mk ( #15900 )
...
* Add layouts to rules.mk
* Remove excess settings.
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2022-01-17 14:11:58 +00:00
c72ed7c024
CLI: Parse USB device version BCD ( #14580 )
...
* CLI: Parse USB device version BCD
* Apply suggestions
2022-01-17 08:44:34 +11:00
557fbbd6af
Yet another bad `DEFAULT_FOLDER` fix. ( #15904 )
2022-01-16 20:12:58 +00:00
217ad5cfc0
move yd60mq to ymdk vendor folder ( #15647 )
2022-01-17 07:01:00 +11:00
6a723c3571
Merge remote-tracking branch 'origin/master' into develop
2022-01-16 19:59:22 +00:00
d02be63000
Revert "update keyboard_aliases.json ( #15649 )" ( #15903 )
...
This reverts commit b24603ab7d
2022-01-17 06:58:48 +11:00
069e232bab
Merge remote-tracking branch 'origin/master' into develop
2022-01-16 19:54:12 +00:00
b24603ab7d
update keyboard_aliases.json ( #15649 )
2022-01-17 06:53:43 +11:00
15290f4366
rename idobo to idobao/id75, move to vendor folder ( #15661 )
...
* rename idobo to idobao/id75, move to vendor folder
* add image, amend readme to id75
* add buying link
2022-01-17 06:53:11 +11:00
1d3c2ceded
Add init function to clear previous effect ( #15815 )
2022-01-17 06:48:09 +11:00
33384a3663
Merge remote-tracking branch 'origin/master' into develop
2022-01-15 20:23:36 +00:00
5380e6758c
Fix dactyl manuform 6x6 LAYOUT_6x6_5_thumb rendering ( #15891 )
2022-01-15 20:23:09 +00:00
02637ec350
Merge remote-tracking branch 'origin/master' into develop
2022-01-15 07:51:29 +00:00
7edfb4deff
[Keyboard] Fix compilation issues for mechlovin hex4b ( #15885 )
2022-01-14 23:51:02 -08:00
9cd2024814
Merge remote-tracking branch 'origin/master' into develop
2022-01-15 07:28:32 +00:00
5bad37cb56
[Bug] Remove config.h include in dynamic_keymap.c ( #15886 )
2022-01-15 18:28:29 +11:00
922e29f16c
[Keyboard] Add Rosaline ( #15595 )
2022-01-14 23:28:03 -08:00
b8dbebec2d
Merge remote-tracking branch 'origin/master' into develop
2022-01-15 07:27:06 +00:00
b2ea12aaa5
[Keyboard] Add Devil68 Pro ( #15820 )
2022-01-14 23:26:26 -08:00
f07ea255a9
Merge remote-tracking branch 'origin/master' into develop
2022-01-15 05:49:44 +00:00
2e266c7ec1
[Keyboard] Fix encoder bug zoom65 and zoom65_litte ( #15876 )
2022-01-14 21:49:11 -08:00
08a42dc72c
Fix broken bootloader builds in develop. ( #15880 )
2022-01-15 01:04:58 +00:00
77eae62d62
Merge remote-tracking branch 'origin/master' into develop
2022-01-14 19:06:58 +00:00
f8870a4c8a
[Keymap] added keymap conor with rgb layers ( #15234 )
2022-01-14 11:06:24 -08:00
90f2a03895
Merge remote-tracking branch 'origin/master' into develop
2022-01-14 18:58:43 +00:00
ca0f922e07
[Keyboard] Add Keychron_q1 rev_0101 and Keychron q2 series ( #15025 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Cesar Rojas <cesar.fieoner@gmail.com>
Co-authored-by: lokher <lokher@gmail.com>
Co-authored-by: Adam Karim <adam@akarsoft.com>
2022-01-14 10:58:09 -08:00
71a9384f49
Merge remote-tracking branch 'origin/master' into develop
2022-01-14 14:48:10 +00:00
9e92d8a905
Make note of upper limit for `UC()` ( #15870 )
2022-01-14 14:47:36 +00:00
cfc136f198
Merge remote-tracking branch 'origin/master' into develop
2022-01-14 14:47:32 +00:00
61f0292f11
Remove network drive mapping comment for WSL ( #15871 )
2022-01-14 14:46:47 +00:00
b7fb5f9987
Merge remote-tracking branch 'origin/master' into develop
2022-01-14 04:42:48 +00:00
fd4adbc0cc
[keyboard] Adding Atlas_65 ( #15839 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-01-13 20:42:11 -08:00
fba519116d
Merge remote-tracking branch 'origin/master' into develop
2022-01-14 04:41:11 +00:00
e865cab48e
[Keymap] ericgebhart keymap and userspace updates ( #15727 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Drashna Jael're <drashna@live.com>
2022-01-13 20:40:41 -08:00
QMK Bot
npspears
Drashna Jaelre
Andre Brait
Joel Challis
Ryan
Nick Brassel
James Young
IskandarMa
moyi4681
Albert Y
peepeetee
Bartosz Nowak
Paul James
HorrorTroll
GG
Dasky
Conor Burns
lalalademaxiya1
Ryan Smith
Eric Gebhart