Commit Graph

26957 Commits

Author SHA1 Message Date
QMK Bot
5fd3488f9f Merge remote-tracking branch 'origin/develop' into xap 2023-04-16 05:16:08 +00:00
QMK Bot
f2e3dbf6aa Merge remote-tracking branch 'origin/master' into develop 2023-04-16 05:15:31 +00:00
spbgzh
6e5ff018e3
[Keyboard] Add zoom75 wired (#20396) 2023-04-15 23:14:51 -06:00
QMK Bot
23d67c298d Merge remote-tracking branch 'origin/develop' into xap 2023-04-15 20:37:43 +00:00
QMK Bot
976d950bb5 Merge remote-tracking branch 'origin/master' into develop 2023-04-15 20:37:06 +00:00
Wycer
75b7140cbd
[Keyboard] Add dymium65 (#20257)
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Wycer <wycers@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: linyer-qwq <990842844@qq.com>
Co-authored-by: Linyer-qwq <32816392+Linyer-qwq@users.noreply.github.com>
2023-04-15 14:36:17 -06:00
QMK Bot
9945d693bd Merge remote-tracking branch 'origin/develop' into xap 2023-04-15 19:30:33 +00:00
James Young
3569f39485
Merge remote-tracking branch 'upstream/master' into develop 2023-04-15 12:28:32 -07:00
Markus Knutsson
28c11ed348
Lotus58 glow (#20386)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
2023-04-15 19:34:09 +01:00
James Young
d732b0b849
ADPenrose Obi Layout Macro Conversion and Addition (#20445)
* add matrix_diagram.md

* info.json: apply friendly formatting

* move matrix data to info.json

* add LAYOUT_625u_space with reference keymap
2023-04-15 10:36:11 -07:00
QMK Bot
cbf12799ca Merge remote-tracking branch 'origin/develop' into xap 2023-04-15 15:19:29 +00:00
Nick Brassel
c9f619124d
Encodermap direction define. (#20454) 2023-04-15 16:18:44 +01:00
QMK Bot
aa3e9f59bd Merge remote-tracking branch 'origin/develop' into xap 2023-04-15 11:10:03 +00:00
Ryan
0ddb7d7863
Move single 60_ansi, 60_hhkb and 60_iso layouts to data driven (#20438) 2023-04-15 21:09:08 +10:00
QMK Bot
bf9f604b08 Merge remote-tracking branch 'origin/develop' into xap 2023-04-15 11:08:51 +00:00
Ryan
172a40686b
Move single LAYOUT_alls to data driven (#20430) 2023-04-15 21:08:15 +10:00
QMK Bot
739319e21a Merge remote-tracking branch 'origin/develop' into xap 2023-04-15 11:08:09 +00:00
Ryan
a84528f853
Move remaining LAYOUTs to data driven (#20422) 2023-04-15 21:07:32 +10:00
QMK Bot
5fc365d4aa Merge remote-tracking branch 'origin/develop' into xap 2023-04-14 09:43:30 +00:00
Ryan
54634e9263
Fix some missing QMK_KEYBOARD_H includes in user keymaps (#20417) 2023-04-14 19:42:50 +10:00
QMK Bot
cd2fe7704d Merge remote-tracking branch 'origin/develop' into xap 2023-04-13 04:44:03 +00:00
Drashna Jaelre
cf5626e024
[Bug] Fix compilation issues with PS/2 driver on F4x1 controllers (#20433) 2023-04-12 21:43:27 -07:00
QMK Bot
8a31483309 Merge remote-tracking branch 'origin/develop' into xap 2023-04-13 04:05:26 +00:00
QMK Bot
572f86349e Merge remote-tracking branch 'origin/master' into develop 2023-04-13 04:04:42 +00:00
Albert Y
6d965d486c
Add hardware information momokai keyboards (#20434) 2023-04-12 22:04:02 -06:00
QMK Bot
766b600f64 Merge remote-tracking branch 'origin/develop' into xap 2023-04-13 01:00:14 +00:00
Drashna Jaelre
d11c37925b
[Keyboard] Update ymdk/id75 config (#20432) 2023-04-12 17:59:07 -07:00
QMK Bot
6ec3b89704 Merge remote-tracking branch 'origin/develop' into xap 2023-04-12 21:37:59 +00:00
Drashna Jael're
a41f6a3e07
Merge remote-tracking branch 'origin/master' into develop 2023-04-12 14:36:45 -07:00
James Young
ce417226b2
4pplet/eagle_viper_rep/rev_a Layout Macro Conversion and Additions (#20414)
* info.json: apply friendly formatting

* add matrix_diagram.md

* move matrix data to info.json

* add LAYOUT_60_ansi_split_bs_rshift

* add LAYOUT_60_tsangan_hhkb

* add LAYOUT_60_hhkb
2023-04-12 14:29:29 -07:00
QMK Bot
d80db91573 Merge remote-tracking branch 'origin/develop' into xap 2023-04-12 19:30:04 +00:00
QMK Bot
4a58db949c Merge remote-tracking branch 'origin/master' into develop 2023-04-12 19:29:26 +00:00
Paulo Pereira
0382a25e35
[Keymap] Add paulomp90 lily58 keymap (#20327)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-04-12 13:28:26 -06:00
QMK Bot
48211918d1 Merge remote-tracking branch 'origin/develop' into xap 2023-04-12 17:33:13 +00:00
QMK Bot
614a682d3f Merge remote-tracking branch 'origin/master' into develop 2023-04-12 17:32:34 +00:00
Tommy Oldfield
83dcbefeed
[Keymap] Add personal keymap for Lily58 (#18735) 2023-04-12 10:31:47 -07:00
QMK Bot
a82915293f Merge remote-tracking branch 'origin/develop' into xap 2023-04-12 17:29:30 +00:00
QMK Bot
134586d834 Merge remote-tracking branch 'origin/master' into develop 2023-04-12 17:28:51 +00:00
Josh Hinnebusch
18335ddda5
[Keyboard] Fix h87 g2 VID conflict (#20388) 2023-04-12 10:27:37 -07:00
QMK Bot
f8e36408da Merge remote-tracking branch 'origin/develop' into xap 2023-04-12 15:36:35 +00:00
Moritz Plattner
c57902d443
[Keyboard] Add support for ISO version of Durgod Hades (#20110)
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-04-12 08:36:28 -07:00
QMK Bot
41add95eb6 Merge remote-tracking branch 'origin/master' into develop 2023-04-12 15:35:55 +00:00
Ryan
051485c579
[Keymap] PHSC138 Keymap for Atom47 (#18768)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-04-12 08:35:12 -07:00
QMK Bot
0326172b6f Merge remote-tracking branch 'origin/develop' into xap 2023-04-12 15:35:12 +00:00
QMK Bot
a9ec2b3ada Merge remote-tracking branch 'origin/master' into develop 2023-04-12 15:34:30 +00:00
Jeff Epler
5012dfd719
[Keyboard] add kb2040 flavor of gherkin (#18360) 2023-04-12 08:33:42 -07:00
QMK Bot
2d78426c05 Merge remote-tracking branch 'origin/develop' into xap 2023-04-12 15:09:26 +00:00
QMK Bot
9994e8c57f Merge remote-tracking branch 'origin/master' into develop 2023-04-12 15:08:47 +00:00
Less/Rikki
641698d356
[Keyboard] ymdk/id75 (#19967)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-04-12 08:07:47 -07:00
QMK Bot
668980b670 Merge remote-tracking branch 'origin/develop' into xap 2023-04-12 14:24:49 +00:00