Commit Graph

26995 Commits

Author SHA1 Message Date
QMK Bot
fe54b2b85f Merge remote-tracking branch 'origin/develop' into xap 2023-03-13 12:21:38 +00:00
Ryan
91e0457b0e
JSON encoder: improve sorting of layout dict keys (#19974) 2023-03-13 23:20:54 +11:00
QMK Bot
b9cc125af6 Merge remote-tracking branch 'origin/develop' into xap 2023-03-13 12:03:21 +00:00
Ryan
cf5e9d172d
Fix layout macro keys with no matrix position (#20033) 2023-03-13 23:02:03 +11:00
QMK Bot
01a6e56c9b Merge remote-tracking branch 'origin/develop' into xap 2023-03-13 11:23:04 +00:00
Ryan
9e2ef5078a
Adjust offset for some layouts (#20075) 2023-03-13 22:22:20 +11:00
QMK Bot
30c054a0dc Merge remote-tracking branch 'origin/develop' into xap 2023-03-13 05:34:44 +00:00
QMK Bot
183e99f638 Merge remote-tracking branch 'origin/master' into develop 2023-03-13 05:34:07 +00:00
Albert Y
e0bd6fac10
Move Ferris Sweep to data-driven (#20111) 2023-03-12 23:33:31 -06:00
QMK Bot
e4dda24c6e Merge remote-tracking branch 'origin/develop' into xap 2023-03-12 10:25:01 +00:00
QMK Bot
b74f2c7b86 Merge remote-tracking branch 'origin/master' into develop 2023-03-12 10:24:16 +00:00
Darkhan
a5e7390419
[keyboard] Prevent LED flicker when connecting AnnePro 2 (#19709) 2023-03-12 21:23:39 +11:00
QMK Bot
aa9e4975c1 Merge remote-tracking branch 'origin/develop' into xap 2023-03-12 01:56:40 +00:00
QMK Bot
b27f9c636a Merge remote-tracking branch 'origin/master' into develop 2023-03-12 01:56:02 +00:00
Nick Brassel
bcfe67883e
Allow for CI builds to run for 23 hours, instead of 6. (part deux) (#20095) 2023-03-12 12:55:26 +11:00
QMK Bot
32416a8d6d Merge remote-tracking branch 'origin/develop' into xap 2023-03-12 01:20:12 +00:00
QMK Bot
727a55b3cc Merge remote-tracking branch 'origin/master' into develop 2023-03-12 01:19:34 +00:00
Nick Brassel
6b9dced611
Allow for CI builds to run for 23 hours, instead of 6. (#20094) 2023-03-12 01:18:49 +00:00
QMK Bot
8d877b44d7 Merge remote-tracking branch 'origin/develop' into xap 2023-03-11 21:06:07 +00:00
QMK Bot
bd6cc9e256 Merge remote-tracking branch 'origin/master' into develop 2023-03-11 21:05:08 +00:00
Andrew Kannan
042e42d1b7
Add Chimera65 Hotswap keyboard (#20038)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-11 14:04:26 -07:00
QMK Bot
816d3613f5 Merge remote-tracking branch 'origin/develop' into xap 2023-03-11 17:54:10 +00:00
QMK Bot
2ac9e82f61 Merge remote-tracking branch 'origin/master' into develop 2023-03-11 17:53:29 +00:00
jonylee@hfd
dff9ee25e2
[Keyboard] Add k83 (#19896) 2023-03-11 10:52:35 -07:00
QMK Bot
aa7b6d42c2 Merge remote-tracking branch 'origin/develop' into xap 2023-03-11 17:30:36 +00:00
QMK Bot
be49f85f31 Merge remote-tracking branch 'origin/master' into develop 2023-03-11 17:29:59 +00:00
Dan White
6fe223b5ee
Ketch LGUI/LALT key transposed on Minivan layout (#20025) 2023-03-11 10:29:20 -07:00
QMK Bot
73a595e423 Merge remote-tracking branch 'origin/develop' into xap 2023-03-11 17:27:59 +00:00
QMK Bot
e23bc28144 Merge remote-tracking branch 'origin/master' into develop 2023-03-11 17:27:23 +00:00
azhizhinov
b281d6efa2
[Keyboard] Change pierce vendor ID (#20088) 2023-03-11 10:26:47 -07:00
QMK Bot
c01f77c60d Merge remote-tracking branch 'origin/develop' into xap 2023-03-11 16:54:01 +00:00
QMK Bot
fd3864fb94 Merge remote-tracking branch 'origin/master' into develop 2023-03-11 16:53:25 +00:00
ebastler
36292faf94
Teleport native bugfix (changed F411CC wear levelling) (#20090)
* workaround for flash size issue

* enable mousekeys due to requests by some users
2023-03-11 16:52:45 +00:00
QMK Bot
5827aead79 Merge remote-tracking branch 'origin/develop' into xap 2023-03-11 13:00:42 +00:00
Nick Brassel
07157cd707
Merge remote-tracking branch 'upstream/master' into develop 2023-03-11 23:59:47 +11:00
Nick Brassel
e8a5630c7c
Yet another adventure in trying to fit things into a 32U4 (#20091) 2023-03-11 23:56:01 +11:00
Christopher Hoage
96b0baa230
[Keyboard] Add Spleeb default and custom firmware (#19481)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-03-10 22:33:52 -07:00
Vino Rodrigues
dbd1d3cba1
[Keyboard] Add Binpad BN009 R2 3x3 macropad (#19992)
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-10 20:12:14 -08:00
QMK Bot
a07ab01330 Merge remote-tracking branch 'origin/develop' into xap 2023-03-11 03:48:28 +00:00
QMK Bot
d3a9cf5d25 Merge remote-tracking branch 'origin/master' into develop 2023-03-11 03:47:48 +00:00
azhizhinov
1d04a818d7
[Keyboard] VIA support for Pierce keyboard (#20045) 2023-03-10 19:47:03 -08:00
QMK Bot
09b341a9ed Merge remote-tracking branch 'origin/develop' into xap 2023-03-11 02:28:07 +00:00
Joel Challis
a974c51d25
Relocate various modifier defines (#18638) 2023-03-10 18:27:29 -08:00
QMK Bot
438aea7041 Merge remote-tracking branch 'origin/develop' into xap 2023-03-10 20:47:51 +00:00
leah-splitkb
46bbb81dd2
Add RP2040 Community Edition alias for Liatris (#19966) 2023-03-10 12:47:10 -08:00
QMK Bot
1ed52f143a Merge remote-tracking branch 'origin/develop' into xap 2023-03-10 18:42:41 +00:00
Ryan
e933e0411f
Move matrix config to info.json, part 5 (#20003)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-03-11 05:41:58 +11:00
QMK Bot
69b4831f83 Merge remote-tracking branch 'origin/develop' into xap 2023-03-10 17:59:48 +00:00
Ryan
1022afa6c2
Move matrix config to info.json, part 8 (#20030) 2023-03-11 04:59:07 +11:00
QMK Bot
c697415da1 Merge remote-tracking branch 'origin/develop' into xap 2023-03-10 17:58:29 +00:00