b564ba13ee
Fix API generation failure caused by GRS-70EC ( #13631 )
2021-07-21 19:30:29 +01:00
c79bc7c909
Fix MATRIX_COLS for peranekofactory/tone ( #13632 )
2021-07-21 19:28:58 +01:00
201b4dc7ab
Merge remote-tracking branch 'origin/master' into develop
2021-07-21 18:26:05 +00:00
78265ea742
Fix MATRIX_COLS for aeboards/constellation/rev2 ( #13633 )
2021-07-21 19:26:00 +01:00
2b260bd846
fixed number layer on keymap ( #13627 )
2021-07-21 19:25:21 +01:00
d2cdb0b1d3
Merge remote-tracking branch 'origin/master' into develop
2021-07-21 17:14:33 +00:00
ca1aa56c7f
[Keyboard] Fix iso layout compile error ( #13628 )
...
Fix iso layout compile erreo on qmk web.
2021-07-21 10:14:04 -07:00
df37ce4ea2
Merge remote-tracking branch 'origin/master' into develop
2021-07-21 15:36:02 +00:00
afc629210c
[Bug] VIA compile fixes ( #13626 )
2021-07-21 08:35:10 -07:00
531886b984
Merge remote-tracking branch 'origin/master' into develop
2021-07-21 05:28:30 +00:00
ec1a6f6b8b
[Keyboard] add rartland with via support ( #13585 )
...
* add rartland and via support
* moved encoder adn oled to c file
* update c file
2021-07-20 22:28:05 -07:00
793fabc449
Merge remote-tracking branch 'origin/master' into develop
2021-07-21 05:05:45 +00:00
ddc2766537
Fix vicious40 rules ( #13623 )
2021-07-21 15:05:10 +10:00
598fa867d1
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 20:10:21 +00:00
c98e25887c
[Keyboard] GameBuddy v1.M ( #12637 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 13:10:15 -07:00
dbca44ae8d
[Keyboard] Add Tiger910 ( #12605 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 13:09:53 -07:00
200f1e8e6a
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 20:08:44 +00:00
81cac8eec6
[Keyboard] 0xcb 1337 - Added keymap "conor" and fixed some minor stuff ( #12744 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-20 13:07:53 -07:00
4ab8734d6e
Move all our CLI file formatters to the format dir ( #13296 )
...
* move all our file formatters to the format dir
* Apply suggestions from code review
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-07-20 11:52:14 -07:00
c4db9f7fb2
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 17:48:49 +00:00
c1ba35363d
[Keyboard] Added Kineticlabs Emu ( #12968 )
2021-07-20 10:48:17 -07:00
32a44b6a2c
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 17:47:04 +00:00
3591312fa3
[Keymap] Updates to personal Drop ALT keymap ( #13058 )
2021-07-20 10:46:52 -07:00
42ac7c0541
[Keyboard] Add Momoka ergo ( #13127 )
...
Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 10:46:29 -07:00
362bbe53c7
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 17:44:20 +00:00
8c526703f8
[Keyboard] Update lm60n.h ( #13249 )
2021-07-20 10:43:44 -07:00
11334ef6af
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 17:25:14 +00:00
c6698cfce3
[Keyboard] Add keyboard GRS-70EC ( #11296 )
2021-07-20 10:24:22 -07:00
14a839e39c
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 17:12:47 +00:00
8f6867ce95
[Docs] Added note about no split support ( #12512 )
...
Currently, this feature isn't supported on splits, spent about an hour troubleshooting my board and firmware before asking, and turns out it's not in place. Note added to save others from this in the future.
2021-07-20 10:11:49 -07:00
638fda5946
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 16:59:21 +00:00
16e52980c4
[Keyboard] Hard Light - Add keyboard, basic keymap ( #12654 )
...
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 09:58:39 -07:00
4188d2272c
[Keyboard] Add Durgod Hades, Galaxy and Venus Keyboards ( #12893 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Don Kjer <don.kjer@gmail.com>
2021-07-20 09:44:22 -07:00
6fa53023cb
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 16:41:40 +00:00
ec78f8bca2
[Keymap] Adding user code & keymaps for dumbpad & hotdox ( #12924 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 09:40:54 -07:00
154c7bc3e2
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 16:35:24 +00:00
4f880801ec
[Keyboard] luggage rack ( #12959 )
2021-07-20 09:34:56 -07:00
02f8bbee45
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 16:34:49 +00:00
9d523499af
[Keyboard] add anomalykb a65i ( #12967 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 09:34:18 -07:00
dbaba42175
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 16:19:56 +00:00
388a4ae817
[Keyboard] Add Vicious40 to QMK ( #12981 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 09:19:26 -07:00
8925199ae8
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 16:17:22 +00:00
3486870ee4
Adds Swedish Mac ISO and ANSI keymaps ( #13055 )
...
* Adds Swedish Mac ISO and ANSI keymaps
* Replaces NBSP with space
* Adds missing keys
* Remove duplicates
* Remove duplicates
* Update quantum/keymap_extras/keymap_swedish_osx_iso.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_iso.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_iso.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_iso.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Change case and remove whitespace
* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_iso.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_iso.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_iso.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_iso.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_iso.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_iso.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Fix uppercase
* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Add specific files for Swedish Pro
* Update quantum/keymap_extras/keymap_swedish_osx_iso.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_iso.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h
Remove whitespace
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_ansi.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_pro_osx_ansi.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_iso.h
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update quantum/keymap_extras/keymap_swedish_osx_iso.h
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 09:16:17 -07:00
2e673c419a
Merge remote-tracking branch 'upstream/master' into develop
2021-07-20 23:13:39 +10:00
7ea1b97785
Fix CRLF in xbows/knight:via config.h ( #13614 )
2021-07-20 14:04:36 +01:00
52ce2088e8
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 05:29:00 +00:00
815c17b726
[Keyboard] Add vault45 ( #13119 )
...
* adding my keymap
* Update keyboards/projectcain/vault45/keymaps/default/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/projectcain/vault45/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/projectcain/vault45/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/projectcain/vault45/vault45.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/projectcain/vault45/keymaps/default/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update readme.md
* Update keyboards/projectcain/vault45/keymaps/default/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keymap.c
* Update keyboards/projectcain/vault45/keymaps/default/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/projectcain/vault45/readme.md
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
* Update info.json
* Update keyboards/projectcain/vault45/vault45.c
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
* Update keyboards/projectcain/vault45/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/projectcain/vault45/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/projectcain/vault45/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19 22:28:32 -07:00
8109363148
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 05:27:43 +00:00
b887a1b995
[Keyboard] Add q4z keyboard ( #13198 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19 22:27:18 -07:00
36e2666cba
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 05:26:56 +00:00
Ryan
QMK Bot
Alabahuy
gkeyboard
Xelus22
Andrew Kannan
AlisGraveNil
Weirdo
Conor Burns
Zach White
kb-elmo
Paul Ewers
StefanGrindelwald
sekigon-gonnoc
aydenvis
FateEverywhere
Jsully
imchipwood
lfgberg
Andrew Kannan
Carl-Fredrik Arvidson
projectcain
Ryan Boone