450a8fb5b6
Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7
2016-11-21 20:17:45 -05:00
06a2677b7e
fix infinity
2016-11-21 20:17:32 -05:00
af119baf71
Merge pull request #894 from dchagniot/ergodoxDvorakEmacs
...
Ergodox dvorak emacs
2016-11-21 20:00:40 -05:00
4bb0eaef26
Merge pull request #893 from Sihui/sh-hhkb-jp
...
[HHKB JP with Dvorak]
2016-11-21 20:00:13 -05:00
be265decae
Merge pull request #892 from fredizzimo/disable_ergodox_lcd
...
Always initialize the Infinity Ergodox backlight
2016-11-21 19:59:39 -05:00
377583d9f3
Merge pull request #891 from g-sam/galson-keymap
...
adds galson keymap
2016-11-21 19:59:17 -05:00
e0fc186c28
Merge pull request #888 from climbalima/master
...
Added pro micro to maxipad
2016-11-21 19:58:24 -05:00
ea472fb018
Merge pull request #887 from profet23/atreus62
...
atreus62 Keyboard Support
2016-11-21 19:58:00 -05:00
27ebacb15d
merging lets_split
2016-11-21 19:18:47 -05:00
c1037b1dc0
working with helper, qmk_helper_windows@05b0105
2016-11-21 18:05:06 -05:00
b75538c0bf
add del to new cmd
2016-11-20 14:45:51 -08:00
390a1bda8b
add space to NewCmd layer
2016-11-20 13:32:25 -08:00
ccc34851f2
add space to NewCmd layer
2016-11-20 13:31:41 -08:00
6f24344be7
typo fix
2016-11-20 20:51:05 +01:00
23f63ed1b9
Update README.md
2016-11-20 11:18:08 -08:00
34aa59c6d5
Update README.md
2016-11-20 11:13:57 -08:00
11f17e3b23
Update README.md
2016-11-20 11:12:48 -08:00
a8b1c47f0f
add sh-hhkb-jp layers
2016-11-20 11:10:26 -08:00
c86bbf474e
Always initialze the Infinity Ergodox backlight
...
Otherwise it will stay lit. The set_led functionality is also disabled
since it doesn't work properly for slaves.
2016-11-20 19:28:10 +02:00
df8724ce08
remove KC expansion from GH60
2016-11-19 12:19:21 -05:00
620e4f74d3
move KC expansion to separate macros
2016-11-19 11:37:12 -05:00
ac7d202d4f
merge upstream/master
2016-11-19 11:20:41 -05:00
7f5e71d79f
adds galson keymap
2016-11-19 14:21:12 +00:00
102a830bbd
changed readme
2016-11-19 00:49:20 -05:00
e356de2220
added the pinout for pro micro into maxipad
2016-11-19 00:44:52 -05:00
ab6557c1a0
wqMerge branch 'wu5y7' of https://github.com/jackhumbert/qmk_firmware into wu5y7
2016-11-18 22:22:29 -05:00
161bd5596b
midi back and forth
2016-11-18 22:22:24 -05:00
285c5a91f2
Groundwork for dedicated color keycodes
2016-11-17 20:56:36 -05:00
9bbc9a7ce0
Initial Erez Experimental keymap tweaks
2016-11-17 19:47:08 -05:00
3774a7fcda
rgb light through midi
2016-11-17 17:42:14 -05:00
6c5fce5c1a
Adding readme placeholder
2016-11-16 23:59:42 -05:00
00d88b74ad
Adding Support for atreus62 keyboard. https://github.com/profet23/atreus62
2016-11-16 23:52:36 -05:00
b085a34506
fixed readme conflicts
2016-11-16 20:44:49 -05:00
21b6b4e6c4
should have fixed conflixed
2016-11-16 19:49:38 -05:00
668c739702
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-16 19:28:30 -05:00
5cac51a773
Merge https://github.com/climbalima/qmk_firmware
2016-11-16 19:26:38 -05:00
1dd6ceb45d
Updated my repo to current qmk
2016-11-16 19:18:54 -05:00
4da698fda3
dvorak/plover keyboard layout
...
Plover's steno support likes quasi-qwerty, and gaming likes qwerty,
and I like dvorak, so... what if I could have it all?
Signed-off-by: seebs <seebs@seebs.net>
2016-11-16 15:44:26 -06:00
9f1b27c5ba
Merge pull request #880 from psyill/master
...
Added keymap "videck", an ErgoDox keymap for Vi(m) users.
2016-11-16 14:54:18 -05:00
e025a94bc2
Merge pull request #879 from sethbc/update_sethbc_ergodox_keymap
...
update sethbc ergodox keymap
2016-11-16 14:53:52 -05:00
d85f6deb9b
Merge pull request #877 from sethbc/update_sethbc_satan_keymap
...
update sethbc keymap
2016-11-16 14:51:18 -05:00
6dde65c2a9
Merge pull request #876 from Dbroqua/master
...
Updated kc60/dbroqua layout and added satan/dbroqua_hhkb
2016-11-16 14:49:55 -05:00
17e1a4f825
Merge pull request #866 from fredizzimo/infinity60_clockfixes
...
Increase the infinity60 system tick frequency
2016-11-16 14:42:53 -05:00
bce6e52391
fixed conflict
2016-11-14 23:08:10 -05:00
dd22c787b8
fixed extra paste
2016-11-14 23:05:37 -05:00
e9f7487518
mostly working
2016-11-13 23:02:38 -05:00
162f603b1c
Added keymap "videck", an ErgoDox keymap for Vi(m) users.
2016-11-13 22:44:41 +01:00
aa76425395
oops, fixed inverted if statement
2016-11-13 01:04:10 -05:00
34bf8558cd
update sethbc ergodox keymap
2016-11-13 00:56:46 -05:00
b2bc215934
add sethbc keymap for gh60 and update macro expansion in connection with same
2016-11-13 00:42:07 -05:00
Jack Humbert
Sihui Huang
Didier Chagniot
Fred Sundvik
Seth Chandler
samgalson@gmail.com
climbalima
Erez Zukerman
Benjamin Grabkowitz
climbalima
Seebs
Hans Ellegård