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
5b88e7ab9a
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-16 17:05:11 -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
28249498bc
update sethbc keymap
2016-11-12 23:56:57 -05:00
33e62c080c
merging
2016-11-12 20:54:37 -05:00
0a99cf300c
Merge pull request #12 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
80c5ada339
Missed removing a function
2016-11-10 13:47:07 -08:00
f388bb5bda
Removed some common functions from my keymap
2016-11-10 13:39:46 -08:00
4c0aa02b2e
Missed some stuff. Added a song (stole it from reddit).
2016-11-10 12:59:55 -08:00
c07ef5c6ab
Adding my (zach) keymaps for planck and preonic
2016-11-10 12:26:56 -08:00
1803dbc6d5
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
2016-11-08 21:11:24 -06:00
cdad01b57a
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-07 12:48:34 -05: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
b8e204322a
added more shortcut keys
2016-11-05 12:07:33 +08:00
78a1dc84dd
updated readme
2016-11-05 11:58:23 +08:00
ff8b4a1d89
removed brackets anywhere but in brackets layer, added mouse layer back in, replaced all HYPR with MEH, put semicolon-newline and end-newline on symbol layer
2016-11-05 11:56:59 +08:00
7697f23538
Merge pull request #11 from jackhumbert/master
...
Merged from jackhumbert
2016-11-03 21:50:31 +01:00
930ae4b7ff
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-01 13:09:27 -04: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 #851 from J3RN/momentary
...
Switched to momentary
2016-10-31 21:41:19 -04:00
a6401076d5
Merge pull request #843 from lucwastiaux/master
...
Adding Ergodox Dvorak Programmer layout
2016-10-31 21:40:58 -04:00
bd40844e4e
Merge pull request #836 from 20lives/master
...
added new layout
2016-10-31 21:39:40 -04:00
8dd422ffe1
Updates to keymap file.
2016-10-31 18:27:05 -07:00
063328344a
Removed files that weren't supposed to be uploaded from gh60 keymap folder
2016-10-31 18:04:01 -07:00
61eb35191a
Adding more keymaps.
2016-10-31 17:58:22 -07:00
b90366285f
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-10-31 11:45:54 -04:00
964b8574ee
Merge pull request #839 from priyadi/planck-priyadi-modification
...
Update priyadi's keymap for Planck; added readme
2016-10-30 12:26:20 -04:00
climbalima