Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | milestogo | 2017-02-09 | 81 | -304/+2839 |
|\ | |||||
| * | Merge pull request #1073 from qmk/backlight_changes | Jack Humbert | 2017-02-09 | 1 | -32/+62 |
| |\ | | | | | | | Open backlight functionality to all ports | ||||
| | * | added functionality for just a port | Jack Humbert | 2017-02-07 | 1 | -32/+62 |
| | | | |||||
| * | | Merge pull request #1078 from VoodaGod/bone2planck | Jack Humbert | 2017-02-09 | 4 | -54/+142 |
| |\ \ | | | | | | | | | updated Bone2Planck Keymap, Readme & fixed Makefile | ||||
| | * | | updated layout & readme | VoodaGod | 2017-02-09 | 2 | -37/+39 |
| | | | | |||||
| | * | | more formatting | VoodaGod | 2017-02-09 | 1 | -2/+13 |
| | | | | |||||
| | * | | readme formatting changes | VoodaGod | 2017-02-09 | 1 | -61/+61 |
| | | | | |||||
| | * | | updated readme | VoodaGod | 2017-02-09 | 1 | -7/+10 |
| | | | | |||||
| | * | | updated bone2planck keymap & readme | VoodaGod | 2017-02-09 | 4 | -26/+98 |
| | | | | |||||
| * | | | Merge pull request #1079 from r2d2rogers/patch-1 | Jack Humbert | 2017-02-09 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | [Typo] correct link to default keymap in readme. | ||||
| | * | | [Typo] correct link to default keymap in readme. | Rob Rogers | 2017-02-09 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #1074 from dungdung/kc60_led | Jack Humbert | 2017-02-07 | 3 | -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 ↵ | dungdung | 2017-02-07 | 3 | -34/+15 |
| | | | | | | | | | | | | | | | | by users | ||||
| * | | | accept numbers in travis build | Jack Humbert | 2017-02-07 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #1070 from jimmyhchan/fixSplit | Jack Humbert | 2017-02-07 | 7 | -23/+87 |
| |\ \ | | |/ | |/| | Lets split readme eeprom master hand fixes | ||||
| | * | rename I2C_MASTER_RIGHT to MASTER_RIGHT since this works for serial as well | Jimmy Chan | 2017-02-07 | 4 | -6/+10 |
| | | | |||||
| | * | udpate readme to reflect QMK and not having the Makefile from ahtn's repo | Jimmy Chan | 2017-02-07 | 1 | -14/+72 |
| | | | |||||
| | * | correctly put eeprom EE_HANDS at addr 0x0a (decimal 10). default to rev2 ↵ | Jimmy Chan | 2017-02-07 | 4 | -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-target | Jack Humbert | 2017-02-07 | 1 | -4/+6 |
| |\ | | | | | | | Check for Pro Micro serial port automatically | ||||
| | * | Check for a new serial port every second | Nic Aitch | 2017-02-06 | 1 | -4/+6 |
| | | | |||||
| * | | Merge pull request #1062 from luizribeiro/fix-win | Jack Humbert | 2017-02-07 | 1 | -2/+2 |
| |\ \ | | | | | | | | | Fix V-USB bug on Windows 10 | ||||
| | * | | Fix V-USB bug on Windows 10 | Luiz Ribeiro | 2017-02-01 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #1071 from dungdung/rgb_tweaks | Jack Humbert | 2017-02-07 | 2 | -5/+41 |
| |\ \ \ | | | | | | | | | | | RGB tweaks | ||||
| | * | | | Added non-animated gradient mode | dungdung | 2017-02-06 | 2 | -1/+20 |
| | | | | | |||||
| | * | | | Added mode reverse step function | dungdung | 2017-02-06 | 2 | -0/+9 |
| | | | | | |||||
| | * | | | Christmas mode now works with even RGBED_NUM | dungdung | 2017-02-06 | 2 | -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/master | Jack Humbert | 2017-02-07 | 9 | -25/+22 |
| |\ \ \ \ | | | | | | | | | | | | | Minor cleanup | ||||
| | * | | | | Minor cleanup | Nikolaus Wittenstein | 2017-02-05 | 3 | -8/+2 |
| | | | | | | |||||
| | * | | | | Add new DIODE_DIRECTION option | Nikolaus Wittenstein | 2017-02-05 | 3 | -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.c | Nikolaus Wittenstein | 2017-02-05 | 1 | -2/+0 |
| | | | | | | |||||
| | * | | | | Add missing header to ergodox ordinary keymap | Nikolaus Wittenstein | 2017-02-03 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Fix compile warnings in egodox robot_test_layout | Nikolaus Wittenstein | 2017-02-03 | 1 | -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.c | Nikolaus Wittenstein | 2017-02-03 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the warning "function declaration isn't a prototype" by explicitly making the parameter list void. | ||||
| * | | | | | Merge pull request #1046 from LukeSilva/master | Jack Humbert | 2017-02-07 | 7 | -6/+419 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add Tapping Macros to QMK | ||||
| | * | | | | | Add luke keymap, as an example of the tapping macros | Luke Silva | 2017-01-29 | 3 | -0/+382 |
| | | | | | | | |||||
| | * | | | | | Add support for various tapping macros | Luke Silva | 2017-01-28 | 2 | -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 functions | Luke Silva | 2017-01-27 | 2 | -1/+5 |
| | | | | | | | |||||
| | * | | | | | Fix documentation for TMK actions | Luke Silva | 2017-01-26 | 1 | -3/+7 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1057 from priyadi/selectable_output | Jack Humbert | 2017-02-07 | 7 | -71/+189 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Implement runtime selectable output (USB or BT) | ||||
| | * | | | | | | Restrict outputselect to LUFA only for now | Priyadi Iman Nurcahyo | 2017-02-01 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Fix wrong include | Priyadi Iman Nurcahyo | 2017-02-01 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Limit outputselect to AVR only for now | Priyadi Iman Nurcahyo | 2017-02-01 | 5 | -3/+6 |
| | | | | | | | | |||||
| | * | | | | | | Move outputselect to parent dir to satisfy non LUFA keyboards | Priyadi Iman Nurcahyo | 2017-02-01 | 2 | -0/+0 |
| | | | | | | | | |||||
| | * | | | | | | Add layer switcher keycodes: OUT_AUTO, OUT_USB, OUT_BT, OUT_BLE | Priyadi Iman Nurcahyo | 2017-02-01 | 2 | -0/+39 |
| | | | | | | | | |||||
| | * | | | | | | Implement runtime selectable output (USB or BT) | Priyadi Iman Nurcahyo | 2017-02-01 | 4 | -69/+145 |
| | | | | | | | | |||||
| * | | | | | | | pass through travis errors | Jack Humbert | 2017-02-07 | 3 | -2/+6 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1056 from upils/master | Jack Humbert | 2017-02-07 | 8 | -0/+334 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add reddot handwired keyboard. | ||||
| | * | | | | | | | Add reddot handwired keyboard. | upils | 2017-01-31 | 8 | -0/+334 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge pull request #1053 from TerryMathews/master | Jack Humbert | 2017-02-07 | 10 | -4/+175 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Let's Split: establish rev2fliphalf subproject | ||||
| | * | | | | | | | Reverse rev2 and rev2fliphalf | TerryMathews | 2017-02-06 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flipped definitions on what constitutes "fliphalf" by popular demand. |