Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix slight inconsistency | Fred Sundvik | 2016-08-24 | 1 | -13/+15 |
| | | | | | | | | When running make from either a keyboard folder or a subproject it runs all keymaps for all subprojects and the selected subproject respectively. Without this fix, the same doesn't happen if your run make clean for example. As it would just provide you with an error message. Now this will work as expected. | ||||
* | Split kitten_paw into Makefile/rules.mk | Fred Sundvik | 2016-08-23 | 2 | -75/+73 |
| | |||||
* | Merge branch 'master' into makefile_overhaul | Fred Sundvik | 2016-08-23 | 67 | -2662/+3797 |
|\ | |||||
| * | Merge pull request #671 from Talljoe/one-hand | Jack Humbert | 2016-08-23 | 10 | -5/+210 |
| |\ | | | | | | | Add native one-handed support | ||||
| | * | Add one-hand key to planck/experimental keymap. | Joe Wasson | 2016-08-20 | 2 | -4/+5 |
| | | | |||||
| | * | Add default swap configs for a couple of boards. | Joe Wasson | 2016-08-20 | 3 | -0/+45 |
| | | | |||||
| | * | Improve one-hand support by adding more actions and tap keys. | Joe Wasson | 2016-08-20 | 3 | -9/+89 |
| | | | |||||
| | * | Add one-hand support. | Joe Wasson | 2016-08-20 | 5 | -1/+80 |
| | | | | | | | | | | | | This adds an action, `ACTION_SWAP_HANDS`, that swaps the the keys on the keyboard across a keymap-defined hemisphere in order to support one-hand typing without requiring a separate one-handed layer. See updated `doc/keymap.md` for more information. | ||||
| * | | Merge pull request #673 from coderkun/master | Jack Humbert | 2016-08-23 | 1 | -0/+2 |
| |\ \ | | | | | | | | | Add method to set Unicode input key for ISO 14755 | ||||
| | * | | Drop method to set Unicode input key and declare start and finish methods as ↵ | coderkun | 2016-08-21 | 2 | -13/+4 |
| | | | | | | | | | | | | | | | | “weak” instead | ||||
| | * | | Add method to set Unicode input key for ISO 14755 | coderkun | 2016-08-21 | 2 | -2/+13 |
| | |/ | | | | | | | | | | https://github.com/jackhumbert/qmk_firmware/issues/672 | ||||
| * | | Merge pull request #675 from Xyverz/master | Jack Humbert | 2016-08-23 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Added missing item K3A to KEYMAP() variable in tv44.h | ||||
| | * \ | Merge remote-tracking branch 'upstream/master' | Xyverz | 2016-08-21 | 44 | -2447/+2762 |
| | |\ \ | |||||
| | * | | | Added missing key K3A to KEYMAP() macro in tv44.h | Xyverz | 2016-08-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #676 from ickerwx/kitten_paw | Jack Humbert | 2016-08-23 | 9 | -0/+611 |
| |\ \ \ \ | | |_|/ / | |/| | | | Added support for the Kitten Paw controller | ||||
| | * | | | Added support for the Kitten Paw controller | René Werner | 2016-08-22 | 9 | -0/+611 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | This adds support for the 2016 revision of the Kitten Paw [1] replacement controller by Bathroom Epiphanies. [1] http://bathroomepiphanies.com/controllers/ | ||||
| * | | | Merge pull request #669 from fredizzimo/windows10_build_instructions | Jack Humbert | 2016-08-21 | 1 | -2/+49 |
| |\ \ \ | | | | | | | | | | | Add instructions for Windows 10 subsystem for Linux | ||||
| | * | | | Add warning about line endings | Fred Sundvik | 2016-08-20 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | Add instructions for Windows 10 subsystem for Linux | Fred Sundvik | 2016-08-20 | 1 | -2/+47 |
| | | | | | | | | | | | | | | | | | | | | Also simplify the linux instructions | ||||
| * | | | | Merge pull request #668 from fredizzimo/line_endings | Jack Humbert | 2016-08-21 | 27 | -2169/+2262 |
| |\ \ \ \ | | | | | | | | | | | | | Enforce correct line endings | ||||
| | * | | | | Normalize line endings | Fred Sundvik | 2016-08-20 | 26 | -2169/+2169 |
| | | | | | | |||||
| | * | | | | Add .gitattributes to ensure correct line endings | Fred Sundvik | 2016-08-20 | 1 | -0/+93 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | It also ensures that make files and shell script are checked out with lf endings, for compability with the Windows 10 bash | ||||
| * | | | | Merge pull request #674 from kyleberry/master | Jack Humbert | 2016-08-21 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | | | Fixing Dvorak | ||||
| | * | | | Fixing Dvorak | Kyle Berry | 2016-08-21 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | Updating with proper Dvorak layout. | ||||
| * | | | Merge pull request #665 from linsomniac/keymap_jafo | Jack Humbert | 2016-08-20 | 5 | -0/+213 |
| |\ \ \ | | | | | | | | | | | Adding jafo layout. | ||||
| | * | | | Bringing over changes from default map. | Sean Reifschneider | 2016-08-19 | 1 | -4/+3 |
| | | | | | |||||
| | * | | | Adding jafo layout. | Sean Reifschneider | 2016-08-19 | 5 | -0/+214 |
| | | | | | |||||
| * | | | | Merge pull request #658 from Xyverz/master | Jack Humbert | 2016-08-20 | 2 | -209/+211 |
| |\ \ \ \ | | | |_|/ | | |/| | | Got rid of all the kludge in my ErgoDox keymap. | ||||
| | * | | | Merge remote-tracking branch 'upstream/master' | Xyverz | 2016-08-19 | 66 | -92/+6560 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md. | Xyverz | 2016-08-19 | 2 | -17/+10 |
| | | | | | |||||
| | * | | | Changed my keymap to match normal keymaps. | Xyverz | 2016-08-19 | 1 | -314/+198 |
| | | | | | |||||
| | * | | | Added compatibility for the Infinity ErgoDox to my Ergodox keymap. | Xyverz | 2016-08-18 | 2 | -53/+178 |
| | | | | | | | | | | | | | | | | | | | | Updated readme.md to reflect this change. | ||||
| * | | | | Merge pull request #630 from nrrkeene/master | Jack Humbert | 2016-08-20 | 10 | -275/+237 |
| |\ \ \ \ | | |_|/ / | |/| | | | The Ordinary Layout is the unsurprising layout | ||||
| | * | | | The Ordinary Layout is boring because all the keys are where you expect them ↵ | Nicholas Keene | 2016-08-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | to be | ||||
| | * | | | The Ordinary Layout is boring because all the keys are where you expect them ↵ | Nicholas Keene | 2016-08-19 | 8 | -111/+98 |
| | | | | | | | | | | | | | | | | | | | | to be | ||||
| | * | | | The Ordinary Layout is the unsurprising layout | Nicholas Keene | 2016-08-13 | 10 | -183/+158 |
| | | | | | |||||
* | | | | | Change order of variable assignment | Fred Sundvik | 2016-08-21 | 1 | -9/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | BUILD_DIR and TARGET was assigned too late, so the dfu-util target, which depends on them did not work. | ||||
* | | | | | Add longest match to the rule-checking | Fred Sundvik | 2016-08-21 | 1 | -2/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes cases where you have several keyboards with a common prefix, like algernon, and algernon-master | ||||
* | | | | | Comment the Makefile | Fred Sundvik | 2016-08-20 | 2 | -18/+124 |
| | | | | | | | | | | | | | | | | | | | | Also move some messages to message.mk | ||||
* | | | | | Fix the clean target | Fred Sundvik | 2016-08-20 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | It now properly cleans all the outputs | ||||
* | | | | | Update keyboard readme files with new makefile instructions | Fred Sundvik | 2016-08-20 | 16 | -58/+75 |
| | | | | | |||||
* | | | | | Update readme with new instructions for make | Fred Sundvik | 2016-08-20 | 1 | -21/+81 |
| | | | | | |||||
* | | | | | Add diffutils to travis.yml and install_dependencies | Fred Sundvik | 2016-08-20 | 2 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been required for a while now, and now actually checked in the makefiles. Before, if you didn't have it installed it would just recompile everything. The readme hasn't been updated to reflect this, I think we need to go through that separately, and see what's really needed. Or just instruct people to run the batch scripts. | ||||
* | | | | | Fix the template for the Makefile/rules.mk split | Fred Sundvik | 2016-08-20 | 2 | -74/+69 |
| | | | | | |||||
* | | | | | Better format for non-silent output | Fred Sundvik | 2016-08-20 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | Continue on error | Fred Sundvik | 2016-08-20 | 2 | -3/+10 |
| | | | | | |||||
* | | | | | Move bootloader_defs include to build_keyboard | Fred Sundvik | 2016-08-20 | 2 | -8/+9 |
| | | | | | | | | | | | | | | | | | | | | Also fix it for subprojects | ||||
* | | | | | Add output specific config file | Fred Sundvik | 2016-08-20 | 2 | -21/+16 |
| | | | | | |||||
* | | | | | Output specific include paths | Fred Sundvik | 2016-08-20 | 2 | -27/+22 |
| | | | | | |||||
* | | | | | More general system for generating several outputs | Fred Sundvik | 2016-08-20 | 4 | -104/+98 |
| | | | | |