summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1087 from mneme/masterJack Humbert2017-02-116-55/+64
|\ | | | | Updated keymap for atreus62/mneme
| * correct spelling in readmeDavid Olsson2017-02-111-1/+1
| |
| * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareDavid Olsson2017-02-11154-966/+6752
| |\
| * | update readmeDavid Olsson2017-02-116-7/+9
| | |
| * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareDavid Olsson2017-01-1869-361/+2594
| |\ \
| * | | Don't change ralt to lalt, it's really not the same thing on windows.David Olsson2017-01-171-39/+41
| | | |
| * | | whitespace fixesDavid Olsson2017-01-161-10/+12
| | | |
| * | | vi style arrow keys. Live unicode switch supportDavid Olsson2017-01-161-8/+11
| | | |
* | | | Merge pull request #1088 from Mauin/gon_nerdJack Humbert2017-02-1112-0/+331
|\ \ \ \ | | | | | | | | | | add GON NerD
| * | | | add GON NerDMarvin Ramin2017-02-1112-0/+331
| | | | |
* | | | | don't try to build the readmeJack Humbert2017-02-111-1/+1
| |_|_|/ |/| | |
* | | | Merge pull request #1083 from VoodaGod/bone2planckJack Humbert2017-02-101-4/+4
|\ \ \ \ | | | | | | | | | | fixed readme (i swear)
| * | | | fixed readme (i swear)VoodaGod2017-02-101-4/+4
|/ / / /
* | | | Merge pull request #1073 from qmk/backlight_changesJack Humbert2017-02-091-32/+62
|\ \ \ \ | | | | | | | | | | Open backlight functionality to all ports
| * | | | added functionality for just a portJack Humbert2017-02-071-32/+62
| | | | |
* | | | | Merge pull request #1078 from VoodaGod/bone2planckJack Humbert2017-02-094-54/+142
|\ \ \ \ \ | | | | | | | | | | | | updated Bone2Planck Keymap, Readme & fixed Makefile
| * | | | | updated layout & readmeVoodaGod2017-02-092-37/+39
| | | | | |
| * | | | | more formattingVoodaGod2017-02-091-2/+13
| | | | | |
| * | | | | readme formatting changesVoodaGod2017-02-091-61/+61
| | | | | |
| * | | | | updated readmeVoodaGod2017-02-091-7/+10
| | | | | |
| * | | | | updated bone2planck keymap & readmeVoodaGod2017-02-094-26/+98
| | |/ / / | |/| | |
* | | | | Merge pull request #1079 from r2d2rogers/patch-1Jack Humbert2017-02-091-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | [Typo] correct link to default keymap in readme.
| * | | | [Typo] correct link to default keymap in readme.Rob Rogers2017-02-091-1/+1
|/ / / /
* | | | Merge pull request #1074 from dungdung/kc60_ledJack Humbert2017-02-073-34/+15
|\ \ \ \ | | | | | | | | | | Moved KC60 capslock LED code to standard led_set_kb…
| * | | | Moved KC60 capslock LED code to standard led_set_kb so it can be overridden ↵dungdung2017-02-073-34/+15
| | | | | | | | | | | | | | | | | | | | by users
* | | | | accept numbers in travis buildJack Humbert2017-02-071-1/+1
|/ / / /
* | | | Merge pull request #1070 from jimmyhchan/fixSplitJack Humbert2017-02-077-23/+87
|\ \ \ \ | |/ / / |/| | | Lets split readme eeprom master hand fixes
| * | | rename I2C_MASTER_RIGHT to MASTER_RIGHT since this works for serial as wellJimmy Chan2017-02-074-6/+10
| | | |
| * | | udpate readme to reflect QMK and not having the Makefile from ahtn's repoJimmy Chan2017-02-071-14/+72
| | | |
| * | | correctly put eeprom EE_HANDS at addr 0x0a (decimal 10). default to rev2 ↵Jimmy Chan2017-02-074-5/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | project. do not default EE_HANDS for the serial keymap if you compare split_util.h with the original project by ahtn, the address we look for isLeftHand config went from addr 7 to addr 10 (decimal). The EEP files were not updated. EE_HANDS should not be enabled by default since it's more confusing for most users
* | | Merge pull request #1072 from nicinabox/improve-ls-avrdude-targetJack Humbert2017-02-071-4/+6
|\ \ \ | | | | | | | | Check for Pro Micro serial port automatically
| * | | Check for a new serial port every secondNic Aitch2017-02-061-4/+6
| | | |
* | | | Merge pull request #1062 from luizribeiro/fix-winJack Humbert2017-02-071-2/+2
|\ \ \ \ | | | | | | | | | | Fix V-USB bug on Windows 10
| * | | | Fix V-USB bug on Windows 10Luiz Ribeiro2017-02-011-2/+2
| | | | |
* | | | | Merge pull request #1071 from dungdung/rgb_tweaksJack Humbert2017-02-072-5/+41
|\ \ \ \ \ | | | | | | | | | | | | RGB tweaks
| * | | | | Added non-animated gradient modedungdung2017-02-062-1/+20
| | | | | |
| * | | | | Added mode reverse step functiondungdung2017-02-062-0/+9
| | | | | |
| * | | | | Christmas mode now works with even RGBED_NUMdungdung2017-02-062-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Christmas mode steps to reduce red and green colors blending into each other Added Christmas mode interval Increased green hue to 120
* | | | | | Merge pull request #1068 from adzenith/masterJack Humbert2017-02-079-25/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Minor cleanup
| * | | | | | Minor cleanupNikolaus Wittenstein2017-02-053-8/+2
| | | | | | |
| * | | | | | Add new DIODE_DIRECTION optionNikolaus Wittenstein2017-02-053-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous two options were COL2ROW, ROW2COL; this adds CUSTOM_MATRIX to disable the built-in matrix scanning code. Most notably, this obviates the need to set MATRIX_ROW_PINS or MATRIX_COL_PINS.
| * | | | | | Remove unused matrix_raw variable in matrix.cNikolaus Wittenstein2017-02-051-2/+0
| | | | | | |
| * | | | | | Add missing header to ergodox ordinary keymapNikolaus Wittenstein2017-02-031-0/+1
| | | | | | |
| * | | | | | Fix compile warnings in egodox robot_test_layoutNikolaus Wittenstein2017-02-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the warning "right shift count >= width of type" by adding UL to the end of constants.
| * | | | | | Fix compile warnings in light_ws2812.cNikolaus Wittenstein2017-02-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the warning "function declaration isn't a prototype" by explicitly making the parameter list void.
* | | | | | | Merge pull request #1046 from LukeSilva/masterJack Humbert2017-02-077-6/+419
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add Tapping Macros to QMK
| * | | | | | | Add luke keymap, as an example of the tapping macrosLuke Silva2017-01-293-0/+382
| | | | | | | |
| * | | | | | | Add support for various tapping macrosLuke Silva2017-01-282-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A macro key can now be easily set to act as a modifier on hold, and press a shifted key when tapped. Or to switch layers when held, and again press a shifted key when tapped. Various other helper defines have been created which send macros when the key is pressed, released and tapped, cleaning up the action_get_macro function inside keymap definitions. The layer switching macros require a GCC extension - 'compound statements enclosed within parentheses'. The use of this extension is already present within the macro subsystem of this project, so its use in this commit should not cause any additional issues. MACRO_NONE had to be cast to a (macro_t*) to suppress compiler warnings within some tapping macros.
| * | | | | | | Add ability to use tap macros without using functionsLuke Silva2017-01-272-1/+5
| | | | | | | |
| * | | | | | | Fix documentation for TMK actionsLuke Silva2017-01-261-3/+7
| | | | | | | |