Commit graph

1202 commits

Author SHA1 Message Date
Gigahawk
cee2dda17c [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
9c647ee08e Merge remote-tracking branch 'origin/master' into develop 2021-07-20 00:30:40 +00:00
Suschman
d5c055d5e2 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
46b13742e7 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 00:06:21 +00:00
James Young
78ba5e4d6c fluxlab zplit: keymap restructuring (#13599) 2021-07-19 17:05:47 -07:00
Xelus22
87b79c34ad [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
b84b0b2d72 Merge remote-tracking branch 'origin/master' into develop 2021-07-18 00:41:56 +00:00
James Young
dbe4109880 LazyDesigners Bolt: move via keymap to keymaps directory (#13581) 2021-07-17 17:41:29 -07:00
QMK Bot
57749c002b Merge remote-tracking branch 'origin/master' into develop 2021-07-17 08:43:29 +00:00
James Young
af22dfc224 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
723d94818e Merge remote-tracking branch 'origin/master' into develop 2021-07-16 16:43:21 +00:00
lukeski14
c71fac28e0 adding tw40 via support (#13032) 2021-07-17 02:42:50 +10:00
QMK Bot
8ea49c6bd3 Merge remote-tracking branch 'origin/master' into develop 2021-07-16 16:40:05 +00:00
Oliver Granlund
f332032708 [Keyboard] Neito + my DZ60 keymap tweaks (#11773) 2021-07-16 09:39:35 -07:00
QMK Bot
eb45437a4d Merge remote-tracking branch 'origin/master' into develop 2021-07-15 16:55:32 +00:00
bomb
4038301273 [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
d4125e7ef9 Merge remote-tracking branch 'origin/master' into develop 2021-07-14 20:56:59 +00:00
mechlovin
bd4a4858c8 [Keyboard] Add Serratus PCB (#13281)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-14 13:55:52 -07:00
QMK Bot
24cff22364 Merge remote-tracking branch 'origin/master' into develop 2021-07-14 20:55:48 +00:00
Koobaczech
4b95b57799 [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
Zach White
3dc19dcb47 Merge remote-tracking branch 'origin/master' into develop
Resolved Conflicts:
	keyboards/checkerboards/nop60/info.json
2021-07-14 10:30:28 -07:00
bomb
9e67ea010a [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
c04cd9df76 Lucid Phantom soldered: layout macro touch-up (#13540) 2021-07-13 21:27:11 -07:00
Ian Klug
3251a7574b [Keyboard] Add ianklug grooveboard (#13536)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-13 21:04:14 -07:00
James Young
2b71b79945 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
AnthonyL
16b0eb89a7 [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
1651ba3670 [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
6952a8faf9 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
bca8232e51 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
28ed848f4c Merge remote-tracking branch 'origin/master' into develop 2021-07-12 17:15:14 +00:00
James Young
8342e02927 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
QMK Bot
b0a542f0dd Merge remote-tracking branch 'origin/master' into develop 2021-07-12 07:24:08 +00:00
Kwabena Aduse-Poku
5597cf670b [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
1375a03c5f Merge remote-tracking branch 'origin/master' into develop 2021-07-11 15:50:47 +00:00
Drashna Jaelre
6dc9e9092a [Keymap] Fix Corne Via Layout properly (#13518) 2021-07-11 08:50:18 -07:00
QMK Bot
077e41a9eb Merge remote-tracking branch 'origin/master' into develop 2021-07-11 15:47:49 +00:00
James Young
7795adf2d0 [Keyboard] Wuque Studio Ikki68 Aurora codebase touch-up (#13510) 2021-07-11 08:47:21 -07:00
QMK Bot
a3fcfff906 Merge remote-tracking branch 'origin/master' into develop 2021-07-11 05:08:58 +00:00
GG
7460773c2b [Keyboard] add new firewave ikki68_aurora (#13364)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-10 22:08:26 -07:00
QMK Bot
5523a36844 Merge remote-tracking branch 'origin/master' into develop 2021-07-10 01:33:32 +00:00
Drashna Jaelre
3f8a91cf39 Fix VIA compilation issues for RGB Matrix (#13503) 2021-07-10 02:32:56 +01:00
QMK Bot
44c61706c6 Merge remote-tracking branch 'origin/master' into develop 2021-07-07 01:28:42 +00:00
James Young
b35c89ad5c Xelus Ninjin: rename LAYOUT_all to LAYOUT_tkl_ansi_tsangan; add info.json (#13477) 2021-07-07 11:28:11 +10:00
QMK Bot
1ab8abb37c Merge remote-tracking branch 'origin/master' into develop 2021-07-07 01:27:51 +00:00
James Young
e682973d7f Kopibeng XT65: Layout Macro Refactor (#13476) 2021-07-07 11:27:23 +10:00
QMK Bot
30cf5b4178 Merge remote-tracking branch 'origin/master' into develop 2021-07-07 01:07:10 +00:00
mfkiiyd
17c9f0ff6c [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
QMK Bot
40fcc5d392 Merge remote-tracking branch 'origin/master' into develop 2021-07-07 01:05:02 +00:00
Simon
f2dfb10131 [Keyboard] Add bm65iso (#13400)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-06 18:04:32 -07:00
QMK Bot
c7c802335c Merge remote-tracking branch 'origin/master' into develop 2021-07-06 21:47:54 +00:00