QMK Bot
302b8f3fc5
Merge remote-tracking branch 'origin/develop' into xap
2023-03-15 15:55:12 +00:00
QMK Bot
fc5d80d643
Merge remote-tracking branch 'origin/master' into develop
2023-03-15 15:54:29 +00:00
Conor Burns and Less/Rikki
c18d5ebd2d
add new board: splaytoraid ( #20052 )
...
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com >
2023-03-15 15:53:02 +00:00
QMK Bot
a1011cde7f
Merge remote-tracking branch 'origin/develop' into xap
2023-03-15 15:52:19 +00:00
QMK Bot
b56a8a57e3
Merge remote-tracking branch 'origin/master' into develop
2023-03-15 15:50:41 +00:00
915d7a18d7
[Keyboard] New Keyboard - Sugar Glider ( #19933 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com >
Co-authored-by: jack <0x6a73@protonmail.com >
2023-03-15 15:49:14 +00:00
QMK Bot
5c4138793e
Merge remote-tracking branch 'origin/develop' into xap
2023-03-15 15:48:43 +00:00
Less/Rikki
70bf714cdb
userspace/community layout fixes ( #19998 )
...
* fixup: improve AVR detection for 60_iso/unxmaal
* fixup: moved TAP_CODE_DELAY to mechmerlin/config.h
* fixup: move talljoe.c to INTROSPECTION_KEYMAP_C
* fixup: AVR/RGBLIGHT criteria for 60_iso/unxmaal
2023-03-15 15:47:12 +00:00
QMK Bot
1df2ed8ae4
Merge remote-tracking branch 'origin/develop' into xap
2023-03-14 21:32:26 +00:00
QMK Bot
291834b162
Merge remote-tracking branch 'origin/master' into develop
2023-03-14 21:31:50 +00:00
Nick Brassel
e62fc866db
Let's use workflows to parallelise the builds. ( #20120 )
...
* Let's use workflows to parallelise the builds.
* Nofail if files aren't present.
* Formatting.
2023-03-15 08:31:10 +11:00
QMK Bot
a69aee9d48
Merge remote-tracking branch 'origin/develop' into xap
2023-03-14 19:57:49 +00:00
QMK Bot
1fa8dbc516
Merge remote-tracking branch 'origin/master' into develop
2023-03-14 19:57:09 +00:00
c91296f001
[Keyboard] Add KP60 ( #20096 )
...
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com >
Co-authored-by: jack <0x6a73@protonmail.com >
2023-03-14 12:56:31 -07:00
QMK Bot
badb240d40
Merge remote-tracking branch 'origin/develop' into xap
2023-03-14 16:59:37 +00:00
QMK Bot
096dafcbf7
Merge remote-tracking branch 'origin/master' into develop
2023-03-14 16:58:51 +00:00
Sophie Machen and Joel Challis
99a39a1198
Update newbs_getting_started to include instructions for apple silicon ( #19579 )
...
Co-authored-by: Joel Challis <git@zvecr.com >
2023-03-14 12:58:08 -04:00
QMK Bot
d8702aea6f
Merge remote-tracking branch 'origin/develop' into xap
2023-03-14 07:42:29 +00:00
QMK Bot
298bc5a669
Merge remote-tracking branch 'origin/master' into develop
2023-03-14 07:41:50 +00:00
4283e69ac7
RF R1 8-9Xu PCB ( #20048 )
...
Co-authored-by: Tom Barnes <barnestom@me.com >
Co-authored-by: Drashna Jaelre <drashna@live.com >
2023-03-14 07:41:06 +00:00
QMK Bot
67b6b3679a
Merge remote-tracking branch 'origin/develop' into xap
2023-03-13 19:36:01 +00:00
QMK Bot
5d92bab33e
Merge remote-tracking branch 'origin/master' into develop
2023-03-13 19:35:24 +00:00
Albert Y
a71e58270c
Document Autocorrect callback functions ( #20115 )
2023-03-13 13:34:23 -06:00
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 and jack
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