summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Add USB-BLE manual output switching and indicatorPriyadi Iman Nurcahyo2017-02-091-12/+44
|
* Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2017-02-0961-224/+3332
|\
| * Moved KC60 capslock LED code to standard led_set_kb so it can be overridden ↵dungdung2017-02-073-34/+15
| | | | | | | | by users
| * 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 #1068 from adzenith/masterJack Humbert2017-02-072-4/+5
| |\ \ | | | | | | | | Minor cleanup
| | * | 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.
| * | | Merge pull request #1046 from LukeSilva/masterJack Humbert2017-02-073-0/+382
| |\ \ \ | | | | | | | | | | Add Tapping Macros to QMK
| | * | | Add luke keymap, as an example of the tapping macrosLuke Silva2017-01-293-0/+382
| | | | |
| * | | | pass through travis errorsJack Humbert2017-02-071-1/+1
| | | | |
| * | | | Merge pull request #1056 from upils/masterJack Humbert2017-02-078-0/+334
| |\ \ \ \ | | | | | | | | | | | | Add reddot handwired keyboard.
| | * | | | Add reddot handwired keyboard.upils2017-01-318-0/+334
| | | | | |
| * | | | | Merge pull request #1053 from TerryMathews/masterJack Humbert2017-02-0710-4/+175
| |\ \ \ \ \ | | | | | | | | | | | | | | Let's Split: establish rev2fliphalf subproject
| | * | | | | Reverse rev2 and rev2fliphalfTerryMathews2017-02-062-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Flipped definitions on what constitutes "fliphalf" by popular demand.
| | * | | | | Revert "Reverse rev2 and rev2fliphalf"TerryMathews2017-02-062-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0537977ba1412aa2ba753e152eec445e18858244.
| | * | | | | Reverse rev2 and rev2fliphalfTerryMathews2017-02-062-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Flipped definitions on what constitutes "fliphalf" by popular demand.
| | * | | | | Let's Split: establish rev2fliphalf subprojectTerryMathews2017-01-299-0/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subproject to accomodate second half pad built in opposite orientation (places TRRS jacks on opposing edges for shorter cable runs)
| * | | | | | add commaJack Humbert2017-02-071-1/+1
| | | | | | |
| * | | | | | Merge pull request #1069 from hot-leaf-juice/masterJack Humbert2017-02-072-5/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | change cmd-l and cmd-r for actual home and end
| | * | | | | | change cmd-l and cmd-r for actual home and endCallum Oakley2017-02-062-5/+3
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #1041 from folkert4/masterJack Humbert2017-02-075-0/+503
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Added Espynn's keymap
| | * | | | | | Added Espynn's keymapfolkert42017-01-275-0/+503
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #1047 from lordchair/keymap_yaleJack Humbert2017-02-074-0/+144
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | yale planck layout
| | * | | | | added picture of layoutYale Thomas2017-01-281-0/+0
| | | | | | |
| | * | | | | usability tweaksYale Thomas2017-01-281-44/+49
| | | | | | |
| | * | | | | mouse keys addedYale Thomas2017-01-281-6/+15
| | | | | | |
| | * | | | | new 'yale' keymapYale Thomas2017-01-283-0/+130
| | |/ / / /
| * | | | | Merge pull request #1048 from smt/smt/planckJack Humbert2017-02-065-22/+385
| |\ \ \ \ \ | | | | | | | | | | | | | | Add smt's keymap for Planck
| | * | | | | s/Bkps/BkspStephen Tudor2017-01-281-1/+1
| | | | | | |
| | * | | | | Carry over Planck updates to my Preonic keymapStephen Tudor2017-01-282-22/+50
| | | | | | |
| | * | | | | Improve Planck keymapStephen Tudor2017-01-282-11/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added escape+shift mod-tap key - replaced BRITE with backtick
| | * | | | | Merge branch 'master' into smt/planckStephen Tudor2017-01-2821-25/+412
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Clarify license on abnt2 keymap (#1038) replace jackhumbert with qmk Add gitter image, start update to qmk org Remove COLEMAK from preonic_keycodes enum layer defines to enum Update readme for smt Preonic keymap Add smt keymap for Preonic updated all the other keymaps to support the new changes. fix: infinity60 keyboard was not using quantum features. Compare Makefile with itself instead of using `--help`
| | * | | | | Add smt keymap for PlanckStephen Tudor2017-01-263-0/+313
| | | | | | |
| * | | | | | Merge pull request #1036 from nicinabox/lets-split-improvementsJack Humbert2017-02-062-0/+14
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | Lets Split flashing improvements
| | * | | | | Update readmeNic Aitch2017-01-261-0/+4
| | | | | | |
| | * | | | | Add avrdude targetNic Aitch2017-01-261-0/+10
| | |/ / / /
| * | | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-02-015-30/+900
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman2017-01-314-0/+866
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | albert ergodox keymap
| | | * | | | | albert ergodox keymapAlbert Pretorius2017-01-264-0/+866
| | | | |_|_|/ | | | |/| | |
| | * | | | | update my neo2 keymapMatthias Schmitt2017-01-301-30/+34
| | | |_|/ / | | |/| | |
| * | | | | [deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee2017-01-301-237/+266
| | | | | |
| * | | | | [deadcyclo layout] fixed failing testsBrendan Johan Lee2017-01-301-16/+1
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-2712-13/+13
| |\| | | |
| * | | | | [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keysBrendan Johan Lee2017-01-274-23/+26
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-2610-13/+400
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | [deadcyclo layout] Added lotsof new emojis and some new unicode keysBrendan Johan Lee2017-01-253-11/+178
| | | | | |