Commit Graph

16055 Commits

Author SHA1 Message Date
fauxpark
bc77e79ed8 Merge remote-tracking branch 'upstream/master' into develop 2023-04-03 14:41:26 +10:00
Sergey Vlasov
2d7240f730
onekey: Fix console output on AVR (#19930) 2023-04-03 14:28:12 +10:00
Wilba
1d1c407e4e
Update WT60-H1, WT60-H3 layouts (#20114) 2023-04-03 13:09:15 +10:00
QMK Bot
fb2eb12479 Merge remote-tracking branch 'origin/develop' into xap 2023-04-03 03:07:07 +00:00
QMK Bot
4834c01f14 Merge remote-tracking branch 'origin/master' into develop 2023-04-03 03:06:30 +00:00
Torsten Schneider
9152928f02
Adding my keymap (#19964) 2023-04-03 13:05:48 +10:00
QMK Bot
078ee90bbf Merge remote-tracking branch 'origin/develop' into xap 2023-04-03 03:01:44 +00:00
Johannes H. Jensen
68efea70b2
Add direction to dynamic_macro_record_start_user (#19689) 2023-04-03 13:01:07 +10:00
QMK Bot
8929f31c22 Merge remote-tracking branch 'origin/develop' into xap 2023-04-03 02:57:01 +00:00
Phil Hollenback
162d6156d3
Allow a larger int for the idle timeout for urbanvanilla keymap (#19738) 2023-04-03 12:56:24 +10:00
QMK Bot
82c143d6bb Merge remote-tracking branch 'origin/develop' into xap 2023-04-03 00:08:15 +00:00
QMK Bot
3ec37f4d55 Merge remote-tracking branch 'origin/master' into develop 2023-04-03 00:07:20 +00:00
andi4000
ac9f9f9efb
ISO-DE Keymap for Dactyl Manuform 6x7 (#19441) 2023-04-03 10:06:40 +10:00
QMK Bot
35f3776428 Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 22:25:23 +00:00
QMK Bot
78e0f8dd54 Merge remote-tracking branch 'origin/master' into develop 2023-04-02 22:24:44 +00:00
HorrorTroll
d300811009
Add user horrortroll in userspace (#19769) 2023-04-03 08:24:04 +10:00
QMK Bot
ebe192428d Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 19:14:33 +00:00
Drashna Jael're
d997fe1a4a
Merge remote-tracking branch 'origin/master' into develop 2023-04-02 12:13:28 -07:00
Jay Greco
27e6e27d3a
[Keyboard] Add nullbits SNAP keyboard (#18916)
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-04-02 12:12:06 -07:00
Moritz Plattner
5687fc7646
Add support for Geistmaschine Macropod (#20116)
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
2023-04-02 12:02:20 -06:00
Travis Reed
ebe36ea83c
[Keymap] Add dancxjo hotdox76v2 keymap (#20016) 2023-04-02 12:01:06 -06:00
cttt
6b205c3064
[Keyboard] Add Erdnuss 65 (#20202)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-04-02 11:55:20 -06:00
butterkeebs
b5d0c44690
[Keyboard] Add pocketpad (#20229)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-04-02 11:50:14 -06:00
Thomaz Peres
d0e0b9e583
[Keyboard] Add Royal Kludge RKG-68 (#20138) 2023-04-02 11:49:05 -06:00
mechlovin
b0dc99fbd8
[Keyboard] Add Mechlovin9 rev.3 (#20119)
Co-authored-by: jack <0x6a73@protonmail.com>
2023-04-02 11:47:07 -06:00
QMK Bot
4024e779f3 Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 17:25:54 +00:00
Less/Rikki
9b89ad1e7b
[keyboard] add jacky_studio/piggy60/rev2 (#20297) 2023-04-02 11:25:14 -06:00
QMK Bot
b4d3029675 Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 17:24:41 +00:00
QMK Bot
203d9eb97c Merge remote-tracking branch 'origin/master' into develop 2023-04-02 17:24:05 +00:00
Raphael Mangubat
5b8dae0d61
Enable encoder mapping in VIA for Keebio KBO-5000 (#20272) 2023-04-02 11:23:26 -06:00
QMK Bot
cb49817082 Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 17:10:06 +00:00
QMK Bot
822445277e Merge remote-tracking branch 'origin/master' into develop 2023-04-02 17:09:29 +00:00
Vertex-kb
fd56a2a1dc
Add angle65 (#19986)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-04-02 11:08:53 -06:00
QMK Bot
b6aeb6b7e2 Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 09:00:45 +00:00
AuditeMarlow
12ea0e668f
[Keyboard] Add the KJ-Modify RS40 PCB (#20243) 2023-04-02 02:00:09 -07:00
QMK Bot
695f0a86ad Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 08:59:21 +00:00
QMK Bot
deb440f156 Merge remote-tracking branch 'origin/master' into develop 2023-04-02 08:58:45 +00:00
Alexander Kagno
be9f6e679b
[Keymap] update arkag keymap, add hitbox layout (#20271)
Co-authored-by: Alex Kagno <alex@turncommerce.com>
2023-04-02 01:57:54 -07:00
QMK Bot
7da8a0c0aa Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 08:36:17 +00:00
QMK Bot
930b3ba70d Merge remote-tracking branch 'origin/master' into develop 2023-04-02 08:35:36 +00:00
Cameron Varley
b53356f7ab
[Keyboard] Add GMMK Numpad (#20067)
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-04-02 01:34:54 -07:00
QMK Bot
870f73a14a Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 08:29:46 +00:00
QMK Bot
c4a19c7d1b Merge remote-tracking branch 'origin/master' into develop 2023-04-02 08:28:42 +00:00
QMK Bot
8df38e18c0 Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 08:28:19 +00:00
Albert Y
c402bac023
[Keymap] Ferris - Add split USB detection directive (#20213) 2023-04-02 01:28:00 -07:00
QMK Bot
cdcdc13ca5 Merge remote-tracking branch 'origin/master' into develop 2023-04-02 08:27:42 +00:00
Shane Dowling
a030e8094f
[Keymap] Add md40 ckrbd keymap (#19931)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-04-02 01:27:04 -07:00
QMK Bot
9c72ea4373 Merge remote-tracking branch 'origin/develop' into xap 2023-04-02 04:32:04 +00:00
Joel Challis
1fb06ee9af
Remove some use of keymap.h (#20316) 2023-04-02 05:31:22 +01:00
QMK Bot
65c09d6821 Merge remote-tracking branch 'origin/develop' into xap 2023-04-01 18:02:22 +00:00
Drashna Jaelre
bf986579dd
Fixup Pointing device functions (#20311) 2023-04-01 19:01:46 +01:00
QMK Bot
88f59112e0 Merge remote-tracking branch 'origin/develop' into xap 2023-04-01 02:13:59 +00:00
Ryan
9359504255
Move 66% and 68% layouts to data driven (#20293) 2023-04-01 13:13:18 +11:00
QMK Bot
8f42e096cb Merge remote-tracking branch 'origin/develop' into xap 2023-04-01 02:10:32 +00:00
Ryan
e40b6ca3b0
Move split layouts to data driven (#20290) 2023-04-01 13:09:53 +11:00
QMK Bot
79beb1710d Merge remote-tracking branch 'origin/develop' into xap 2023-03-30 17:27:06 +00:00
QMK Bot
5ce882d84e Merge remote-tracking branch 'origin/master' into develop 2023-03-30 17:26:20 +00:00
Alejandro Chacón
b63e388692
[Keyboard update] Fix json error (#20299) 2023-03-30 18:25:42 +01:00
QMK Bot
d256806be8 Merge remote-tracking branch 'origin/develop' into xap 2023-03-30 01:21:39 +00:00
Ryan
647c2835e6
WS2812 driver improvements (#20262) 2023-03-30 12:21:02 +11:00
QMK Bot
10007c6bb6 Merge remote-tracking branch 'origin/develop' into xap 2023-03-30 00:42:58 +00:00
QMK Bot
7e1e662dc7 Merge remote-tracking branch 'origin/master' into develop 2023-03-30 00:42:20 +00:00
Nick Brassel
81f3f0f3e9
Revert to hex output for kint41 (#20295) 2023-03-30 01:41:36 +01:00
QMK Bot
7182bc41ec Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 21:41:20 +00:00
Nick Brassel
c0a24671ee
Actually commit conflict resolution. 2023-03-30 08:40:35 +11:00
QMK Bot
71c1d76c6c Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 21:38:29 +00:00
Nick Brassel
836ffabc3d
Merge remote-tracking branch 'upstream/master' into develop 2023-03-30 08:37:24 +11:00
QMK Bot
a4837db456 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 20:17:05 +00:00
Less/Rikki
68a27b8e92
[jacky_studio/piggy60] move AVR PCB under rev1 (#20253) 2023-03-29 14:16:20 -06:00
Maverick0197
d0c36a7683
[Keyboard] Add KeyDeck8 (#20107)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-03-29 13:13:05 -07:00
4pplet
c6cc638752
[Keyboard] Add Steezy60 Rev B (#19688)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com>
Co-authored-by: Jue Liu <youturn@Jues-MacBook-Pro.local>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Shandon Anderson <shandon@shandon.codes>
Co-authored-by: jack <0x6A73@pm.me>
Co-authored-by: jason <jrucker2004@gmail.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
2023-03-29 13:10:47 -07:00
QMK Bot
2e23510313 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 19:36:13 +00:00
QMK Bot
f5e36620b2 Merge remote-tracking branch 'origin/master' into develop 2023-03-29 19:35:25 +00:00
Sắn
621dbdf8ee
[Keyboard] Add Plaque80 (#20240)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2023-03-29 13:34:42 -06:00
QMK Bot
3158dabb26 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 18:48:37 +00:00
QMK Bot
3042381679 Merge remote-tracking branch 'origin/master' into develop 2023-03-29 18:47:54 +00:00
Alejandro Chacón
896f38c52c
[Keyboard] Add alhenkb macropad (#20123) 2023-03-29 11:47:14 -07:00
QMK Bot
5358ce1e96 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 07:16:47 +00:00
Nick Brassel
f18dd488da
Fixup CI build for nack. (#20292) 2023-03-29 18:15:55 +11:00
QMK Bot
ce3246a314 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 05:02:37 +00:00
fauxpark
9602938e9e Merge remote-tracking branch 'upstream/master' into develop 2023-03-29 16:00:41 +11:00
QMK Bot
04e3e0a55f Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 04:55:13 +00:00
Ryan
4869b8061c
Move ortho & numpad layouts to data driven (#20183)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-03-29 15:54:34 +11:00
Ryan
e2630f9b40
Fix some invalid layout macros (#20256) 2023-03-29 15:51:22 +11:00
QMK Bot
b36a8e97e2 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 04:48:41 +00:00
Ryan
06664e8a94
Fix layouts containing keys with multiple matrix positions (#20191) 2023-03-29 15:47:59 +11:00
QMK Bot
922b153a53 Merge remote-tracking branch 'origin/develop' into xap 2023-03-29 01:10:46 +00:00
QMK Bot
6195b4fca2 Merge remote-tracking branch 'origin/master' into develop 2023-03-29 01:10:05 +00:00
Joel Challis
e0b1637e15
I have zero involvement with this keyboard... (#20287) 2023-03-29 02:09:26 +01:00
QMK Bot
c51fcb8057 Merge remote-tracking branch 'origin/develop' into xap 2023-03-28 16:29:41 +00:00
QMK Bot
26e60200ab Merge remote-tracking branch 'origin/master' into develop 2023-03-28 16:27:18 +00:00
takashicompany
a6b2b1ca41
Add new keyboard Tightwriter (#20136)
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
2023-03-28 10:24:53 -06:00
QMK Bot
7cb5dce968 Merge remote-tracking branch 'origin/develop' into xap 2023-03-28 13:34:30 +00:00
QMK Bot
379bb62aac Merge remote-tracking branch 'origin/master' into develop 2023-03-28 13:33:45 +00:00
Albert Y
02cb5db67b
Remove invalid characters (#20277) 2023-03-28 14:33:00 +01:00
QMK Bot
38c4a8e7d0 Merge remote-tracking branch 'origin/develop' into xap 2023-03-28 05:43:22 +00:00
QMK Bot
7eabf7efd1 Merge remote-tracking branch 'origin/master' into develop 2023-03-28 05:42:43 +00:00
blindassassin111
00c3946fbe
[keyboard] Correcting info.JSON for OSAv2 (#20247) 2023-03-27 23:42:04 -06:00
QMK Bot
5572a5eb99 Merge remote-tracking branch 'origin/develop' into xap 2023-03-27 19:01:46 +00:00
Joel Challis
79b0f9168e
Custom keycodes in JSON (#19925) 2023-03-27 20:01:07 +01:00