summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-02-06Add new DIODE_DIRECTION optionNikolaus Wittenstein3-8/+12
The previous two options were COL2ROW, ROW2COL; this adds CUSTOM_MATRIX to disable the built-in matrix scanning code. Most notably, this obviates the need to set MATRIX_ROW_PINS or MATRIX_COL_PINS.
2017-02-06Remove unused matrix_raw variable in matrix.cNikolaus Wittenstein1-2/+0
2017-02-05Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwaremilestogo121-750/+6291
2017-02-04Add missing header to ergodox ordinary keymapNikolaus Wittenstein1-0/+1
2017-02-04Fix compile warnings in egodox robot_test_layoutNikolaus Wittenstein1-4/+4
Fixes the warning "right shift count >= width of type" by adding UL to the end of constants.
2017-02-04Fix compile warnings in light_ws2812.cNikolaus Wittenstein1-3/+3
Fixes the warning "function declaration isn't a prototype" by explicitly making the parameter list void.
2017-02-03Merge pull request #1063 from osamuaoki/masterErez Zukerman1-18/+18
Typo fixes
2017-02-03Merge pull request #1058 from edasque/masterErez Zukerman1-1/+2
Reverted Dockerfile to put the CMD back
2017-02-02Typo fixesOsamu Aoki1-18/+18
2017-02-02Fix V-USB bug on Windows 10Luiz Ribeiro1-2/+2
2017-02-02Merge pull request #1049 from SjB/tap_dance_save_oneshot_modsErez Zukerman2-1/+7
race condition between oneshot_mods and tap_dance
2017-02-02Merge pull request #1054 from deadcyclo/masterErez Zukerman7-103/+384
Adds support for ergodox shine and unicode and emoji support to the deadcyclo layout
2017-02-01Restrict outputselect to LUFA only for nowPriyadi Iman Nurcahyo1-2/+2
2017-02-01Fix wrong includePriyadi Iman Nurcahyo1-1/+1
2017-02-01Limit outputselect to AVR only for nowPriyadi Iman Nurcahyo5-3/+6
2017-02-01Move outputselect to parent dir to satisfy non LUFA keyboardsPriyadi Iman Nurcahyo2-0/+0
2017-02-01Add layer switcher keycodes: OUT_AUTO, OUT_USB, OUT_BT, OUT_BLEPriyadi Iman Nurcahyo2-0/+39
2017-02-01Merge remote-tracking branch 'upstream/master'Brendan Johan Lee5-30/+900
2017-02-01Introduces ALGR_T for dual-function AltGrErez Zukerman1-0/+1
2017-02-01Reverted Dockerfile to put the CMD backErik Dasque1-1/+2
2017-02-01Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman4-0/+866
albert ergodox keymap
2017-02-01Merge pull request #1055 from matzebond/masterErez Zukerman1-30/+34
update my neo2 keymap
2017-01-31Implement runtime selectable output (USB or BT)Priyadi Iman Nurcahyo4-69/+145
2017-01-31Add reddot handwired keyboard.upils8-0/+334
2017-01-31fixing kinesis rebootmilestogo1-2/+2
2017-01-30update my neo2 keymapMatthias Schmitt1-30/+34
2017-01-30[deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee1-237/+266
2017-01-30[deadcyclo layout] fixed failing testsBrendan Johan Lee1-16/+1
2017-01-30Merge remote-tracking branch 'upstream/master'Brendan Johan Lee2-2/+18
2017-01-30Let's Split: establish rev2fliphalf subprojectTerryMathews9-0/+171
Subproject to accomodate second half pad built in opposite orientation (places TRRS jacks on opposing edges for shorter cable runs)
2017-01-29race condition between oneshot_mods and tap_danceSjB2-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.
2017-01-29moved oneshot cancellation code outside of process_record.SjB1-8/+8
The oneshot cancellation code do not depend on the action_tapping_process and since process_record get called via the action_tapping_process logic moved the oneshot cancellation code into the action_exec function just before the action_tapping_process call
2017-01-29registering a weak_mods when using register_code16SjB1-4/+24
Scenario: Locking the KC_LSHIFT, and then using a tap dance key that registers a S(KC_9) will unregister the KC_LSHIFT. The tap dance or any keycode that is registered should not have the side effect of cancelling a locked moditifier. We should be using a similar logic as the TMK codes in tmk_core/comman/action.c:158.
2017-01-29Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethiumPriyadi Iman Nurcahyo0-0/+0
2017-01-29minimize LEDsPriyadi Iman Nurcahyo1-74/+74
2017-01-29fix greek layersPriyadi Iman Nurcahyo2-4/+5
2017-01-29Implement greek layers on my Promethium layoutPriyadi Iman Nurcahyo1-5/+182
2017-01-29added picture of layoutYale Thomas1-0/+0
2017-01-29usability tweaksYale Thomas1-44/+49
2017-01-29mouse keys addedYale Thomas1-6/+15
2017-01-29new 'yale' keymapYale Thomas3-0/+130
2017-01-29s/Bkps/BkspStephen Tudor1-1/+1
2017-01-29Add luke keymap, as an example of the tapping macrosLuke Silva3-0/+382
2017-01-28Add support for various tapping macrosLuke Silva2-2/+25
A macro key can now be easily set to act as a modifier on hold, and press a shifted key when tapped. Or to switch layers when held, and again press a shifted key when tapped. Various other helper defines have been created which send macros when the key is pressed, released and tapped, cleaning up the action_get_macro function inside keymap definitions. The layer switching macros require a GCC extension - 'compound statements enclosed within parentheses'. The use of this extension is already present within the macro subsystem of this project, so its use in this commit should not cause any additional issues. MACRO_NONE had to be cast to a (macro_t*) to suppress compiler warnings within some tapping macros.
2017-01-28Carry over Planck updates to my Preonic keymapStephen Tudor2-22/+50
2017-01-28Improve Planck keymapStephen Tudor2-11/+33
- added escape+shift mod-tap key - replaced BRITE with backtick
2017-01-28Merge branch 'master' into smt/planckStephen Tudor28-39/+442
* 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`
2017-01-28Merge pull request #1043 from potz/patch-1skullydazed1-0/+16
Clarify license on abnt2 keymap (#1038)
2017-01-28split kinesis layout into ergodox and planck style symbol layersmilestogo1-76/+129
2017-01-27Clarify license on abnt2 keymap (#1038)Potiguar Faga1-0/+16