masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,458 Commits 2 Branches 0 Tags 274 MiB
Commit Graph

18458 Commits

Author SHA1 Message Date
QMK Bot a94c6fa620 Merge remote-tracking branch 'origin/master' into develop 2021-10-06 05:54:29 +00:00
James Young c33491d72b
MelGeek Mach80: correct Configurator layout (#14716) 
Adds a 0.5u gap between the top two rows.
 2021-10-05 22:53:53 -07:00
QMK Bot 181ba6bbbb Merge remote-tracking branch 'origin/master' into develop 2021-10-06 01:59:09 +00:00
remanifest 4782e038d9
Added semicolons to rules.mk to allow symlinks from /bin/sh to /bin/zsh to complete the filesize check without error. (#14718) 
Co-authored-by: John Beard <jbeard@pipelinerx.com>
 2021-10-06 12:58:40 +11:00
Drashna Jaelre ba8f1454f4
Move Audio drivers from quantum to platform drivers folder (#14308) 
* Move Audio drivers from quantum to platform drivers folder

* fix path for audio drivers

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-06 12:01:45 +11:00
QMK Bot 9f0e74802a Merge remote-tracking branch 'origin/master' into develop 2021-10-06 00:50:53 +00:00
Drashna Jaelre 3b8c4979dc
[Bug] Fix command feature if mousekey is enabled and using 3-speed setting (#14697) 2021-10-05 17:50:23 -07:00
QMK Bot 97197f2ca2 Merge remote-tracking branch 'origin/master' into develop 2021-10-06 00:50:11 +00:00
Drashna Jaelre 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
QMK Bot 51154f1484 Merge remote-tracking branch 'origin/master' into develop 2021-10-05 23:50:23 +00:00
MechMerlin e8db309613
[Keymap] Some updates to mechmerlin userspace and keymaps (#14711) 2021-10-05 16:49:50 -07:00
QMK Bot e28fc56b0a Merge remote-tracking branch 'origin/master' into develop 2021-10-05 23:38:21 +00:00
James Young 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
QMK Bot 517adfb763 Merge remote-tracking branch 'origin/master' into develop 2021-10-05 23:30:43 +00:00
James Young 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
QMK Bot e6311cf2ec Merge remote-tracking branch 'origin/master' into develop 2021-10-05 19:47:11 +00:00
Nick Brassel 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
QMK Bot a4417345f1 Merge remote-tracking branch 'origin/master' into develop 2021-10-05 09:30:24 +00:00
Nick Brassel 7a49e5d207
Add clarification for licensing. (#14704) 
* Add clarification for licensing.

* Errr, v2.
 2021-10-05 20:29:52 +11:00
QMK Bot 39b06e3e28 Merge remote-tracking branch 'origin/master' into develop 2021-10-05 03:38:58 +00:00
Danny 46fe8ab4e2
[Keyboard] Update Iris default keymap (#14701) 2021-10-04 20:38:24 -07:00
QMK Bot d47f0c10fe Merge remote-tracking branch 'origin/master' into develop 2021-10-05 01:36:24 +00:00
Daniel Cormier 85ba507482
[Keyboard] Added DC MC 001 (#14661) 2021-10-04 18:35:48 -07:00
QMK Bot 95ead1bbd1 Merge remote-tracking branch 'origin/master' into develop 2021-10-05 01:17:14 +00:00
moyi4681 b441efbdf6
[Keyboard] add dztech duo_s keyboard (#14625) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-10-04 18:16:47 -07:00
QMK Bot 2d71d14191 Merge remote-tracking branch 'origin/master' into develop 2021-10-04 23:21:33 +00:00
Albert Y 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
QMK Bot 4af4ef3428 Merge remote-tracking branch 'origin/master' into develop 2021-10-04 16:26:57 +00:00
Zach White 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
QMK Bot 8f3ea25dda Merge remote-tracking branch 'origin/master' into develop 2021-10-04 05:35:33 +00:00
Danny f72b2ad720
[Keyboard] Add Iris Rev. 6 (#14683) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-03 22:35:00 -07:00
QMK Bot d785282df7 Merge remote-tracking branch 'origin/master' into develop 2021-10-03 21:17:56 +00:00
Drashna Jaelre 6279399425
[Keyboard] Fix Mechlovin's Olly/BB keyboard matrix file (#14680) 2021-10-03 22:17:46 +01:00
Drashna Jaelre 640869257f
[Keyboard] Disable RGBLIGHT on mokey64 (#14681) 2021-10-03 22:17:23 +01:00
QMK Bot db6bf9be2b Merge remote-tracking branch 'origin/master' into develop 2021-10-03 19:03:19 +00:00
tiltowait 8782dc824d
[Keyboard] Add anti-ghosting support to Model M Converter (#14049) 2021-10-03 12:02:51 -07:00
Purdea Andrei eb5b24f97c
Add LM() keys to the list of keys disabled by NO_HAPTIC_MOD (#14181) 2021-10-03 12:02:05 -07:00
QMK Bot 5ce2bb83ce Merge remote-tracking branch 'origin/master' into develop 2021-10-03 19:01:43 +00:00
Christian Sandven 5ece2846b6
[Keyboard] Fix key routing for Keyprez Rhino ergo keys (#14589) 2021-10-03 12:01:15 -07:00
QMK Bot fdc981418a Merge remote-tracking branch 'origin/master' into develop 2021-10-02 15:18:23 +00:00
4pplet 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
QMK Bot 9b64ef8c71 Merge remote-tracking branch 'origin/master' into develop 2021-10-02 15:07:07 +00:00
ai03 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
QMK Bot 64a118a58c Merge remote-tracking branch 'origin/master' into develop 2021-10-02 15:00:21 +00:00
mechlovin 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
rhmokey 20a689e27c
[Keyboard] Modify mokey64 (#14612) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-02 07:59:47 -07:00
QMK Bot 79c6757081 Merge remote-tracking branch 'origin/master' into develop 2021-10-02 14:51:25 +00:00
john-ezra 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
Drashna Jaelre 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
QMK Bot 481104053e Merge remote-tracking branch 'origin/master' into develop 2021-10-02 00:13:49 +00:00