summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix slight inconsistencyFred Sundvik2016-08-241-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.mkFred Sundvik2016-08-232-75/+73
|
* Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-2367-2662/+3797
|\
| * Merge pull request #671 from Talljoe/one-handJack Humbert2016-08-2310-5/+210
| |\ | | | | | | Add native one-handed support
| | * Add one-hand key to planck/experimental keymap.Joe Wasson2016-08-202-4/+5
| | |
| | * Add default swap configs for a couple of boards.Joe Wasson2016-08-203-0/+45
| | |
| | * Improve one-hand support by adding more actions and tap keys.Joe Wasson2016-08-203-9/+89
| | |
| | * Add one-hand support.Joe Wasson2016-08-205-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/masterJack Humbert2016-08-231-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 ↵coderkun2016-08-212-13/+4
| | | | | | | | | | | | | | | | “weak” instead
| | * | Add method to set Unicode input key for ISO 14755coderkun2016-08-212-2/+13
| | |/ | | | | | | | | | https://github.com/jackhumbert/qmk_firmware/issues/672
| * | Merge pull request #675 from Xyverz/masterJack Humbert2016-08-231-1/+1
| |\ \ | | | | | | | | Added missing item K3A to KEYMAP() variable in tv44.h
| | * \ Merge remote-tracking branch 'upstream/master'Xyverz2016-08-2144-2447/+2762
| | |\ \
| | * | | Added missing key K3A to KEYMAP() macro in tv44.hXyverz2016-08-211-1/+1
| | | | |
| * | | | Merge pull request #676 from ickerwx/kitten_pawJack Humbert2016-08-239-0/+611
| |\ \ \ \ | | |_|/ / | |/| | | Added support for the Kitten Paw controller
| | * | | Added support for the Kitten Paw controllerRené Werner2016-08-229-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_instructionsJack Humbert2016-08-211-2/+49
| |\ \ \ | | | | | | | | | | Add instructions for Windows 10 subsystem for Linux
| | * | | Add warning about line endingsFred Sundvik2016-08-201-0/+2
| | | | |
| | * | | Add instructions for Windows 10 subsystem for LinuxFred Sundvik2016-08-201-2/+47
| | | | | | | | | | | | | | | | | | | | Also simplify the linux instructions
| * | | | Merge pull request #668 from fredizzimo/line_endingsJack Humbert2016-08-2127-2169/+2262
| |\ \ \ \ | | | | | | | | | | | | Enforce correct line endings
| | * | | | Normalize line endingsFred Sundvik2016-08-2026-2169/+2169
| | | | | |
| | * | | | Add .gitattributes to ensure correct line endingsFred Sundvik2016-08-201-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/masterJack Humbert2016-08-211-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | Fixing Dvorak
| | * | | Fixing DvorakKyle Berry2016-08-211-1/+1
| |/ / / | | | | | | | | | | | | Updating with proper Dvorak layout.
| * | | Merge pull request #665 from linsomniac/keymap_jafoJack Humbert2016-08-205-0/+213
| |\ \ \ | | | | | | | | | | Adding jafo layout.
| | * | | Bringing over changes from default map.Sean Reifschneider2016-08-191-4/+3
| | | | |
| | * | | Adding jafo layout.Sean Reifschneider2016-08-195-0/+214
| | | | |
| * | | | Merge pull request #658 from Xyverz/masterJack Humbert2016-08-202-209/+211
| |\ \ \ \ | | | |_|/ | | |/| | Got rid of all the kludge in my ErgoDox keymap.
| | * | | Merge remote-tracking branch 'upstream/master'Xyverz2016-08-1966-92/+6560
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.Xyverz2016-08-192-17/+10
| | | | |
| | * | | Changed my keymap to match normal keymaps.Xyverz2016-08-191-314/+198
| | | | |
| | * | | Added compatibility for the Infinity ErgoDox to my Ergodox keymap.Xyverz2016-08-182-53/+178
| | | | | | | | | | | | | | | | | | | | Updated readme.md to reflect this change.
| * | | | Merge pull request #630 from nrrkeene/masterJack Humbert2016-08-2010-275/+237
| |\ \ \ \ | | |_|/ / | |/| | | The Ordinary Layout is the unsurprising layout
| | * | | The Ordinary Layout is boring because all the keys are where you expect them ↵Nicholas Keene2016-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | to be
| | * | | The Ordinary Layout is boring because all the keys are where you expect them ↵Nicholas Keene2016-08-198-111/+98
| | | | | | | | | | | | | | | | | | | | to be
| | * | | The Ordinary Layout is the unsurprising layoutNicholas Keene2016-08-1310-183/+158
| | | | |
* | | | | Change order of variable assignmentFred Sundvik2016-08-211-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-checkingFred Sundvik2016-08-211-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | This fixes cases where you have several keyboards with a common prefix, like algernon, and algernon-master
* | | | | Comment the MakefileFred Sundvik2016-08-202-18/+124
| | | | | | | | | | | | | | | | | | | | Also move some messages to message.mk
* | | | | Fix the clean targetFred Sundvik2016-08-201-2/+1
| | | | | | | | | | | | | | | | | | | | It now properly cleans all the outputs
* | | | | Update keyboard readme files with new makefile instructionsFred Sundvik2016-08-2016-58/+75
| | | | |
* | | | | Update readme with new instructions for makeFred Sundvik2016-08-201-21/+81
| | | | |
* | | | | Add diffutils to travis.yml and install_dependenciesFred Sundvik2016-08-202-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 splitFred Sundvik2016-08-202-74/+69
| | | | |
* | | | | Better format for non-silent outputFred Sundvik2016-08-201-2/+1
| | | | |
* | | | | Continue on errorFred Sundvik2016-08-202-3/+10
| | | | |
* | | | | Move bootloader_defs include to build_keyboardFred Sundvik2016-08-202-8/+9
| | | | | | | | | | | | | | | | | | | | Also fix it for subprojects
* | | | | Add output specific config fileFred Sundvik2016-08-202-21/+16
| | | | |
* | | | | Output specific include pathsFred Sundvik2016-08-202-27/+22
| | | | |
* | | | | More general system for generating several outputsFred Sundvik2016-08-204-104/+98
| | | | |