Commit graph

12575 commits

Author SHA1 Message Date
QMK Bot
6c58f5098e Merge remote-tracking branch 'origin/develop' into xap 2022-06-30 02:26:05 +00:00
jpe230
d206c1791e
(develop)Keychron Q2: Enable support for WL EEPROM Driver (#17507) 2022-06-30 12:25:33 +10:00
QMK Bot
4707117f7a Merge remote-tracking branch 'origin/develop' into xap 2022-06-30 01:08:23 +00:00
jpe230
4f124574f1
(develop)AP2: Enable support for WL EEPROM Driver (#17506) 2022-06-30 11:07:43 +10:00
QMK Bot
9fcfaa950a Merge remote-tracking branch 'origin/develop' into xap 2022-06-25 19:46:45 +00:00
QMK Bot
60cbb25148 Merge remote-tracking branch 'origin/master' into develop 2022-06-25 19:46:15 +00:00
rooski15
410686dc03
[Keyboard] Add blockboy/ac980mini keyboard (#16839)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-06-25 12:45:45 -07:00
QMK Bot
9505ca5362 Merge remote-tracking branch 'origin/develop' into xap 2022-06-25 19:16:24 +00:00
QMK Bot
c43e89bb4a Merge remote-tracking branch 'origin/master' into develop 2022-06-25 19:15:48 +00:00
jack
cbbdcec290
[Keyboard] Fixup skergo - missing keycode in keymaps (#17458) 2022-06-25 12:15:00 -07:00
QMK Bot
6a6176a0aa Merge remote-tracking branch 'origin/develop' into xap 2022-06-24 22:03:42 +00:00
QMK Bot
3c9f27e1c9 Merge remote-tracking branch 'origin/master' into develop 2022-06-24 22:03:10 +00:00
Evelien Dekkers
31dfdaa1ba
[Keyboard] Fix firmware size for via keymap on Atom47 (#17472) 2022-06-24 15:02:33 -07:00
QMK Bot
33da381968 Merge remote-tracking branch 'origin/develop' into xap 2022-06-24 10:40:43 +00:00
precondition
3b9e186019
Do not enable PERMISSIVE_HOLD when TAPPING_TERM exceeds 500ms (#15674) 2022-06-24 12:40:09 +02:00
QMK Bot
ac23283d9c Merge remote-tracking branch 'origin/develop' into xap 2022-06-24 04:12:34 +00:00
QMK Bot
0e60b3a620 Merge remote-tracking branch 'origin/master' into develop 2022-06-24 04:11:58 +00:00
Nick Brassel
a8677ed296
Fix up Djinn fuse handling. (#17465) 2022-06-24 14:11:06 +10:00
QMK Bot
b782a1f778 Merge remote-tracking branch 'origin/develop' into xap 2022-06-23 01:16:43 +00:00
QMK Bot
a0f857b7a2 Merge remote-tracking branch 'origin/master' into develop 2022-06-23 01:16:12 +00:00
James Young
666cba5c2e
Cf/evyd13 wasdat (#17452)
* evyd13/wasdat: add LAYOUT_all Configurator data

* info.json: fix JSON syntax errors
2022-06-23 02:15:38 +01:00
QMK Bot
370a7704e9 Merge remote-tracking branch 'origin/develop' into xap 2022-06-23 00:53:23 +00:00
QMK Bot
2f9145c6ea Merge remote-tracking branch 'origin/master' into develop 2022-06-23 00:52:50 +00:00
Salicylic-acid3
47fcb40a81
[Keyboard] Fix RGB_matrix coordinates for gl516/j73gl (#17450) 2022-06-22 17:52:16 -07:00
QMK Bot
a2c4283f9d Merge remote-tracking branch 'origin/develop' into xap 2022-06-23 00:40:28 +00:00
QMK Bot
b02f178c06 Merge remote-tracking branch 'origin/master' into develop 2022-06-23 00:39:54 +00:00
Kevin Zhao
8ea836f2b2
[Keyboard] Update SKErgo for hardware changes (#17449)
Co-authored-by: kevinzhao-tech <kevin@keyz.io>
2022-06-22 17:39:19 -07:00
QMK Bot
223e01b762 Merge remote-tracking branch 'origin/develop' into xap 2022-06-22 16:41:55 +00:00
QMK Bot
2e27eb318e Merge remote-tracking branch 'origin/master' into develop 2022-06-22 16:41:19 +00:00
James Young
0a04064362
Chaos 65 Community Layout Support (#17447)
* move ISO Enter position to home row

This commit makes the ISO layout macros compatible with QMK's `65_iso_blocker` and `65_iso_blocker_tsangan` community layouts.

* info.json: apply friendly formatting

- add key labels
- add line breaks between physical rows

* enable Community Layout support

* chaos65.h: add matrix diagram
2022-06-22 09:40:48 -07:00
QMK Bot
ac8eb8acb3 Merge remote-tracking branch 'origin/develop' into xap 2022-06-22 14:31:33 +00:00
QMK Bot
8ea9f13c67 Merge remote-tracking branch 'origin/master' into develop 2022-06-22 14:30:56 +00:00
James Young
27f9e4775e
Checkerboards SNOP60 Refactor (#17446) 2022-06-22 07:29:47 -07:00
QMK Bot
a2f1ea37eb Merge remote-tracking branch 'origin/develop' into xap 2022-06-22 05:11:30 +00:00
QMK Bot
b450ffc5c6 Merge remote-tracking branch 'origin/master' into develop 2022-06-22 05:10:58 +00:00
Greg Dietsche
701db278e4
[Keymap] farmergreg's kint41 Kinesis Advantage 2 Layout (#16784) 2022-06-21 22:10:17 -07:00
QMK Bot
40d7920759 Merge remote-tracking branch 'origin/develop' into xap 2022-06-22 02:15:45 +00:00
QMK Bot
267864e42c Merge remote-tracking branch 'origin/master' into develop 2022-06-22 02:15:13 +00:00
Muhammad Rivaldi
46644b0a64
[Keyboard] Add n60a pcb (#17273)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-06-21 19:14:36 -07:00
QMK Bot
0c9bf637d5 Merge remote-tracking branch 'origin/develop' into xap 2022-06-22 01:54:10 +00:00
QMK Bot
86bfd8195c Merge remote-tracking branch 'origin/master' into develop 2022-06-22 01:53:38 +00:00
paulgali
3e9f000a97
[Keyboard] Zeno 60% Ergo PCB (#17403)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-06-21 18:53:04 -07:00
QMK Bot
b7998829d5 Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 15:51:34 +00:00
QMK Bot
2d7a2dfad0 Merge remote-tracking branch 'origin/master' into develop 2022-06-21 15:50:58 +00:00
Joel Challis
de4262f9aa
Add missing snop60 default keymap (#17443) 2022-06-21 16:49:58 +01:00
QMK Bot
43adf84d65 Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 12:24:16 +00:00
QMK Bot
65fcf951d3 Merge remote-tracking branch 'origin/master' into develop 2022-06-21 12:23:46 +00:00
James Young
03d0182541
alt34 rev1: Configurator Compilation Fix (#17442)
* move USE_I2C and EE_HANDS definitions to keyboard level

Allow this keyboard to be compiled by QMK Configurator.

* remove redundant DEFAULT_FOLDER rule
2022-06-21 13:22:53 +01:00
QMK Bot
313e7f64a3 Merge remote-tracking branch 'origin/develop' into xap 2022-06-21 03:42:46 +00:00
QMK Bot
d116cf5e9a Merge remote-tracking branch 'origin/master' into develop 2022-06-21 03:42:15 +00:00