Jack Humbert
3b990c08dc
Merge pull request #878 from sethbc/add_sethbc_gh60_keymap
...
add sethbc keymap for gh60 and update macro expansion
2016-11-19 13:05:30 -05:00
Seth Chandler
df8724ce08
remove KC expansion from GH60
2016-11-19 12:19:21 -05:00
Gergely Nagy
74a1f00713
Fix the Space Cadet timeout code
...
Define a default TAPPING_TERM in quantum.c, for keyboards that do not
have it set. Fixes the CI failure.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-11-19 18:19:18 +01: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
Gergely Nagy
ffa5b1e7ea
Add a timeout to space-cadet shift.
...
When one holds a Space Cadet shift, to have it act as a shift, so that
mouse behaviour changes, when released without any other key pressed, it
still registers a paren. To remedy this, add a hold timeout: if the key
is held longer than TAPPING_TERM, it will not register the parens.
Fixes #884 , with the side-effect of not being able to have parens
trigger the OS-side repeat anymore.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-11-19 11:32:09 +01: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
climbalima
01736a502e
just saving
2016-11-18 23:40:34 -05:00
Jack Humbert
a06115df19
don't always detect a matrix change (fixes debounce)
2016-11-18 23:20:07 -05:00
Jack Humbert
ab6557c1a0
wqMerge branch 'wu5y7' of https://github.com/jackhumbert/qmk_firmware into wu5y7
2016-11-18 22:22:29 -05:00
Jack Humbert
161bd5596b
midi back and forth
2016-11-18 22:22:24 -05:00
Erez Zukerman
285c5a91f2
Groundwork for dedicated color keycodes
2016-11-17 20:56:36 -05:00
Erez Zukerman
9bbc9a7ce0
Initial Erez Experimental keymap tweaks
2016-11-17 19:47:08 -05:00
Jack Humbert
3774a7fcda
rgb light through midi
2016-11-17 17:42:14 -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
Jack Humbert
c38b3e3be9
Merge pull request #883 from climbalima/master
...
added rev2 lets split after merging with qmk
2016-11-16 21:17:51 -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
Jack Humbert
72e78a017f
Merge pull request #882 from seebs/master
...
dvorak/plover keyboard layout
2016-11-16 17:15:58 -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
Jack Humbert
7541122cad
Merge pull request #860 from IBNobody/master
...
Improved Quantum Matrix
2016-11-16 14:41:10 -05:00
Jack Humbert
530dd3377e
animations, midi, etc
2016-11-15 13:18:10 -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
Noah Andrews
702405f039
Recommend WSL on Windows 10
...
At this point, I consider the batch scripts @IBNobody and I worked on to mostly be a failure. They've proven to be unreliable, too dependent on the environment they're being run in, and I've seen far too many examples of people having frustrating issues with them that I haven't been able to help them with. They can also produce misleading and confusing error messages. I've been pointing people to use the WSL for a while now. Eventually, I think we should make a proper replacement for the batch scripts, possibly with an environment in msys2. For now, the WSL method in Windows 10 is far more reliable, and is easy to set up.
I also cleaned up some things in the WSL instructions themselves.
2016-11-14 10:03:18 -05:00
Jack Humbert
e9f7487518
mostly working
2016-11-13 23:02:38 -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
Jack Humbert
33e62c080c
merging
2016-11-12 20:54:37 -05:00
Damien
0a99cf300c
Merge pull request #12 from jackhumbert/master
...
Merged from qmk
2016-11-12 19:33:07 +01:00
dbroqua
3bc51065a4
Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware
2016-11-12 19:27:03 +01:00
dbroqua
19ebf6161f
- Added dbroqua_hhkb layout for Satan PCB
2016-11-12 19:23:38 +01:00
cbbrowne
c609edc362
Merge branch 'master' of github.com:cbbrowne/qmk_firmware
2016-11-11 10:39:11 -05:00
cbbrowne
992ec01b5d
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-11 10:39:07 -05:00
Chris Browne
de3117f483
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-11-10 23:32:29 -05:00
