Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #902 from OferPlesser/feature/ps2-mouse-support | Jack Humbert | 2016-11-25 | 3 | -3/+41 |
|\ | | | | | PS/2 mouse support | ||||
| * | Added documentation for PS/2 mouse in readme | ofples | 2016-11-25 | 1 | -0/+39 |
| | | |||||
| * | Removed comment | ofples | 2016-11-25 | 1 | -2/+0 |
| | | |||||
| * | Added missing endif for ifdef __AVR_ATmega32U4__ and removed the unnecessary ↵ | ofples | 2016-11-25 | 1 | -1/+1 |
| | | | | | | | | one at the end of the file | ||||
| * | Added protocol.mk to build | ofples | 2016-11-25 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #899 from Wilba6582/suspend_fix | Jack Humbert | 2016-11-24 | 1 | -5/+6 |
|\ | | | | | Fixed NO_SUSPEND_POWER_DOWN handling | ||||
| * | Fixed NO_SUSPEND_POWER_DOWN handling | Wilba6582 | 2016-11-23 | 1 | -6/+1 |
| | | |||||
| * | Fixed NO_SUSPEND_POWER_DOWN handling | Wilba6582 | 2016-11-23 | 1 | -1/+7 |
|/ | |||||
* | Merge pull request #898 from PureSpider/backlight-fix | Jack Humbert | 2016-11-22 | 1 | -2/+2 |
|\ | | | | | Set backlight status to on if it's at maximum brightness already and the brightness increase keybind is used | ||||
| * | Set backlight status to on if it's at maximum brightness already and the ↵ | PureSpider | 2016-11-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | 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 | ||||
* | | Merge pull request #896 from h-youhei/jp106 | Jack Humbert | 2016-11-22 | 1 | -0/+62 |
|\ \ | | | | | | | Add japanese keymap | ||||
| * | | Add japanese keymap | h-youhei | 2016-11-22 | 1 | -0/+62 |
|/ / | |||||
* | | Merge pull request #894 from dchagniot/ergodoxDvorakEmacs | Jack Humbert | 2016-11-21 | 2 | -0/+235 |
|\ \ | | | | | | | Ergodox dvorak emacs | ||||
| * | | typo fix | Didier Chagniot | 2016-11-20 | 2 | -19/+19 |
| | | | |||||
| * | | readme.md updated | Didier Chagniot | 2016-09-10 | 1 | -0/+70 |
| | | | |||||
| * | | typing with it | Didier Chagniot | 2016-09-09 | 1 | -0/+165 |
| | | | |||||
* | | | Merge pull request #893 from Sihui/sh-hhkb-jp | Jack Humbert | 2016-11-21 | 3 | -0/+147 |
|\ \ \ | | | | | | | | | [HHKB JP with Dvorak] | ||||
| * | | | add del to new cmd | Sihui Huang | 2016-11-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | add space to NewCmd layer | Sihui Huang | 2016-11-20 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Update README.md | Sihui Huang | 2016-11-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | add space to NewCmd layer | Sihui Huang | 2016-11-20 | 2 | -2/+2 |
| |/ / / | |||||
| * | | | Update README.md | Sihui Huang | 2016-11-20 | 1 | -1/+2 |
| | | | | |||||
| * | | | Update README.md | Sihui Huang | 2016-11-20 | 1 | -1/+2 |
| | | | | |||||
| * | | | add sh-hhkb-jp layers | Sihui Huang | 2016-11-20 | 3 | -0/+145 |
| | | | | |||||
* | | | | Merge pull request #892 from fredizzimo/disable_ergodox_lcd | Jack Humbert | 2016-11-21 | 2 | -26/+5 |
|\ \ \ \ | | | | | | | | | | | Always initialize the Infinity Ergodox backlight | ||||
| * | | | | Always initialze the Infinity Ergodox backlight | Fred Sundvik | 2016-11-20 | 2 | -26/+5 |
| |/ / / | | | | | | | | | | | | | | | | | Otherwise it will stay lit. The set_led functionality is also disabled since it doesn't work properly for slaves. | ||||
* | | | | Merge pull request #891 from g-sam/galson-keymap | Jack Humbert | 2016-11-21 | 3 | -0/+196 |
|\ \ \ \ | | | | | | | | | | | adds galson keymap | ||||
| * | | | | adds galson keymap | samgalson@gmail.com | 2016-11-19 | 3 | -0/+196 |
| | | | | | |||||
* | | | | | Merge pull request #890 from algernon/f/space-cadet/timeout | Jack Humbert | 2016-11-21 | 1 | -2/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Add a timeout to space-cadet shift. | ||||
| * | | | | | Fix the Space Cadet timeout code | Gergely Nagy | 2016-11-19 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
| * | | | | | Add a timeout to space-cadet shift. | Gergely Nagy | 2016-11-19 | 1 | -2/+5 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
* | | | | | Merge pull request #888 from climbalima/master | Jack Humbert | 2016-11-21 | 3 | -4/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | Added pro micro to maxipad | ||||
| * | | | | | changed readme | climbalima | 2016-11-19 | 2 | -2/+3 |
| | | | | | | |||||
| * | | | | | added the pinout for pro micro into maxipad | climbalima | 2016-11-19 | 2 | -3/+10 |
| | | | | | | |||||
* | | | | | | Merge pull request #887 from profet23/atreus62 | Jack Humbert | 2016-11-21 | 8 | -0/+622 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | atreus62 Keyboard Support | ||||
| * | | | | | Adding readme placeholder | Benjamin Grabkowitz | 2016-11-16 | 1 | -0/+10 |
| | | | | | | |||||
| * | | | | | Adding Support for atreus62 keyboard. https://github.com/profet23/atreus62 | Benjamin Grabkowitz | 2016-11-16 | 7 | -0/+612 |
| | | | | | | |||||
* | | | | | | Merge pull request #878 from sethbc/add_sethbc_gh60_keymap | Jack Humbert | 2016-11-19 | 5 | -68/+148 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | add sethbc keymap for gh60 and update macro expansion | ||||
| * | | | | | remove KC expansion from GH60 | Seth Chandler | 2016-11-19 | 4 | -99/+55 |
| | | | | | | |||||
| * | | | | | move KC expansion to separate macros | Seth Chandler | 2016-11-19 | 4 | -23/+66 |
| | | | | | | |||||
| * | | | | | merge upstream/master | Seth Chandler | 2016-11-19 | 49 | -378/+2213 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | don't always detect a matrix change (fixes debounce) | Jack Humbert | 2016-11-18 | 1 | -1/+1 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #883 from climbalima/master | Jack Humbert | 2016-11-16 | 25 | -129/+760 |
|\ \ \ \ \ | | | | | | | | | | | | | added rev2 lets split after merging with qmk | ||||
| * | | | | | fixed readme conflicts | climbalima | 2016-11-16 | 1 | -20/+2 |
| | | | | | | |||||
| * | | | | | should have fixed conflixed | climbalima | 2016-11-16 | 13 | -268/+10 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | climbalima | 2016-11-16 | 24 | -249/+1453 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #882 from seebs/master | Jack Humbert | 2016-11-16 | 2 | -0/+244 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | dvorak/plover keyboard layout | ||||
| * | | | | | | dvorak/plover keyboard layout | Seebs | 2016-11-16 | 2 | -0/+244 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
* | | | | | | Merge pull request #880 from psyill/master | Jack Humbert | 2016-11-16 | 6 | -0/+678 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added keymap "videck", an ErgoDox keymap for Vi(m) users. | ||||
| * | | | | | | Added keymap "videck", an ErgoDox keymap for Vi(m) users. | Hans Ellegård | 2016-11-13 | 6 | -0/+678 |
| | | | | | | |