summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-11-25Removed commentofples
2016-11-25Added missing endif for ifdef __AVR_ATmega32U4__ and removed the unnecessary ↵ofples
one at the end of the file
2016-11-25Added protocol.mk to buildofples
2016-11-24Merge pull request #899 from Wilba6582/suspend_fixJack Humbert
Fixed NO_SUSPEND_POWER_DOWN handling
2016-11-23Fixed NO_SUSPEND_POWER_DOWN handlingWilba6582
2016-11-23Fixed NO_SUSPEND_POWER_DOWN handlingWilba6582
2016-11-22Merge pull request #898 from PureSpider/backlight-fixJack Humbert
Set backlight status to on if it's at maximum brightness already and the brightness increase keybind is used
2016-11-22Merge pull request #896 from h-youhei/jp106Jack Humbert
Add japanese keymap
2016-11-22Set backlight status to on if it's at maximum brightness already and the ↵PureSpider
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-22Add japanese keymaph-youhei
2016-11-21Merge pull request #894 from dchagniot/ergodoxDvorakEmacsJack Humbert
Ergodox dvorak emacs
2016-11-21Merge pull request #893 from Sihui/sh-hhkb-jpJack Humbert
[HHKB JP with Dvorak]
2016-11-21Merge pull request #892 from fredizzimo/disable_ergodox_lcdJack Humbert
Always initialize the Infinity Ergodox backlight
2016-11-21Merge pull request #891 from g-sam/galson-keymapJack Humbert
adds galson keymap
2016-11-21Merge pull request #890 from algernon/f/space-cadet/timeoutJack Humbert
Add a timeout to space-cadet shift.
2016-11-21Merge pull request #888 from climbalima/masterJack Humbert
Added pro micro to maxipad
2016-11-21Merge pull request #887 from profet23/atreus62Jack Humbert
atreus62 Keyboard Support
2016-11-20add del to new cmdSihui Huang
2016-11-20add space to NewCmd layerSihui Huang
2016-11-20add space to NewCmd layerSihui Huang
2016-11-20typo fixDidier Chagniot
2016-11-20Update README.mdSihui Huang
2016-11-20Update README.mdSihui Huang
2016-11-20Update README.mdSihui Huang
2016-11-20add sh-hhkb-jp layersSihui Huang
2016-11-20Always initialze the Infinity Ergodox backlightFred Sundvik
Otherwise it will stay lit. The set_led functionality is also disabled since it doesn't work properly for slaves.
2016-11-19Merge pull request #878 from sethbc/add_sethbc_gh60_keymapJack Humbert
add sethbc keymap for gh60 and update macro expansion
2016-11-19remove KC expansion from GH60Seth Chandler
2016-11-19Fix the Space Cadet timeout codeGergely Nagy
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-19move KC expansion to separate macrosSeth Chandler
2016-11-19merge upstream/masterSeth Chandler
2016-11-19adds galson keymapsamgalson@gmail.com
2016-11-19Add a timeout to space-cadet shift.Gergely Nagy
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-19changed readmeclimbalima
2016-11-19added the pinout for pro micro into maxipadclimbalima
2016-11-18don't always detect a matrix change (fixes debounce)Jack Humbert
2016-11-16Adding readme placeholderBenjamin Grabkowitz
2016-11-16Adding Support for atreus62 keyboard. https://github.com/profet23/atreus62Benjamin Grabkowitz
2016-11-16Merge pull request #883 from climbalima/masterJack Humbert
added rev2 lets split after merging with qmk
2016-11-16fixed readme conflictsclimbalima
2016-11-16should have fixed conflixedclimbalima
2016-11-16Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareclimbalima
2016-11-16Merge https://github.com/climbalima/qmk_firmwareclimbalima
2016-11-16Updated my repo to current qmkclimbalima
2016-11-16Merge pull request #882 from seebs/masterJack Humbert
dvorak/plover keyboard layout
2016-11-16dvorak/plover keyboard layoutSeebs
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-16Merge pull request #880 from psyill/masterJack Humbert
Added keymap "videck", an ErgoDox keymap for Vi(m) users.
2016-11-16Merge pull request #879 from sethbc/update_sethbc_ergodox_keymapJack Humbert
update sethbc ergodox keymap
2016-11-16Merge pull request #877 from sethbc/update_sethbc_satan_keymapJack Humbert
update sethbc keymap
2016-11-16Merge pull request #876 from Dbroqua/masterJack Humbert
Updated kc60/dbroqua layout and added satan/dbroqua_hhkb