Commit Graph

4779 Commits

Author SHA1 Message Date
2b3a3ca678 Merge pull request #898 from PureSpider/backlight-fix
Set backlight status to on if it's at maximum brightness already and the brightness increase keybind is used
2016-11-22 18:41:37 -05:00
e131de3df6 Merge pull request #896 from h-youhei/jp106
Add japanese keymap
2016-11-22 18:39:54 -05:00
d37becc0a9 Set backlight status to on if it's at maximum brightness already and the brightness increase keybind is used
Before it was turned on but the status wasn't set to on, so you had to
push the backlight toggle bind twice to turn it off again
2016-11-22 22:12:57 +01:00
2febf9b9f7 Add japanese keymap 2016-11-22 20:40:12 +09:00
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
6390033e86 cleaning up midid 2016-11-21 20:14:16 -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
132c079534 Merge pull request #890 from algernon/f/space-cadet/timeout
Add a timeout to space-cadet shift.
2016-11-21 19:58:55 -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
664c0a036b cleaning up new code 2016-11-21 19:50:55 -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
b57cf3c0c8 more structure to the package 2016-11-21 12:54: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
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
f9cf4f75ae Merge remote-tracking branch 'upstream/master' 2016-11-19 09:31:34 -08:00
df8724ce08 remove KC expansion from GH60 2016-11-19 12:19:21 -05:00
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
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
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
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
01736a502e just saving 2016-11-18 23:40:34 -05:00
a06115df19 don't always detect a matrix change (fixes debounce) 2016-11-18 23:20:07 -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
abee809298 moves brackets to top row. 2016-11-18 11:11:08 -06: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
b493f6a4ed Merge remote-tracking branch 'upstream/master' 2016-11-16 22:36:36 -08: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
c38b3e3be9 Merge pull request #883 from climbalima/master
added rev2 lets split after merging with qmk
2016-11-16 21:17:51 -05:00
b085a34506 fixed readme conflicts 2016-11-16 20:44:49 -05:00