summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #1058 from edasque/masterErez Zukerman2017-02-021-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Reverted Dockerfile to put the CMD back
| * | | | | | | | | | Reverted Dockerfile to put the CMD backErik Dasque2017-01-311-1/+2
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1049 from SjB/tap_dance_save_oneshot_modsErez Zukerman2017-02-012-1/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | race condition between oneshot_mods and tap_dance
| * | | | | | | | | | race condition between oneshot_mods and tap_danceSjB2017-01-292-1/+7
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since the keycode for a tap dance process gets process only after the TAPPING_TERM timeout, you really only have ONESHOT_TIMEOUT - TAPPING_TERM time to tap or double tap on the key. This fix save the oneshot_mods into the action.state structure and applies the mods with the keycode when it's registered. It also unregisters the mod when the the tap dance process gets reset.
* | | | | | | | | | Merge pull request #1054 from deadcyclo/masterErez Zukerman2017-02-017-103/+384
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Adds support for ergodox shine and unicode and emoji support to the deadcyclo layout
| * | | | | | | | | 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
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #1055 from matzebond/masterErez Zukerman2017-01-311-30/+34
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | update my neo2 keymap
| * | | | | | | | | | 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-302-2/+18
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1043 from potz/patch-1skullydazed2017-01-271-0/+16
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | Clarify license on abnt2 keymap (#1038)
| * | | | | | | | | Clarify license on abnt2 keymap (#1038)Potiguar Faga2017-01-271-0/+16
|/ / / / / / / / /
* | | | | | | | | Merge pull request #869 from dylanjgscott/masterJack Humbert2017-01-271-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use `type cmp` to test for cmp in Makefile
| * | | | | | | | | Compare Makefile with itself instead of using `--help`Dylan Scott2017-01-241-2/+2
| | | | | | | | | |
| | | * | | | | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-2716-22/+22
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1035 from qmk/qmk_org_changesJack Humbert2017-01-2716-22/+22
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Updated urls due to transfer to qmk org
| * | | | | | | | | replace jackhumbert with qmkJack Humbert2017-01-2616-22/+22
|/ / / / / / / / /
| | * | | | | | | [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-2611-16/+403
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1029 from SjB/qmk_infinity60Jack Humbert2017-01-265-0/+46
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix: infinity60 keyboard was not using quantum features.
| * | | | | | | | | updated all the other keymaps to support the new changes.SjB2017-01-243-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmk firmware requires the matrix_init_user and matrix_scan_user function to be implementated. Added these function to all the existing keymaps.
| * | | | | | | | | fix: infinity60 keyboard was not using quantum features.SjB2017-01-232-0/+18
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the quantum matrix codes where not being initialized or/and called so no feature of the quantum firmware could be used. These codes have been added and now we can enjoy the quantum firmware goodness.
* | | | | | | | | Merge pull request #1033 from smt/smt/preonicJack Humbert2017-01-263-0/+335
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add smt's keymap for Preonic
| * | | | | | | | | Remove COLEMAK from preonic_keycodes enumStephen Tudor2017-01-251-1/+0
| | | | | | | | | |
| * | | | | | | | | Update readme for smt Preonic keymapStephen Tudor2017-01-251-1/+85
| | | | | | | | | |
| * | | | | | | | | Add smt keymap for PreonicStephen Tudor2017-01-253-0/+252
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Add gitter image, start update to qmk orgJack Humbert2017-01-261-3/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert2017-01-253-3/+66
|\| | | | | | | |
* | | | | | | | | layer defines to enumJack Humbert2017-01-252-13/+19
| |/ / / / / / / |/| | | | | | |
| | | * | | | | [deadcyclo layout] Added lotsof new emojis and some new unicode keysBrendan Johan Lee2017-01-253-11/+178
| | | | | | | |
| | | * | | | | Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2017-01-246-8/+72
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #1014 from SjB/lcd_mods_statusJack Humbert2017-01-243-3/+66
|/| | | | | | | | | | | | | | | | | | | | | | | added mods status bit to visualizer.
| * | | | | | | added mods status bit to visualizer.SjB2017-01-173-3/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we can't read the real_mods and oneshot_mods static variable directly within the update_user_visualizer_state function (Threading and serial link). We are know storing the mods states in the visualizer_keyboard_status_t structure. We can now display the status of the modifier keys on the LCD display.
* | | | | | | | turn off rgb_midi in ezJack Humbert2017-01-233-5/+6
| | | | | | | |
| | | * | | | | [deadcyclo layout] Added unicode layerBrendan Johan Lee2017-01-245-27/+98
| | | | | | | |
| | | * | | | | [deadcyclo layout] Added support for ergodox ez shineBrendan Johan Lee2017-01-244-14/+40
| |_|