summaryrefslogtreecommitdiffstats
path: root/keyboards/planck
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'xyverz2016-12-132-7/+3
|\
| * re-enable audio and extrakeysJack Humbert2016-12-121-1/+1
| * Remove unneeded options to reduce firmware sizePriyadi Iman Nurcahyo2016-12-101-6/+2
* | Changesxyverz2016-12-131-5/+5
* | Merge remote-tracking branch 'upstream/master'xyverz2016-12-0629-30/+448
|\|
| * Merge pull request #921 from Wilba6582/raw_hidJack Humbert2016-12-052-2/+2
| |\
| | * Update planck.cJack Humbert2016-12-041-14/+0
| | * Update rules.mkJack Humbert2016-12-041-3/+2
| | * Initial version of Raw HID interfaceWilba65822016-12-012-2/+17
| * | Merge pull request #930 from cbbrowne/masterJack Humbert2016-12-0213-9/+47
| |\ \
| | * | Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929cbbrowne2016-12-0213-9/+47
| * | | adds warnings to 4 keymapsJack Humbert2016-12-024-4/+12
| |/ /
| * | I also want page-down/page-up on UPPER layercbbrowne2016-12-021-1/+1
| * | I want page-down/page-up - put those on LOWER-Left/Right near bottom cornercbbrowne2016-12-021-1/+2
| * | Improve docs on SYSEX bitcbbrowne2016-12-011-1/+1
| * | Make my builds smallercbbrowne2016-12-012-3/+7
| * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-11-299-8/+374
| |\|
| | * separated into api files/folderJack Humbert2016-11-261-0/+1
| | * working with helper, qmk_helper_windows@05b0105Jack Humbert2016-11-212-6/+6
| | * rgb light through midiJack Humbert2016-11-172-2/+2
| | * mergingJack Humbert2016-11-129-12/+796
| | |\
| | * | working with power limitJack Humbert2016-10-164-0/+365
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-312-58/+98
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwarecbbrowne2016-10-261-4/+4
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-10-231-3/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChris Browne2016-10-163-0/+444
| |\ \ \ \ \
| * | | | | | I keep mis-using UPPER|LOWER/SLASH, and getting RESET.cbbrowne2016-10-121-2/+3
* | | | | | | Merge remote-tracking branch 'upstream/master'xyverz2016-11-169-86/+800
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge pull request #839 from priyadi/planck-priyadi-modificationJack Humbert2016-10-302-58/+98
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Use WinCompose unicode input method instead of HexNumpadPriyadi Iman Nurcahyo2016-10-231-1/+1
| | * | | | | Update priyadi's keymap for Planck; added readmePriyadi Iman Nurcahyo2016-10-222-57/+97
| | | |_|/ / | | |/| | |
| * | | | | replace lock key with general power keyCallum Oakley2016-10-251-2/+2
| * | | | | switched to standard volume keysCallum Oakley2016-10-251-2/+2
| |/ / / /
| * | / / removes planck/rev3 temporarilyJack Humbert2016-10-181-3/+0
| | |/ / | |/| |
| * | | Merge pull request #815 from priyadi/unicode_mapJack Humbert2016-10-163-0/+444
| |\ \ \ | | |/ / | |/| |
| | * | Add example keymapPriyadi Iman Nurcahyo2016-10-103-0/+444
| * | | New Planck keymap: vifonWojciech Siewierski2016-10-093-0/+303
| |/ /
| * | updated readmeCallum Oakley2016-10-061-3/+3
| * | added lock screen button and fixed error in diagramCallum Oakley2016-10-061-4/+4
| |/
| * Made some simplifications leveraging the LALT(), LGUI(), and S() functions.Callum Oakley2016-10-011-76/+6
* | Merge remote-tracking branch 'jackhumbert/master'xyverz2016-09-309-129/+755
|\|
| * added en-dash and gbp keys and updated readmeCallum Oakley2016-09-292-96/+91
| * big restructure now I only have to consider macOS, also added mouse, more fun...Callum Oakley2016-09-291-23/+116
| * removed windows layer and updated brightness keys for macOS SierraCallum Oakley2016-09-291-76/+14
| * changed RALT to LALT on WindowsCallum Oakley2016-09-291-1/+1
| * fixed commentsCallum Oakley2016-09-291-10/+10
| * Update readme.mdCallum Oakley2016-09-291-9/+9
| * Update readme.mdCallum Oakley2016-09-291-2/+2
| * updated readmeCallum Oakley2016-09-292-28/+83
| * added close key for alt-f4 macroCallum Oakley2016-09-291-3/+14