summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add new keymapAlexey Zabelin2015-12-141-0/+51
| | | | | | The goal of this keymap is to simulate the Atreus layout. Since I've been using it for quite a while I figured this might help me transition to Planck.
* Merge pull request #38 from alcesleo/patch-2Jack Humbert2015-11-271-3/+3
|\ | | | | Make links work in TMK_README
| * Make links work in TMK_READMEJimmy Börjesson2015-11-261-3/+3
|/
* atomic hexJack Humbert2015-11-212-1/+1567
|
* Adds Hyper on the left sideErez Zukerman2015-11-101-2/+2
|
* Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman2015-11-100-0/+0
|\ | | | | | | | | Conflicts: keyboard/ergodox_ez/keymaps/keymap_default.c
| * Uses App key as Alt when heldErez Zukerman2015-11-101-1/+1
| |
* | Uses App key as Alt when heldErez Zukerman2015-11-101-1/+1
|/
* [Jack & Erez] Adds standalone versions of Hyper and MehErez Zukerman2015-11-101-0/+4
|
* [Erez & Jack] Adds Meh key (Hyper without Win/Cmd)Erez Zukerman2015-11-103-5/+12
|
* Enabled NKRO by default, drops irrelevant makefile optionsErez Zukerman2015-11-101-7/+4
|
* Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2015-11-097-0/+451
|\
| * Merge pull request #36 from justinyhuang/masterJack Humbert2015-11-077-0/+451
| |\ | | | | | | added support for JD45
| | * minor change for the keyboard infoHuangYang2015-11-061-3/+3
| | |
| | * added support for jd45HuangYang2015-11-067-0/+451
| |/
* / Michelle's layoutJack Humbert2015-11-091-0/+183
|/
* nkro infoJack Humbert2015-11-053-5/+5
|
* readmeJack Humbert2015-10-301-1/+1
|
* atomic filesJack Humbert2015-10-304-0/+185
|
* atomic up-to-dateJack Humbert2015-10-3053-4193/+368
|
* Fixes linkErez Zukerman2015-10-301-1/+1
|
* [Erez & Jack] Updates documentationErez Zukerman2015-10-302-286/+340
|
* readmes\!Jack Humbert2015-10-292-32/+225
|
* homebrew instructionsJack Humbert2015-10-292-0/+9
|
* Adds Hyper key, tweaks ErgoDox EZ default keymapErez Zukerman2015-10-294-244/+34
|
* READMEJack Humbert2015-10-281-0/+5
|
* Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2015-10-284-1419/+1423
|\
| * Fixes rolling combos for mod-tap keysErez Zukerman2015-10-284-1419/+1423
| |
* | mergingJack Humbert2015-10-288-1564/+1441
|\|
| * More work on ErgoDox EZ default keymapErez Zukerman2015-10-289-1570/+1442
| |
* | changesJack Humbert2015-10-281-1/+1
| |
* | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2015-10-276-54/+1613
|\|
| * Initial working version of ErgoDox EZ layout using new syntaxErez Zukerman2015-10-286-58/+1617
| |
* | ht to mtJack Humbert2015-10-271-4/+4
|/
* layer tap, mod tapJack Humbert2015-10-272-2/+9
|
* toggle and hold-tap action shortcutsJack Humbert2015-10-272-2/+22
|
* updated EZ makefile with tmk_core changesJack Humbert2015-10-271-0/+2
|
* Merge pull request #34 from jackhumbert/tmk-masterJack Humbert2015-10-276455-72612/+2450916
|\ | | | | merging from tmk, new_project script and template
| * new project scriptJack Humbert2015-10-2711-4/+412
| |
| * reverting gh60Jack Humbert2015-10-272-9/+44
| |
| * reverting gh60Jack Humbert2015-10-273-68/+58
| |
| * merging tmkJack Humbert2015-10-276443-72510/+2450381
|/|
| * Add doc of HHKB original keycodestmk2015-10-211-0/+69
| |
| * Fix port setting of alps64/matrix.ctmk2015-10-151-1/+1
| |
| * Merge commit 'fdc38ef3f92af7adeeb4de49550d8838c8a39b5c'Jun Wako2015-09-244-0/+0
| |\
| | * Squashed 'tmk_core/' changes from dc0e46e..57d27a8Jun Wako2015-09-2426-181/+550
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 57d27a8 Merge branch 'core_update_150924' into core 024abe3 core: Fix NKRO ifdef 7aa2d30 core: Fix for disabling NKRO in Boot protocol 95651fd core: Fix message print of debug command c20cd29 lufa: Fix endpoint bank mode for ATMega32u2 82ac21f next_usb: Fix next_kbd_set_leds() 537d9c7 Change to KC_BOOTLOADER(KC_BTLD) f2b3772 Add an assignable RESET key fc99257 Fix parenthesis e852582 Fix weak modifier clear in action macro c2a6c5c core: Fix lufa suspend callback(#234) fa548c5 usb_usb: Ignore error usage(0x01-03) report 513d95c usb_usb: Support locking key indicator LED cd78802 core: Add keymap section ldscript for ATMega32U2 70c9abd Add description for non-US keys on keycode.h 538c192 lufa: Fix console flush #223 87628c9 Revert "Make action_for_key a weak symbol" 3c0a1ba Make action_for_key a weak symbol 6bb0d7d ibm4704_usb: Fix protocol handling b6ef5cf Add keyboard_setup() and matrix_setup() f4bb8b2 ibm4704_usb: Fix interrupt of clock(rising edge) 0c1fcc1 usb_usb: Change debug LED pin config 595710d Reduce code size of magic commands 6bed174 Add description of AVR bootloader and boot section 54c6a01 Merge commit 'f6d56675f9f981c5464f0ca7a1fbb0162154e8c5' d18d42e Merge branch 'core-update2' into core febec88 Add compile options '-fdata-sections' git-subtree-dir: tmk_core git-subtree-split: 57d27a8e39173a589b4abae74851f95c39940174
| * | core: Fix NKRO ifdefJun Wako2015-09-241-0/+2
| | |
| * | ibm4704: Add keymap for Alps 102-keyJun Wako2015-09-241-0/+50
| | |
| * | core: Fix for disabling NKRO in Boot protocoltmk2015-09-203-8/+7
| | |
| * | core: Fix message print of debug commandtmk2015-09-201-2/+2
| | |