summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Tidy up atomicity in timer.c and ring_buffer.hWez Furlong2016-11-272-34/+28
* Merge pull request #908 from priyadi/promethiumJack Humbert2016-11-2614-0/+1182
|\
| * 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 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 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.Priyadi Iman Nurcahyo2016-11-261-35/+125
| | |/ | |/|
* | | Merge pull request #904 from priyadi/ps2_remove_hardcoded_pinsJack Humbert2016-11-261-45/+1
|\ \ \
| * | | 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
| |/ /
* | | Merge pull request #903 from priyadi/ps2_init_delayJack Humbert2016-11-261-1/+4
|\ \ \ | |/ / |/| |
| * | Make PS2 init delay configurable. Some devices are not fully powered upPriyadi Iman Nurcahyo2016-11-261-1/+4
| |/
* | Merge pull request #902 from OferPlesser/feature/ps2-mouse-supportJack Humbert2016-11-253-3/+41
|\ \
| * | 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
| * | 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 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 brig...PureSpider2016-11-221-2/+2
* | | Merge pull request #896 from h-youhei/jp106Jack Humbert2016-11-221-0/+62
|\ \ \
| * | | Add japanese keymaph-youhei2016-11-221-0/+62
|/ / /
* | | Merge pull request #894 from dchagniot/ergodoxDvorakEmacsJack Humbert2016-11-212-0/+235
|\ \ \
| * | | 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
|\ \ \ \
| * | | | add del to new cmdSihui Huang2016-11-201-1/+1
| * | | | add space to NewCmd layerSihui Huang2016-11-201-1/+1
| |\ \ \ \
| | * | | | Update README.mdSihui Huang2016-11-201-1/+1
| * | | | | add space to NewCmd layerSihui Huang2016-11-202-2/+2
| |/ / / /
| * | | | Update README.mdSihui Huang2016-11-201-1/+2
| * | | | Update README.mdSihui Huang2016-11-201-1/+2
| * | | | add sh-hhkb-jp layersSihui Huang2016-11-203-0/+145