Commit Graph

18501 Commits

Author SHA1 Message Date
97197f2ca2 Merge remote-tracking branch 'origin/master' into develop 2021-10-06 00:50:11 +00:00
22470f0302 [Keyboard] Add basic Keyhive Sofle support (#14296)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2021-10-05 17:49:39 -07:00
51154f1484 Merge remote-tracking branch 'origin/master' into develop 2021-10-05 23:50:23 +00:00
e8db309613 [Keymap] Some updates to mechmerlin userspace and keymaps (#14711) 2021-10-05 16:49:50 -07:00
e28fc56b0a Merge remote-tracking branch 'origin/master' into develop 2021-10-05 23:38:21 +00:00
e762db44ba 0xc7/61key touch-up (#14712)
* correct Configurator layout data

* rename LAYOUT to LAYOUT_60_ansi

* correct info.json maintainer field

Use the maintainer's GitHub username.

* correct the compiling/flashing instructions

Keyboard value is relative to `qmk_firmware/keyboards/`.
2021-10-05 16:37:42 -07:00
517adfb763 Merge remote-tracking branch 'origin/master' into develop 2021-10-05 23:30:43 +00:00
aabc0cc8ad Durgod DGK6X Galaxy: correct Configurator layout (#14714)
Top row had a y-value of 1, which placed it behind the number row when rendered.
2021-10-05 16:30:09 -07:00
e6311cf2ec Merge remote-tracking branch 'origin/master' into develop 2021-10-05 19:47:11 +00:00
4676a14596 More PR checklist updates (#14705)
* Wording, clarification.

* Apply suggestions from code review

Co-authored-by: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com>

Co-authored-by: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com>
2021-10-06 06:46:36 +11:00
a4417345f1 Merge remote-tracking branch 'origin/master' into develop 2021-10-05 09:30:24 +00:00
7a49e5d207 Add clarification for licensing. (#14704)
* Add clarification for licensing.

* Errr, v2.
2021-10-05 20:29:52 +11:00
39b06e3e28 Merge remote-tracking branch 'origin/master' into develop 2021-10-05 03:38:58 +00:00
46fe8ab4e2 [Keyboard] Update Iris default keymap (#14701) 2021-10-04 20:38:24 -07:00
d47f0c10fe Merge remote-tracking branch 'origin/master' into develop 2021-10-05 01:36:24 +00:00
85ba507482 [Keyboard] Added DC MC 001 (#14661) 2021-10-04 18:35:48 -07:00
95ead1bbd1 Merge remote-tracking branch 'origin/master' into develop 2021-10-05 01:17:14 +00:00
b441efbdf6 [Keyboard] add dztech duo_s keyboard (#14625)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-10-04 18:16:47 -07:00
2d71d14191 Merge remote-tracking branch 'origin/master' into develop 2021-10-04 23:21:33 +00:00
27d9579fd5 Document examples on intercepting Mod-Tap (#14502)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: filterpaper <filterpaper@localhost>
2021-10-04 16:21:02 -07:00
4af4ef3428 Merge remote-tracking branch 'origin/master' into develop 2021-10-04 16:26:57 +00:00
20f81af98a Allow community layouts to be specified in info.json (#14682)
* move the community layout detection to python

* fixup tests
2021-10-04 09:26:19 -07:00
8f3ea25dda Merge remote-tracking branch 'origin/master' into develop 2021-10-04 05:35:33 +00:00
f72b2ad720 [Keyboard] Add Iris Rev. 6 (#14683)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-03 22:35:00 -07:00
d785282df7 Merge remote-tracking branch 'origin/master' into develop 2021-10-03 21:17:56 +00:00
6279399425 [Keyboard] Fix Mechlovin's Olly/BB keyboard matrix file (#14680) 2021-10-03 22:17:46 +01:00
640869257f [Keyboard] Disable RGBLIGHT on mokey64 (#14681) 2021-10-03 22:17:23 +01:00
db6bf9be2b Merge remote-tracking branch 'origin/master' into develop 2021-10-03 19:03:19 +00:00
8782dc824d [Keyboard] Add anti-ghosting support to Model M Converter (#14049) 2021-10-03 12:02:51 -07:00
eb5b24f97c Add LM() keys to the list of keys disabled by NO_HAPTIC_MOD (#14181) 2021-10-03 12:02:05 -07:00
5ce2bb83ce Merge remote-tracking branch 'origin/master' into develop 2021-10-03 19:01:43 +00:00
5ece2846b6 [Keyboard] Fix key routing for Keyprez Rhino ergo keys (#14589) 2021-10-03 12:01:15 -07:00
fdc981418a Merge remote-tracking branch 'origin/master' into develop 2021-10-02 15:18:23 +00:00
0acedbe09f [Keyboard] Adding kbnordic nordic60 (#14555)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
2021-10-02 08:17:54 -07:00
9b64ef8c71 Merge remote-tracking branch 'origin/master' into develop 2021-10-02 15:07:07 +00:00
875bbd31dc [Keyboard] Add JP60 keyboard (#14219)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02 08:06:37 -07:00
64a118a58c Merge remote-tracking branch 'origin/master' into develop 2021-10-02 15:00:21 +00:00
0eaefb2a6c [Keyboard] Add Olly BB PCB (#14545)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02 08:00:05 -07:00
20a689e27c [Keyboard] Modify mokey64 (#14612)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02 07:59:47 -07:00
79c6757081 Merge remote-tracking branch 'origin/master' into develop 2021-10-02 14:51:25 +00:00
79ad30a9d5 [Keymap] Updates to Personal Kyria Keymap (#14669)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-02 07:50:55 -07:00
5b644af415 [Keyboard] Enable Proton C defaults for SplitKB Kyria (#14490)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-01 19:11:34 -07:00
481104053e Merge remote-tracking branch 'origin/master' into develop 2021-10-02 00:13:49 +00:00
54b8d6a891 [Keyboard] Convert ZSA's Moonlander keyboard to matrix lite (#14667) 2021-10-01 17:13:15 -07:00
ef3176713f Merge remote-tracking branch 'origin/master' into develop 2021-10-01 22:33:29 +00:00
bed7625f93 Add FIRMWARE_FORMAT = hex for /keyboards/kinesis/kint36 and /keyboards/kinesis/kint41 (#14665)
* Specify hex as the default FIRMWARE_FORMAT which is copied to qmk_firmware root folder

* Specify hex as the default FIRMWARE_FORMAT which is copied to qmk_firmware root folder

Co-authored-by: sadkins <sadkins@iMac-Pro.local>
2021-10-02 08:32:53 +10:00
de4a7131df Merge remote-tracking branch 'origin/master' into develop 2021-10-01 08:25:24 +00:00
umi
e54a57d32a [Docs] update Japanese translation of mod_tap.md (#13981)
* update mod_tap.md translation

* add id on config_options.md and update text based on comments
2021-10-01 17:24:53 +09:00
1a9e7b95ab Change MK66F18 -> MK66FX1M0 (#14659) 2021-09-30 23:14:37 +01:00
85b3f5a406 Merge remote-tracking branch 'origin/master' into develop 2021-09-30 21:24:52 +00:00