summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #917 from gid0/masterErez Zukerman2016-11-294-142/+208
|\ | | | | keyboards/ergodox/keymaps/bepo : merge from author
| * Add the AZERTY compatibility layer.Olivier2016-11-282-7/+122
| |
| * Change layer names (cosmetic change) and reorder them so that the "shift" ↵Olivier2016-11-281-62/+62
| | | | | | | | layer can be accessed from the "alt" layer when in QWERTY compat mode.
| * A little cleanup, add some comments, change others.Olivier2016-11-281-26/+16
| |
| * Adjust comment.Olivier2016-11-281-1/+1
| |
| * Reorganize the numeric keypad layer more like a traditional numeric keypad.Olivier2016-11-282-12/+12
| |
| * Merge https://github.com/jackhumbert/qmk_firmwareOlivier2016-11-27537-12552/+32657
| |\ | |/ |/|
* | Merge pull request #908 from priyadi/promethiumJack Humbert2016-11-2614-0/+1182
|\ \ | | | | | | My handwired keyboard firmware
| * | update docsPriyadi Iman Nurcahyo2016-11-271-2/+3
| | |
| * | Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethiumPriyadi Iman Nurcahyo2016-11-260-0/+0
| |\ \
| | * | remove ifdef on chip typePriyadi Iman Nurcahyo2016-11-261-2/+0
| | | |
| | * | protocols.mk is already included in latest QMKPriyadi Iman Nurcahyo2016-11-261-1/+0
| | | |
| | * | change init delay to 2000msPriyadi Iman Nurcahyo2016-11-261-0/+2
| | | |
| | * | Merge branch 'master' into promethiumPriyadi Iman Nurcahyo2016-11-2678-484/+3694
| | |\ \
| | * | | My Promethium keyboard firmwarePriyadi Iman Nurcahyo2016-11-2614-0/+1182
| | | | |
| * | | | remove ifdef on chip typePriyadi Iman Nurcahyo2016-11-261-2/+0
| | | | |
| * | | | protocols.mk is already included in latest QMKPriyadi Iman Nurcahyo2016-11-261-1/+0
| | | | |
| * | | | change init delay to 2000msPriyadi Iman Nurcahyo2016-11-261-0/+2
| | | | |
| * | | | My Promethium keyboard firmwarePriyadi Iman Nurcahyo2016-11-2614-0/+1182
| | | | |
* | | | | Merge pull request #907 from priyadi/unicode_docsJack Humbert2016-11-261-1/+27
|\ \ \ \ \ | | | | | | | | | | | | Update Unicode documentation
| * | | | | Update Unicode documentationPriyadi Iman Nurcahyo2016-11-271-1/+27
| |/ / / /
* | | | | Merge pull request #906 from priyadi/unicode_map_fix_warningJack Humbert2016-11-261-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | fix strict-prototypes warning
| * | | | fix strict-prototypes warningPriyadi Iman Nurcahyo2016-11-261-0/+1
|/ / / /
* | | | Merge pull request #905 from priyadi/ps2_documentationJack Humbert2016-11-261-35/+125
|\ \ \ \ | | | | | | | | | | A few addition to PS2 documentation.
| * | | | A few addition to PS2 documentation.Priyadi Iman Nurcahyo2016-11-261-35/+125
| | |/ / | |/| |
* | | | Merge pull request #904 from priyadi/ps2_remove_hardcoded_pinsJack Humbert2016-11-261-45/+1
|\ \ \ \ | | | | | | | | | | PS2 pins configuration belongs to each keyboards config.h
| * | | | remove define checks. didn't work because of include ordering.Priyadi Iman Nurcahyo2016-11-261-118/+0
| | | | |
| * | | | add macro error when a required define is missingPriyadi Iman Nurcahyo2016-11-261-0/+118
| | | | |
| * | | | Fix unterminated ifndefPriyadi Iman Nurcahyo2016-11-261-0/+2
| | | | |
| * | | | PS2 pins configuration belongs to each keyboards config.hPriyadi Iman Nurcahyo2016-11-261-46/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | Each keyboard might have different pin configuration. And keeping this here will trigger redefinition warning on keyboards that have PS2 defines.
* | | | Merge pull request #903 from priyadi/ps2_init_delayJack Humbert2016-11-261-1/+4
|\ \ \ \ | |/ / / |/| | | Make PS2 init delay configurable.
| * | | Make PS2 init delay configurable. Some devices are not fully powered upPriyadi Iman Nurcahyo2016-11-261-1/+4
| |/ / | | | | | | | | | after 1s.
* | | Merge pull request #902 from OferPlesser/feature/ps2-mouse-supportJack Humbert2016-11-253-3/+41
|\ \ \ | | | | | | | | PS/2 mouse support
| * | | Added documentation for PS/2 mouse in readmeofples2016-11-251-0/+39
| | | |
| * | | Removed commentofples2016-11-251-2/+0
| | | |
| * | | Added missing endif for ifdef __AVR_ATmega32U4__ and removed the unnecessary ↵ofples2016-11-251-1/+1
| | | | | | | | | | | | | | | | one at the end of the file
| * | | Added protocol.mk to buildofples2016-11-251-0/+1
|/ / /
* | | Merge pull request #899 from Wilba6582/suspend_fixJack Humbert2016-11-241-5/+6
|\ \ \ | | | | | | | | Fixed NO_SUSPEND_POWER_DOWN handling
| * | | Fixed NO_SUSPEND_POWER_DOWN handlingWilba65822016-11-231-6/+1
| | | |
| * | | Fixed NO_SUSPEND_POWER_DOWN handlingWilba65822016-11-231-1/+7
|/ / /
* | | Merge pull request #898 from PureSpider/backlight-fixJack Humbert2016-11-221-2/+2
|\ \ \ | | | | | | | | Set backlight status to on if it's at maximum brightness already and the brightness increase keybind is used
| * | | Set backlight status to on if it's at maximum brightness already and the ↵PureSpider2016-11-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | brightness increase keybind is used Before it was turned on but the status wasn't set to on, so you had to push the backlight toggle bind twice to turn it off again
* | | | Merge pull request #896 from h-youhei/jp106Jack Humbert2016-11-221-0/+62
|\ \ \ \ | | | | | | | | | | Add japanese keymap
| * | | | Add japanese keymaph-youhei2016-11-221-0/+62
|/ / / /
* | | | Merge pull request #894 from dchagniot/ergodoxDvorakEmacsJack Humbert2016-11-212-0/+235
|\ \ \ \ | | | | | | | | | | Ergodox dvorak emacs
| * | | | typo fixDidier Chagniot2016-11-202-19/+19
| | | | |
| * | | | readme.md updatedDidier Chagniot2016-09-101-0/+70
| | | | |
| * | | | typing with itDidier Chagniot2016-09-091-0/+165
| | | | |
* | | | | Merge pull request #893 from Sihui/sh-hhkb-jpJack Humbert2016-11-213-0/+147
|\ \ \ \ \ | | | | | | | | | | | | [HHKB JP with Dvorak]
| * | | | | add del to new cmdSihui Huang2016-11-201-1/+1
| | | | | |