Commit Graph

793 Commits

Author SHA1 Message Date
e0fc186c28 Merge pull request from climbalima/master
Added pro micro to maxipad
2016-11-21 19:58:24 -05:00
ea472fb018 Merge pull request from profet23/atreus62
atreus62 Keyboard Support
2016-11-21 19:58:00 -05: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
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
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 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 from sethbc/update_sethbc_ergodox_keymap
update sethbc ergodox keymap
2016-11-16 14:53:52 -05:00
d85f6deb9b Merge pull request from sethbc/update_sethbc_satan_keymap
update sethbc keymap
2016-11-16 14:51:18 -05:00
6dde65c2a9 Merge pull request from Dbroqua/master
Updated kc60/dbroqua layout and added satan/dbroqua_hhkb
2016-11-16 14:49:55 -05:00
17e1a4f825 Merge pull request 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
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
28249498bc update sethbc keymap 2016-11-12 23:56:57 -05:00
0a99cf300c Merge pull request from jackhumbert/master
Merged from qmk
2016-11-12 19:33:07 +01:00
3bc51065a4 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware 2016-11-12 19:27:03 +01:00
19ebf6161f - Added dbroqua_hhkb layout for Satan PCB 2016-11-12 19:23:38 +01:00
ec0db2933c Merge branch 'master' of https://github.com/climbalima/qmk_firmware
second try
2016-11-10 20:06:54 -05:00
b5cecb4cc9 Added both revisions into one folder 2016-11-10 20:03:24 -05:00
79f82d3d80 returned to o 2016-11-10 18:43:31 -05:00
6e27f6fbde Changes to be committed:
new file:   keyboards/lets_splitv2/Makefile
	new file:   keyboards/lets_splitv2/config.h
	new file:   keyboards/lets_splitv2/i2c.c
	new file:   keyboards/lets_splitv2/i2c.h
	new file:   keyboards/lets_splitv2/imgs/split-keyboard-i2c-schematic.png
	new file:   keyboards/lets_splitv2/imgs/split-keyboard-serial-schematic.png
	new file:   keyboards/lets_splitv2/keymaps/default/keymap.c
	new file:   keyboards/lets_splitv2/lets_split.c
	new file:   keyboards/lets_splitv2/lets_split.h
	new file:   keyboards/lets_splitv2/matrix.c
	new file:   keyboards/lets_splitv2/pro_micro.h
	new file:   keyboards/lets_splitv2/readme.md
	new file:   keyboards/lets_splitv2/serial.c
	new file:   keyboards/lets_splitv2/serial.h
	new file:   keyboards/lets_splitv2/split_util.c
	new file:   keyboards/lets_splitv2/split_util.h
	new file:   keyboards/maxipad/Makefile
	new file:   keyboards/maxipad/config.h
	new file:   keyboards/maxipad/keymaps/default/Makefile
	new file:   keyboards/maxipad/keymaps/default/config.h
	new file:   keyboards/maxipad/keymaps/default/keymap.c
	new file:   keyboards/maxipad/keymaps/default/readme.md
	new file:   keyboards/maxipad/maxipad.c
	new file:   keyboards/maxipad/maxipad.h
	new file:   keyboards/maxipad/readme.md
2016-11-10 18:19:13 -05:00
1803dbc6d5 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-11-08 21:11:24 -06:00
1d766c596e Removed the control action when holding z or / 2016-11-06 13:48:20 -05:00
c06e2486ab Increase the infinity60 system tick frequency 2016-11-05 22:45:21 +02:00
7697f23538 Merge pull request from jackhumbert/master
Merged from jackhumbert
2016-11-03 21:50:31 +01:00
9e6c57af2a Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-11-01 10:56:56 -05:00
d5270af111 Implements dedicated text zoom keys 2016-11-01 10:03:58 -04:00
7a9be2562d Merge pull request from J3RN/momentary
Switched to momentary
2016-10-31 21:41:19 -04:00
a6401076d5 Merge pull request from lucwastiaux/master
Adding Ergodox Dvorak Programmer layout
2016-10-31 21:40:58 -04:00
bd40844e4e Merge pull request from 20lives/master
added new layout
2016-10-31 21:39:40 -04:00
964b8574ee Merge pull request from priyadi/planck-priyadi-modification
Update priyadi's keymap for Planck; added readme
2016-10-30 12:26:20 -04:00
508eddf8ba Fixing Debounce - WIP 2016-10-28 14:21:38 -05:00
a0fdb6b81a Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-10-28 09:28:47 -05:00
2082c6f110 - Fixed typo in gh60/dbroqua layout 2016-10-26 22:24:26 +02:00
055247f35d re-introduce brackets layer 2016-10-26 21:00:58 +08:00
f44ead1462 Merge pull request from Dbroqua/master
Updated dbroqua layout for HHKB keyboard and added new layout for KC60
2016-10-26 01:19:27 -04:00
67cf367a45 Merge pull request from hot-leaf-juice/master
tiny keymap change
2016-10-26 00:52:13 -04:00