cbbrowne
5776f39667
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-28 12:27:42 -05:00
Priyadi Iman Nurcahyo
12c1314b02
update docs
2016-11-27 00:40:31 +07:00
Priyadi Iman Nurcahyo
0f39ab5219
remove ifdef on chip type
2016-11-26 23:48:11 +07:00
Priyadi Iman Nurcahyo
7f3c9c6a39
protocols.mk is already included in latest QMK
2016-11-26 23:48:11 +07:00
Priyadi Iman Nurcahyo
b5019bef05
change init delay to 2000ms
2016-11-26 23:48:11 +07:00
Priyadi Iman Nurcahyo
8ee389c9b6
My Promethium keyboard firmware
2016-11-26 23:48:11 +07:00
cbbrowne
c05cbaf534
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-23 17:47:16 -05:00
Jack Humbert
af119baf71
Merge pull request #894 from dchagniot/ergodoxDvorakEmacs
...
Ergodox dvorak emacs
2016-11-21 20:00:40 -05:00
Jack Humbert
4bb0eaef26
Merge pull request #893 from Sihui/sh-hhkb-jp
...
[HHKB JP with Dvorak]
2016-11-21 20:00:13 -05:00
Jack Humbert
be265decae
Merge pull request #892 from fredizzimo/disable_ergodox_lcd
...
Always initialize the Infinity Ergodox backlight
2016-11-21 19:59:39 -05:00
Jack Humbert
377583d9f3
Merge pull request #891 from g-sam/galson-keymap
...
adds galson keymap
2016-11-21 19:59:17 -05:00
Jack Humbert
e0fc186c28
Merge pull request #888 from climbalima/master
...
Added pro micro to maxipad
2016-11-21 19:58:24 -05:00
Jack Humbert
ea472fb018
Merge pull request #887 from profet23/atreus62
...
atreus62 Keyboard Support
2016-11-21 19:58:00 -05:00
Sihui Huang
b75538c0bf
add del to new cmd
2016-11-20 14:45:51 -08:00
Sihui Huang
390a1bda8b
add space to NewCmd layer
2016-11-20 13:32:25 -08:00
Sihui Huang
ccc34851f2
add space to NewCmd layer
2016-11-20 13:31:41 -08:00
Didier Chagniot
6f24344be7
typo fix
2016-11-20 20:51:05 +01:00
Sihui Huang
23f63ed1b9
Update README.md
2016-11-20 11:18:08 -08:00
Sihui Huang
34aa59c6d5
Update README.md
2016-11-20 11:13:57 -08:00
Sihui Huang
11f17e3b23
Update README.md
2016-11-20 11:12:48 -08:00
Sihui Huang
a8b1c47f0f
add sh-hhkb-jp layers
2016-11-20 11:10:26 -08:00
Fred Sundvik
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
Seth Chandler
df8724ce08
remove KC expansion from GH60
2016-11-19 12:19:21 -05:00
Seth Chandler
620e4f74d3
move KC expansion to separate macros
2016-11-19 11:37:12 -05:00
Seth Chandler
ac7d202d4f
merge upstream/master
2016-11-19 11:20:41 -05:00
samgalson@gmail.com
7f5e71d79f
adds galson keymap
2016-11-19 14:21:12 +00:00
climbalima
102a830bbd
changed readme
2016-11-19 00:49:20 -05:00
climbalima
e356de2220
added the pinout for pro micro into maxipad
2016-11-19 00:44:52 -05:00
Benjamin Grabkowitz
6c5fce5c1a
Adding readme placeholder
2016-11-16 23:59:42 -05:00
Benjamin Grabkowitz
00d88b74ad
Adding Support for atreus62 keyboard. https://github.com/profet23/atreus62
2016-11-16 23:52:36 -05:00
climbalima
b085a34506
fixed readme conflicts
2016-11-16 20:44:49 -05:00
climbalima
21b6b4e6c4
should have fixed conflixed
2016-11-16 19:49:38 -05:00
climbalima
668c739702
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-16 19:28:30 -05:00
climbalima
5cac51a773
Merge https://github.com/climbalima/qmk_firmware
2016-11-16 19:26:38 -05:00
climbalima
1dd6ceb45d
Updated my repo to current qmk
2016-11-16 19:18:54 -05:00
cbbrowne
5b88e7ab9a
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-16 17:05:11 -05:00
Seebs
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
Jack Humbert
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
Jack Humbert
e025a94bc2
Merge pull request #879 from sethbc/update_sethbc_ergodox_keymap
...
update sethbc ergodox keymap
2016-11-16 14:53:52 -05:00
Jack Humbert
d85f6deb9b
Merge pull request #877 from sethbc/update_sethbc_satan_keymap
...
update sethbc keymap
2016-11-16 14:51:18 -05:00
Jack Humbert
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
Jack Humbert
17e1a4f825
Merge pull request #866 from fredizzimo/infinity60_clockfixes
...
Increase the infinity60 system tick frequency
2016-11-16 14:42:53 -05:00
climbalima
bce6e52391
fixed conflict
2016-11-14 23:08:10 -05:00
climbalima
dd22c787b8
fixed extra paste
2016-11-14 23:05:37 -05:00
Hans Ellegård
162f603b1c
Added keymap "videck", an ErgoDox keymap for Vi(m) users.
2016-11-13 22:44:41 +01:00
Seth Chandler
aa76425395
oops, fixed inverted if statement
2016-11-13 01:04:10 -05:00
Seth Chandler
34bf8558cd
update sethbc ergodox keymap
2016-11-13 00:56:46 -05:00
Seth Chandler
b2bc215934
add sethbc keymap for gh60 and update macro expansion in connection with same
2016-11-13 00:42:07 -05:00
Seth Chandler
28249498bc
update sethbc keymap
2016-11-12 23:56:57 -05:00
Damien
0a99cf300c
Merge pull request #12 from jackhumbert/master
...
Merged from qmk
2016-11-12 19:33:07 +01:00