QMK Bot
34a9acd090
Merge remote-tracking branch 'origin/master' into develop
2021-07-22 16:39:42 +00:00
Dasky
f33532764f
[Keyboard][Bug] Add timer_avr to includes for broken builds ( #13641 )
2021-07-22 09:39:27 -07:00
Tran Kim Tung
95a7c22824
[Keyboard] adds new revision: dztech/dz60rgb/v2_1 ( #13636 )
2021-07-22 09:39:08 -07:00
QMK Bot
3316ac3f42
Merge remote-tracking branch 'origin/master' into develop
2021-07-22 16:36:05 +00:00
Md. Mashur Shalehin Sakib
58abdfc834
[Keyboard] Fixing info.json for h0oni/hotduck ( #13640 )
2021-07-22 09:35:28 -07:00
QMK Bot
62099dc120
Merge remote-tracking branch 'origin/master' into develop
2021-07-22 08:11:39 +00:00
Trent Hoh
78a3f43c08
[Keyboard] Ymd40v2new layouts and fixed per-switch backlight ( #13622 )
2021-07-22 01:11:11 -07:00
Xelus22
6e9f667672
[Bug] Develop - DC01 left ( #13597 )
2021-07-22 01:06:03 -07:00
QMK Bot
78fb223da7
Merge remote-tracking branch 'origin/master' into develop
2021-07-22 07:53:44 +00:00
Drashna Jaelre
8158473464
[Keyboard] Fix clawsome/hatchback and reviung5 compile issues ( #13607 )
2021-07-22 00:53:18 -07:00
QMK Bot
44ea6d0442
Merge remote-tracking branch 'origin/master' into develop
2021-07-22 07:18:21 +00:00
drhigsby
336c8d3efe
[Keyboard] add ogurec ( #13242 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-22 00:17:47 -07:00
Donald Kjer
13a514923a
[Keyboard] Add Durgod Taurus K310 keyboard ( #12314 )
...
Co-authored-by: Tyler Tidman <tyler.tidman@draak.ca>
Co-authored-by: Simon Arlott <sa.me.uk>
2021-07-22 00:09:00 -07:00
QMK Bot
931bf52b74
Merge remote-tracking branch 'origin/master' into develop
2021-07-22 06:58:28 +00:00
farfalleflickan
a400681ccf
[Keyboard] Updated keyboard & keymaps ( #12667 )
...
Co-authored-by: pastapojken <6597735+pastapojken@users.noreply.github.com>
2021-07-21 23:57:35 -07:00
QMK Bot
b5a1db9c05
Merge remote-tracking branch 'origin/master' into develop
2021-07-22 06:48:20 +00:00
joedinkle
e9c3f71e74
[Keyboard] add SPRH keyboard ( #12999 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-21 23:47:48 -07:00
QMK Bot
85128302c8
Merge remote-tracking branch 'origin/master' into develop
2021-07-22 06:40:51 +00:00
Sắn
92cca84651
[Keyboard] Add keypad Satxri6key ( #13423 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-21 23:40:24 -07:00
QMK Bot
a2d94371c6
Merge remote-tracking branch 'origin/master' into develop
2021-07-22 06:40:15 +00:00
jmaynard
8e905a7a5c
[Keyboard] Initial Tron Guy Labs keyboard implementation. ( #13438 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jay Maynard <jmaynard@conmicro.com>
2021-07-21 23:39:45 -07:00
QMK Bot
0753cbc77f
Merge remote-tracking branch 'origin/master' into develop
2021-07-22 06:31:35 +00:00
Brandon Lewis
8c17a822a8
[Keyboard] Add Ristretto Keyboard ( #13479 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Brandon Lewis <blewis308@users.noreply.github.com>
2021-07-21 23:31:03 -07:00
QMK Bot
5c42446508
Merge remote-tracking branch 'origin/master' into develop
2021-07-22 06:22:35 +00:00
Kyle McCreery
5766b9bfb7
[Keyboard] New Keyboard - OBE ( #13545 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-21 23:22:00 -07:00
QMK Bot
203c4fdf58
Merge remote-tracking branch 'origin/master' into develop
2021-07-22 05:57:21 +00:00
Adam Abrams
fbe782534a
[Keyboard] Add personal planck keymap ( #13635 )
2021-07-21 22:56:46 -07:00
QMK Bot
71560853ce
Merge remote-tracking branch 'origin/master' into develop
2021-07-22 05:46:45 +00:00
Manassarn "Noom" Manoonchai
665af4fa8d
[Keymap] narze/xd004 ( #13634 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-21 22:46:15 -07:00
QMK Bot
b28c5e6acb
Merge remote-tracking branch 'origin/master' into develop
2021-07-22 05:40:08 +00:00
Md. Mashur Shalehin Sakib
5b8d2b5cde
[Keyboard] Add h0oni hotduck keyboard ( #13609 )
2021-07-21 22:39:36 -07:00
QMK Bot
874a3df950
Merge remote-tracking branch 'origin/master' into develop
2021-07-21 18:30:35 +00:00
Ryan
b564ba13ee
Fix API generation failure caused by GRS-70EC ( #13631 )
2021-07-21 19:30:29 +01:00
Ryan
c79bc7c909
Fix MATRIX_COLS for peranekofactory/tone ( #13632 )
2021-07-21 19:28:58 +01:00
QMK Bot
201b4dc7ab
Merge remote-tracking branch 'origin/master' into develop
2021-07-21 18:26:05 +00:00
Ryan
78265ea742
Fix MATRIX_COLS for aeboards/constellation/rev2 ( #13633 )
2021-07-21 19:26:00 +01:00
Alabahuy
2b260bd846
fixed number layer on keymap ( #13627 )
2021-07-21 19:25:21 +01:00
QMK Bot
d2cdb0b1d3
Merge remote-tracking branch 'origin/master' into develop
2021-07-21 17:14:33 +00:00
gkeyboard
ca1aa56c7f
[Keyboard] Fix iso layout compile error ( #13628 )
...
Fix iso layout compile erreo on qmk web.
2021-07-21 10:14:04 -07:00
QMK Bot
df37ce4ea2
Merge remote-tracking branch 'origin/master' into develop
2021-07-21 15:36:02 +00:00
Xelus22
afc629210c
[Bug] VIA compile fixes ( #13626 )
2021-07-21 08:35:10 -07:00
QMK Bot
531886b984
Merge remote-tracking branch 'origin/master' into develop
2021-07-21 05:28:30 +00:00
Alabahuy
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
QMK Bot
793fabc449
Merge remote-tracking branch 'origin/master' into develop
2021-07-21 05:05:45 +00:00
Andrew Kannan
ddc2766537
Fix vicious40 rules ( #13623 )
2021-07-21 15:05:10 +10:00
QMK Bot
598fa867d1
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 20:10:21 +00:00
AlisGraveNil
c98e25887c
[Keyboard] GameBuddy v1.M ( #12637 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 13:10:15 -07:00
Weirdo
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
QMK Bot
200f1e8e6a
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 20:08:44 +00:00
Conor Burns
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
QMK Bot
c4db9f7fb2
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 17:48:49 +00:00
kb-elmo
c1ba35363d
[Keyboard] Added Kineticlabs Emu ( #12968 )
2021-07-20 10:48:17 -07:00
QMK Bot
32a44b6a2c
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 17:47:04 +00:00
Paul Ewers
3591312fa3
[Keymap] Updates to personal Drop ALT keymap ( #13058 )
2021-07-20 10:46:52 -07:00
StefanGrindelwald
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
QMK Bot
362bbe53c7
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 17:44:20 +00:00
gkeyboard
8c526703f8
[Keyboard] Update lm60n.h ( #13249 )
2021-07-20 10:43:44 -07:00
QMK Bot
11334ef6af
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 17:25:14 +00:00
sekigon-gonnoc
c6698cfce3
[Keyboard] Add keyboard GRS-70EC ( #11296 )
2021-07-20 10:24:22 -07:00
QMK Bot
638fda5946
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 16:59:21 +00:00
FateEverywhere
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
Jsully
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
QMK Bot
6fa53023cb
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 16:41:40 +00:00
imchipwood
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
QMK Bot
154c7bc3e2
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 16:35:24 +00:00
AlisGraveNil
4f880801ec
[Keyboard] luggage rack ( #12959 )
2021-07-20 09:34:56 -07:00
QMK Bot
02f8bbee45
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 16:34:49 +00:00
lfgberg
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
QMK Bot
dbaba42175
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 16:19:56 +00:00
Andrew Kannan
388a4ae817
[Keyboard] Add Vicious40 to QMK ( #12981 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 09:19:26 -07:00
fauxpark
2e673c419a
Merge remote-tracking branch 'upstream/master' into develop
2021-07-20 23:13:39 +10:00
Ryan
7ea1b97785
Fix CRLF in xbows/knight:via config.h ( #13614 )
2021-07-20 14:04:36 +01:00
QMK Bot
52ce2088e8
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 05:29:00 +00:00
projectcain
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
QMK Bot
8109363148
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 05:27:43 +00:00
Ryan Boone
b887a1b995
[Keyboard] Add q4z keyboard ( #13198 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19 22:27:18 -07:00
QMK Bot
36e2666cba
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 05:26:56 +00:00
Uy Bui
1256915583
[Keyboard] Add we27 numpad ( #13137 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19 22:26:26 -07:00
QMK Bot
692e80d3c0
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 05:26:17 +00:00
Michael
35ee990bd0
[Keyboard] fix LED issue BOCC keyboard ( #13175 )
...
Co-authored-by: Michael Wamsley <wamsl@Michaels-MacBook-Pro.local>
2021-07-19 22:25:46 -07:00
QMK Bot
80c8a99204
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 05:25:11 +00:00
yiancar
17933a884a
[Keyboard] mnk1800s initial commit ( #13444 )
2021-07-19 22:24:40 -07:00
QMK Bot
9c5a0fb0b2
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 04:05:10 +00:00
cole smith
6ab0593f44
[Keyboard] Boardsource technik ( #13111 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19 21:04:43 -07:00
QMK Bot
18ae1f423f
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 04:02:05 +00:00
TerryMathews
9941cf0051
[Keyboard] PORTICO: add support for wt_rgb ( #13241 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19 21:01:36 -07:00
QMK Bot
cf4a121700
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 03:50:18 +00:00
ぺらねこ
8b0a996d5d
[Keyboard] Add tone ( #13337 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Co-authored-by: kakunpc <15257475+kakunpc@users.noreply.github.com>
2021-07-19 20:49:45 -07:00
QMK Bot
d5907a674f
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 03:46:37 +00:00
Andrew Kannan
f439bfd543
[Keyboard] Aella Keyboard PCB ( #13372 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19 20:46:01 -07:00
Joakim Tufvegren
1414e9736d
Switch Ergodox Infinity over to split_common ( #13481 )
2021-07-19 18:54:32 -07:00
QMK Bot
85621311db
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 01:49:28 +00:00
Andrew Kannan
46b8230468
[Keyboard] Add CannonKeys Balance PCB to QMK ( #13489 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19 18:49:26 -07:00
npspears
8e30ec1eee
[Keyboard] enable RGB underglow on heckerboards/axon40 ( #13490 )
...
This PCB uses RGB underglow LEDs. If the user doesn't want them, they can turn them off with a keycode.
2021-07-19 18:48:58 -07:00
QMK Bot
6b2b42678d
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 01:48:31 +00:00
Adrian L Lange
1105f2eb47
[Keymap] Update bface p3lim keymap ( #13582 )
2021-07-19 18:48:00 -07:00
X-Bows Tech
5ee5280fa1
[Keyboard] Update the XBows/Knight keyboard ( #13541 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19 18:28:50 -07:00
Gigahawk
b994921703
[Keyboard] Split GMMK Pro PCBs into separate revisions ( #13570 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-19 17:57:19 -07:00
QMK Bot
5753226588
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 00:52:37 +00:00
Daegara
10905a6500
[Keyboard] CU65 layout update ( #13589 )
2021-07-19 17:52:19 -07:00
bomb
44a8ad265c
[Keyboard] Repaired melgeek/mj63/ RGB lamp driver problem ( #13579 )
2021-07-19 17:52:00 -07:00
QMK Bot
a480520e4e
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 00:32:52 +00:00
Giorgi Chavchanidze
8bc8eadaf9
[Keymap] Orthon keymap for idobo ( #13584 )
...
Co-authored-by: Giorgi Chavchanidze <giorgi@vivaldi.com>
2021-07-19 17:32:20 -07:00
QMK Bot
f9332747e3
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 00:30:40 +00:00
Suschman
7e698c71cd
Six Pack and ortho_ layout updates ( #13587 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Suschman <suschman@gmail.com>
2021-07-19 17:30:09 -07:00
QMK Bot
f493f560cc
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 00:27:04 +00:00
James Young
046429fa87
Knobgoblin: rename ortho keymap to default ( #13592 )
...
Keyboard did not previously have a `default` keymap.
2021-07-19 17:26:34 -07:00
QMK Bot
85c4672981
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 00:07:14 +00:00
James Young
4b55b7f852
converter/periboard_512: add Configurator layout data ( #13600 )
2021-07-19 17:06:45 -07:00
QMK Bot
2a3dde1d94
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 00:06:21 +00:00
James Young
58f9321a77
fluxlab zplit: keymap restructuring ( #13599 )
2021-07-19 17:05:47 -07:00
QMK Bot
1ece36549a
Merge remote-tracking branch 'origin/master' into develop
2021-07-20 00:05:18 +00:00
Xelus22
5b6780f999
[Keyboard][Bug] Constellation Rev2 ( #13595 )
2021-07-19 17:04:14 -07:00
Xelus22
b73a29aaea
[Bug] Develop - Change uint32_t to layer_state_t ( #13596 )
...
* fix sat75
* update uint32_t to layer_state
2021-07-19 09:50:55 -07:00
QMK Bot
f792aee954
Merge remote-tracking branch 'origin/master' into develop
2021-07-18 00:41:56 +00:00
James Young
07ae72ea6b
LazyDesigners Bolt: move via keymap to keymaps directory ( #13581 )
2021-07-17 17:41:29 -07:00
QMK Bot
1374722033
Merge remote-tracking branch 'origin/master' into develop
2021-07-17 23:26:23 +00:00
James Young
876f861715
Discipline layout macro/Configurator fixes ( #13574 )
...
* use human-friendly formatting in info.json
* move layout macro aliases to info.json
* correct and complete layout data
Corrects the layout data for a few layouts, adds the missing data, and renames some of the layout macros.
- rename LAYOUT_wkl_ansi_2_right_mods to LAYOUT_65_ansi_wkl
- rename LAYOUT_wkl_ansi_3_right_mods to LAYOUT_65_ansi_lwkl
- rename LAYOUT_wkl_iso_2_right_mods to LAYOUT_65_iso_wkl
- rename LAYOUT_wkl_iso_3_right_mods to LAYOUT_65_iso_lwkl
2021-07-17 16:25:56 -07:00
QMK Bot
2eb8349437
Merge remote-tracking branch 'origin/master' into develop
2021-07-17 23:18:15 +00:00
James Young
26e64f4fd3
ACR60 Refactor ( #13575 )
...
* modernize acr60.h
- use #pragma once include guard
- add license header
- use four-space indent
- use QMK three-character notation for layout macro arguments
* human-friendly format info.json
* remove `key_count` keys from info.json
* rename LAYOUT_2_shifts to LAYOUT_all
* move LAYOUT_all to top
* use QMK three-character notation in info.json
* refactor default keymap
- add license header
- remove third layer (does nothing)
- replace Shift-Escape keycode with KC_GESC
- use LAYOUT_all macro instead of LAYOUT
* modernize readme.md
- update header
- convert metadata section to list
- add flashing and bootloader jump instructions
- update Docs links
* use #pragma once include guard in config.h
* update LED Indicator API
* add license headers
2021-07-17 16:17:48 -07:00
QMK Bot
c329b549e4
Merge remote-tracking branch 'origin/master' into develop
2021-07-17 17:16:52 +00:00
James Young
ca0e7e7bd9
Cutie Club Giant Macro Pad: add info.json ( #13576 )
2021-07-17 10:16:20 -07:00
QMK Bot
4be8eec4f2
Merge remote-tracking branch 'origin/master' into develop
2021-07-17 08:43:29 +00:00
James Young
b127180c0c
Xelus Akis Configurator Fixes ( #13577 )
...
* correct layout macro references
The keyboard's header file and info.json referenced different layout macro names.
* correct layout data
Insert an object for the Non-US Backslash key, which was previously missing.
2021-07-17 01:43:02 -07:00
QMK Bot
cdae9a7b19
Merge remote-tracking branch 'origin/master' into develop
2021-07-16 19:16:39 +00:00
Dasky
932a67ced2
Limit RGB brightness for crkbd when not defined ( #13568 )
2021-07-16 12:16:06 -07:00
QMK Bot
edefcdc94f
Merge remote-tracking branch 'origin/master' into develop
2021-07-16 16:43:21 +00:00
lukeski14
89eeb4987c
adding tw40 via support ( #13032 )
2021-07-17 02:42:50 +10:00
QMK Bot
4bef126293
Merge remote-tracking branch 'origin/master' into develop
2021-07-16 16:40:05 +00:00
Oliver Granlund
455a988aa6
[Keyboard] Neito + my DZ60 keymap tweaks ( #11773 )
2021-07-16 09:39:35 -07:00
Nick Brassel
610788184a
Merge remote-tracking branch 'upstream/master' into develop
2021-07-16 09:11:51 +10:00
Andre Brait
c330fa725d
Set some default configurations for GMMK Pro ( #13219 )
...
* Set some default configurations for GMMK Pro
* Remove FORCE_NKRO to avoid issues with KVMs
2021-07-16 09:06:23 +10:00
QMK Bot
e07401bb5a
Merge remote-tracking branch 'origin/master' into develop
2021-07-15 16:55:32 +00:00
bomb
68b1ef2d1d
[Keyboard] correct the info.json for qmk configurator and add two empty layers for via ( #13552 )
2021-07-15 09:54:58 -07:00
QMK Bot
b7ec43ed14
Merge remote-tracking branch 'origin/master' into develop
2021-07-15 04:24:45 +00:00
Zach White
9d0b7ab9b9
[keyboard] Clueboard 2x1800 2021 Support ( #13220 )
...
* 2x1800 2021
* add support for writing a whole frame at a time
* improvements
* wip
* fix scrolling
* small tweak
* add a buffer that's larger than the display
* add the start of a font
* working upper and lower case letters
* add qmk animation
* integrate the message sign into the qmk task system
* add encoder defaults
* add MAX7219_LED_CUSTOM to config.h
* tweaks
* remove unneeded keymaps
* add a keymap showing how to control the signboard
* cleanup
* cleanup
* add a way to disable the startup test
* make it easier to define options at the keymap level
* Fix define names
Co-authored-by: Greg Cochard <gcochard@users.noreply.github.com>
* Apply suggestions from gcochard
Co-authored-by: Greg Cochard <gcochard@users.noreply.github.com>
* feedback from noroads
* format info.json
Co-authored-by: Greg Cochard <gcochard@users.noreply.github.com>
2021-07-14 21:24:15 -07:00
QMK Bot
f134c5e124
Merge remote-tracking branch 'origin/master' into develop
2021-07-14 20:56:59 +00:00
mechlovin
18c6e1d46d
[Keyboard] Add Serratus PCB ( #13281 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-14 13:55:52 -07:00
QMK Bot
21b3234780
Merge remote-tracking branch 'origin/master' into develop
2021-07-14 20:55:48 +00:00
Koobaczech
867d60bd64
[Keyboard] Tidying up my projects and subprojects ( #13289 )
...
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ethan Madden <maddene@madden.ninja>
2021-07-14 13:55:12 -07:00
Ryan
fd8628ccdc
Migrate more fn_actions
stuff ( #13502 )
2021-07-15 03:52:45 +10:00
QMK Bot
e69c325a9c
Merge remote-tracking branch 'origin/master' into develop
2021-07-14 17:50:47 +00:00
Ryan
99f637e82c
Fix some RGB Matrix-enabled keymaps referring to RGBLight mode ( #13509 )
2021-07-15 03:50:09 +10:00
Zach White
44d322623e
Merge remote-tracking branch 'origin/master' into develop
...
Resolved Conflicts:
keyboards/checkerboards/nop60/info.json
2021-07-14 10:30:28 -07:00
mechlovin
1c9af238dc
correct data info.json ( #13544 )
...
rouge87 and rogue87
2021-07-14 08:46:44 -07:00
bomb
9c4916e2e8
[Keyboard] Add MelGeek MJ6xy which is a 60% keyboard that support mul… ( #13494 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-14 08:39:54 -07:00
James Young
dd5ead676b
Traveller handwired layout macro refactor ( #13539 )
2021-07-13 21:28:56 -07:00
James Young
70efc82c1c
Lucid Phantom soldered: layout macro touch-up ( #13540 )
2021-07-13 21:27:11 -07:00
Albert Y
b29179de1a
RGB Matrix support for Scylla ( #13415 )
...
Co-authored-by: filterpaper <filterpaper@localhost>
2021-07-13 21:26:00 -07:00
Joel Challis
ef8267d6a7
Refactor Drop boards to custom matrix lite ( #13468 )
2021-07-13 21:07:33 -07:00
Ian Klug
6cdba3a437
[Keyboard] Add ianklug grooveboard ( #13536 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-13 21:04:14 -07:00
Anton
2fd4595955
[Keyboard} Add ISO support for the GMMK Pro ( #13532 )
...
* Added iso layer support for the GMMK Pro iso version
* Adjusted the mapping
* aligning with best practises
* aligning with comments from PR
* Added iso layout to info.json
2021-07-13 16:50:17 -07:00
James Young
d4399172d3
Ortho 5x14 handwired info.json correction ( #13538 )
...
* ortho5x14 handwired: correct info.json data
Last key was incorrectly positioned.
* fix readme typo
2021-07-13 14:15:38 -07:00
James Young
a3d60464ef
4pplet AEKISO60 keymap/macro touch-up ( #13528 )
...
Moves the ISO Enter keycode to the home row for more consistency with the rest of QMK. Also grid-aligns the keycodes and adds a block comment for the layout macro.
2021-07-13 14:04:22 -07:00
James Young
555a449488
Ergoarrows info.json touch-up ( #13537 )
...
* human-friendly formatting
Add line breaks between rows and halves.
* fix rounding issues
Fixes issues with y-offset values due to rounding in KLE.
* remove layout dead space; re-mirror halves
Removes the empty white space from the layout, and aligns the keys on the right half so they are a mirror of the left half.
2021-07-13 13:44:01 -07:00
AnthonyL
3cd6cb65bc
[Keyboard] Montex add VIA support and keymap. ( #13488 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Anthony Lowery <anthony.lowery@unity3d.com>
2021-07-13 10:11:02 -07:00
Cosmin
64e6ba0211
[Keyboard] fixes and additions to the Marauder keyboard ( #13462 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-13 08:58:16 -07:00
James Young
bf70db479c
AMJ60 Refactor ( #13530 )
...
* rename LAYOUT to LAYOUT_all
* refactor default keymap
- add license header
- use layer_names enum
- use LAYOUT_all macro
- update keymap to be more generic
- use QMK-native keycode aliases
* info.json: human-friendly formatting
* convert LAYOUT_iso into a proper LAYOUT_60_iso
* LAYOUT_all bugfix
In the physical sense, position k3d is to the left of k3c.
* rework LAYOUT_max into LAYOUT_60_ansi_split_bs_rshift
* remove LAYOUT_iso_splitrshift and iso_split_rshift keymap
* rework LAYOUT_hhkb into LAYOUT_60_hhkb
* amj60.h cleanup
- add license header
- use #pragma once include guard
- concatenate layout block comments
- remove unnecessary function headers
* add license header to amj60.c
* align config.h to QMK template
* align rules.mk to QMK template
* enable Community Layout support
* modernize readme.md
- add PCB image
- convert keyboard data to list
- add flashing and bootloader instructions
- update Docs links
2021-07-13 06:46:20 -07:00
Takeshi ISHII
b89abc402b
[Keyboard] Update Symmetric70 keyboard prototype ( #12707 )
...
* update handwired/symmetric70_proto/matrix.c
* make keyboards/handwired/symmetric70_proto/promicro/
* add symmetric70_proto/debug_config.h, update symmetric70_proto/local_features.mk etc.
set MATRIX_IO_DELAY macro
make MTEST=mdelay0 symmetric70_proto/promicro:default:flash
make MTEST=mdelay1 symmetric70_proto/promicro:default:flash
make MTEST=mdelay10 symmetric70_proto/promicro:default:flash
make MTEST=mdelay30 symmetric70_proto/promicro:default:flash
set DEBUG_MATRIX_SCAN_RATE_ENABLE yes
make MTEST=scan symmetric70_proto/promicro:default:flash
set MATRIX_DEBUG_DELAY and MATRIX_IO_DELAY macro
make MTEST=matrix_debug_delay,mdelay0 symmetric70_proto/promicro:default:flash
set MATRIX_DEBUG_SCAN
make MTEST=matrix_debug_scan symmetric70_proto/promicro:default:flash
* add symmetric70_proto/matrix_debug/readme.md
* update symmetric70_proto/matrix_debug/readme.md
* update handwired/symmetric70_proto/readme.md
* update handwired/symmetric70_proto/readme.md
* update handwired/symmetric70_proto/*/readme.md
* add handwired/symmetric70_proto/matrix_fast/
* update handwired/symmetric70_proto/matrix_fast/readme.md
* fix typo in handwired/symmetric70_proto/matrix_fast/readme.md
* update config.h under handwired/symmetric70_proto/promicro
* add Proton C support to handwired/symmetric70_proto
* add handwired/symmetric70_proto/proton_c/readme.md
* add promicro/*/readme.md proton_c/*/readme.md
* update handwired/symmetric70_proto/proton_c/proton_c.c
support MATRIX_IO_DELAY_DEFAULT for testing.
* Added another implementation of 'adaptive_delay'.
* update symmetric70_proto/local_features.mk
* update symmetric70_proto/matrix_fast/gpio_extr.h
* add matrix_output_unselect_delay_ports()
* add MTEST=adaptive_delay_fast option
* update symmetric70_proto/matrix_debug/readme.md
* update symmetric70_proto/matrix_fast/readme.md
* update symmetric70_proto/matrix_debug/readme.md
* Erase garbage
* fix symmetric70_proto/proton_c/proton_c.c
* improve adaptive_delay_fast in symmetric70_proto/matrix_debug/matrix.c
* update symmetric70_proto/matrix_debug/readme.md
* fix symmetric70_proto/matrix_debug/readme.md
* Update keyboards/handwired/symmetric70_proto/proton_c/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/handwired/symmetric70_proto/proton_c/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/handwired/symmetric70_proto/local_features.mk
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update keyboards/handwired/symmetric70_proto/local_features.mk
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update keyboards/handwired/symmetric70_proto/local_features.mk
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update keyboards/handwired/symmetric70_proto/matrix_debug/readme.md
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update keyboards/handwired/symmetric70_proto/matrix_debug/readme.md
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update keyboards/handwired/symmetric70_proto/matrix_debug/readme.md
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update keyboards/handwired/symmetric70_proto/matrix_fast/matrix_config_expand.c
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-07-13 18:14:27 +09:00
XScorpion2
1ae4d52013
Keyboards/sol rev2 fix ( #13533 )
...
* Fixed a recent develop error
* minor fix cause I am tired
2021-07-13 18:45:31 +10:00
James Young
6b6ee5fa28
1UP Keyboards 1UP60HTE layout macro touch-up ( #13529 )
...
* rename LAYOUT_tsangan to LAYOUT_60_tsangan_hhkb
... and enable Community Layout support.
* use four-space indent and QMK-native keycode aliases
* rules.mk touch-up
- remove Bootloader selection header comments
- unify Build Options comment header to QMK template
- align inline comments
* readme.md touch-up
- convert metadata to list
- add Flashing command
* move layout macro alias to info.json
* apply friendly formatting to info.json
* restore badger keymap to previous (don't edit user keymap)
2021-07-13 00:18:07 -07:00
James Young
92a029d6f3
Ergonomic Vertical Keyboard (EVK) handwired info.json touch-up ( #13527 )
...
* scale layout data
Seems the KLE data that was imported to make the original file was scaled 1.25x. This commit removes the scaling.
* human-friendly formatting
Insert line breaks between physical layout rows.
* remove instances where width or height is set to 1
The width and height of a key is defaulted to 1 if not provided by the JSON data, so there's no reason to set it manually.
2021-07-12 23:44:56 -07:00
James Young
7d2f70f398
Checker Boards NOP60 touch-up ( #13526 )
...
* apply human-friendly formatting to info.json
* fix JSON tree errors in info.json
* rename layout macros
- rename LAYOUT_2x3u to LAYOUT_60_tsangan_hhkb_split_space
- rename LAYOUT_7u to LAYOUT_60_tsangan_hhkb
* rename 2x3u keymap to default
2021-07-12 23:32:54 -07:00
QMK Bot
a62b10176e
Merge remote-tracking branch 'origin/master' into develop
2021-07-12 17:15:14 +00:00
James Young
8f0bf52b25
ID67 codebase touch-up ( #13521 )
...
* correct layout data
Fix incorrect key sizes/positions.
* rename LAYOUT to LAYOUT_65_ansi_blocker
* tweak human-friendly formatting for info.json
Add new lines for new rows.
* adjust keycode alignment in via keymap
* clean up extra lines in readme file
* enable 65_ansi_blocker Community Layout support
* clean up rules.mk
Aligns the inline comments.
2021-07-12 10:14:18 -07:00
Alex Marmon
00e97aae67
[Keymap] add simple gmmk pro macos keymap with rgb ( #13504 )
2021-07-12 09:36:24 -07:00
QMK Bot
9d282d81ac
Merge remote-tracking branch 'origin/master' into develop
2021-07-12 15:53:05 +00:00
Albert Y
c024acd752
[Keyboard] RGB Matrix support for TBK Mini ( #13506 )
...
Co-authored-by: filterpaper <filterpaper@localhost>
2021-07-12 08:52:32 -07:00
Chris Cullin
9c74fd14bc
Enable g_is31_leds PROGMEM for RGB Matrix IS31FL3737 driver ( #13480 )
2021-07-12 08:51:23 -07:00
QMK Bot
89980ff004
Merge remote-tracking branch 'origin/master' into develop
2021-07-12 07:24:08 +00:00
Kwabena Aduse-Poku
6b8168c378
[Keyboard] Add Bloop65 ( #13388 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-12 00:23:33 -07:00
QMK Bot
fd284c43a5
Merge remote-tracking branch 'origin/master' into develop
2021-07-11 16:42:52 +00:00
jackytrabbit
20a28d6752
[Keyboard] Update lazydesigners/the60/rev2/rev2.h ( #13505 )
...
Update lazydesigners/the60/rev2/rev2.h
2021-07-11 09:42:38 -07:00
Rys Sommefeldt
b71ee47c44
[Keyboard] CapsUnlocked CU7 ( #13429 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-11 09:42:19 -07:00
QMK Bot
14ba806140
Merge remote-tracking branch 'origin/master' into develop
2021-07-11 15:50:47 +00:00
Drashna Jaelre
4f3a4eca97
[Keymap] Fix Corne Via Layout properly ( #13518 )
2021-07-11 08:50:18 -07:00
QMK Bot
ca0c57125f
Merge remote-tracking branch 'origin/master' into develop
2021-07-11 15:47:49 +00:00
James Young
0453b61e1a
[Keyboard] Wuque Studio Ikki68 Aurora codebase touch-up ( #13510 )
2021-07-11 08:47:21 -07:00
Zach White
adf0d70da4
first pass: matrix consistency improvements ( #13471 )
2021-07-11 08:41:57 -07:00
QMK Bot
5a50a28962
Merge remote-tracking branch 'origin/master' into develop
2021-07-11 07:52:16 +00:00
Takeshi ISHII
877e81f963
Fixed the Helix keymap 'fraanrosi' compile issues ( #13514 )
...
According to `helix/rev2/keymaps/fraanrosi/readme.md`, this keymap should be compiled with the following command:
```
make helix/rev2/under:fraanrosi
```
Therefore, when compiling all helix keymaps with the following command, an error occurs when compiling `fraanrosi`.
```
make helix:all
```
Therefore, add `LED_UNDERGLOW_ENABLE = yes` to `keymaps/fraanrosi/rules.mk` to suppress the error.
2021-07-11 16:51:45 +09:00
QMK Bot
36890181f7
Merge remote-tracking branch 'origin/master' into develop
2021-07-11 05:37:58 +00:00
Fredrik Salomonsson
0a8accae06
[Keymap] plattfot - Keymap updates for Kyria ( #13449 )
...
- Major change in the keymap to work with EurKey. Which relaxes some
constraints it had before when it had to take in consideration two
layouts.
With this the parenthesis can be moved to a better location instead
of being in the top right corner.
This also allows esc, del and rctrl to be moved to the base layer.
Only downside is that ctrl+lalt needed to be removed and instead
AltGr takes it's place. Add rctrl on right thumb cluster to
compensate for this which need some reorganization on the thumb
cluster.
- Split the symbol and function keys layer into two layers, one for
each hand. Make it easier to press symbols and function keys.
- Add some symbols specific for the EurKey layout.
- Change from running C-<tab> S-C-<tab> to page up/down for the right
rotary. As holding ctrl and using page up/down works the same in
firefox. Which allows the rotary to be useful for other things.
- Move scroll lock and insert to right rotary.
- Introducing close tap (CLO_TAP), which is a combination of the
double tap feature and my macros. E.g. pressing CLO_TAP and ( will
generate ()←. Which removes the need of the macros and makes it more
useful than DBL_TAP as it now saves me some keypresses. CLO_TAP exist
on both the left and right hand layers to make it easy to use.
- Use text for the secondary oled, firmware is too big after rebasing
on upstream master.
- Update image in the readme to reflect my new layout.
2021-07-10 22:37:28 -07:00
QMK Bot
0bfb14409a
Merge remote-tracking branch 'origin/master' into develop
2021-07-11 05:08:58 +00:00
GG
2c6cff4cb7
[Keyboard] add new firewave ikki68_aurora ( #13364 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-10 22:08:26 -07:00
QMK Bot
789be4f114
Merge remote-tracking branch 'origin/master' into develop
2021-07-10 07:36:22 +00:00
James Young
988942ce40
Clawsome Hatchback & SUV: fix improperly named keymap directories ( #13508 )
2021-07-10 17:35:27 +10:00
QMK Bot
ee44df5b91
Merge remote-tracking branch 'origin/master' into develop
2021-07-10 01:33:32 +00:00
Drashna Jaelre
09474cbf04
Fix VIA compilation issues for RGB Matrix ( #13503 )
2021-07-10 02:32:56 +01:00
QMK Bot
5179d573aa
Merge remote-tracking branch 'origin/master' into develop
2021-07-09 09:41:24 +00:00
James Young
572a35d9a2
Mechmini V1 Refactor ( #13498 )
2021-07-09 19:40:59 +10:00
QMK Bot
8ffdf83015
Merge remote-tracking branch 'origin/master' into develop
2021-07-08 17:59:15 +00:00
James Young
1e51bb39a3
nknl7en: correct key object order ( #13482 )
2021-07-08 10:58:42 -07:00
Joakim Tufvegren
e675a9fc60
Use the new ST7565 driver on Ergodox Infinity ( #13165 )
2021-07-07 18:05:35 +10:00
QMK Bot
90af59ea9d
Merge remote-tracking branch 'origin/master' into develop
2021-07-07 01:28:42 +00:00
James Young
72540f7d83
Xelus Ninjin: rename LAYOUT_all to LAYOUT_tkl_ansi_tsangan; add info.json ( #13477 )
2021-07-07 11:28:11 +10:00
QMK Bot
dd0df14d89
Merge remote-tracking branch 'origin/master' into develop
2021-07-07 01:27:51 +00:00
James Young
692d0268ca
Kopibeng XT65: Layout Macro Refactor ( #13476 )
2021-07-07 11:27:23 +10:00
QMK Bot
ab43bfe9c9
Merge remote-tracking branch 'origin/master' into develop
2021-07-07 01:07:10 +00:00
mfkiiyd
b976fcbb44
[Keyboard] Add poker87c and poker87d ( #12810 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Water <mfkiiyd@163.com>
2021-07-06 18:06:39 -07:00