mirrors/qmk_userspace
1
0
Fork 1
mirror of https://github.com/qmk/qmk_userspace.git synced 2025-05-09 00:54:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
1227 commits 1 branch 1 tag 12 MiB
Commit graph

1227 commits

This branch
This branch
All branches
Author SHA1 Message Date
QMK Bot
0b05438fe0 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 20:08:44 +00:00
Conor Burns
72fd0a7e4e [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
deb3f636fd Merge remote-tracking branch 'origin/master' into develop 2021-07-20 17:48:49 +00:00
kb-elmo
6fe21ca02c [Keyboard] Added Kineticlabs Emu (#12968) 2021-07-20 10:48:17 -07:00
Jsully
42cb705771 [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
794796a18d Merge remote-tracking branch 'origin/master' into develop 2021-07-20 16:34:49 +00:00
lfgberg
4c91da6c71 [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
635fabe14c Merge remote-tracking branch 'origin/master' into develop 2021-07-20 16:19:56 +00:00
Andrew Kannan
e25ec3f812 [Keyboard] Add Vicious40 to QMK (#12981) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-20 09:19:26 -07:00
fauxpark
b92f7761f0 Merge remote-tracking branch 'upstream/master' into develop 2021-07-20 23:13:39 +10:00
Ryan
e8e285f930 Fix CRLF in xbows/knight:via config.h (#13614) 2021-07-20 14:04:36 +01:00
QMK Bot
4970433a0c Merge remote-tracking branch 'origin/master' into develop 2021-07-20 05:26:56 +00:00
Uy Bui
d7bc27d11b [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
bc66eaf19d Merge remote-tracking branch 'origin/master' into develop 2021-07-20 05:25:11 +00:00
yiancar
602409a1d5 [Keyboard] mnk1800s initial commit (#13444) 2021-07-19 22:24:40 -07:00
QMK Bot
97b13f4e26 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 04:05:10 +00:00
cole smith
a243f59efa [Keyboard] Boardsource technik (#13111) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-19 21:04:43 -07:00
QMK Bot
92053edc63 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 04:02:05 +00:00
TerryMathews
b6071e1f0a [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
a49fe4254d Merge remote-tracking branch 'origin/master' into develop 2021-07-20 03:46:37 +00:00
Andrew Kannan
8d51dcc946 [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
QMK Bot
b54340db7e Merge remote-tracking branch 'origin/master' into develop 2021-07-20 01:49:28 +00:00
Andrew Kannan
5d171054cd [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
QMK Bot
9c1b0340f3 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 01:48:31 +00:00
X-Bows Tech
5e089a4696 [Keyboard] Update the XBows/Knight keyboard (#13541) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-19 18:28:50 -07:00
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