summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-02-04Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwaremilestogo
2017-02-03Add missing header to ergodox ordinary keymapNikolaus Wittenstein
2017-02-03Fix compile warnings in egodox robot_test_layoutNikolaus Wittenstein
Fixes the warning "right shift count >= width of type" by adding UL to the end of constants.
2017-02-03Fix compile warnings in light_ws2812.cNikolaus Wittenstein
Fixes the warning "function declaration isn't a prototype" by explicitly making the parameter list void.
2017-02-02Merge pull request #1063 from osamuaoki/masterErez Zukerman
Typo fixes
2017-02-02Merge pull request #1058 from edasque/masterErez Zukerman
Reverted Dockerfile to put the CMD back
2017-02-02Typo fixesOsamu Aoki
2017-02-01Fix V-USB bug on Windows 10Luiz Ribeiro
2017-02-01Merge pull request #1049 from SjB/tap_dance_save_oneshot_modsErez Zukerman
race condition between oneshot_mods and tap_dance
2017-02-01Merge pull request #1054 from deadcyclo/masterErez Zukerman
Adds support for ergodox shine and unicode and emoji support to the deadcyclo layout
2017-02-01Restrict outputselect to LUFA only for nowPriyadi Iman Nurcahyo
2017-02-01Fix wrong includePriyadi Iman Nurcahyo
2017-02-01Limit outputselect to AVR only for nowPriyadi Iman Nurcahyo
2017-02-01Move outputselect to parent dir to satisfy non LUFA keyboardsPriyadi Iman Nurcahyo
2017-02-01Add layer switcher keycodes: OUT_AUTO, OUT_USB, OUT_BT, OUT_BLEPriyadi Iman Nurcahyo
2017-02-01Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-31Introduces ALGR_T for dual-function AltGrErez Zukerman
2017-01-31Reverted Dockerfile to put the CMD backErik Dasque
2017-01-31Merge pull request #1039 from zabereer/albert_ergodox_keymapErez Zukerman
albert ergodox keymap
2017-01-31Merge pull request #1055 from matzebond/masterErez Zukerman
update my neo2 keymap
2017-02-01Implement runtime selectable output (USB or BT)Priyadi Iman Nurcahyo
2017-01-31Add reddot handwired keyboard.upils
2017-01-30fixing kinesis rebootmilestogo
2017-01-30update my neo2 keymapMatthias Schmitt
2017-01-30[deadcyclo layout] Refactoring. Use custom functions and macrosBrendan Johan Lee
2017-01-30[deadcyclo layout] fixed failing testsBrendan Johan Lee
2017-01-30Merge remote-tracking branch 'upstream/master'Brendan Johan Lee
2017-01-29Let's Split: establish rev2fliphalf subprojectTerryMathews
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_danceSjB
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.SjB
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_code16SjB
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 Nurcahyo
2017-01-29minimize LEDsPriyadi Iman Nurcahyo
2017-01-29fix greek layersPriyadi Iman Nurcahyo
2017-01-29Implement greek layers on my Promethium layoutPriyadi Iman Nurcahyo
2017-01-28added picture of layoutYale Thomas
2017-01-28usability tweaksYale Thomas
2017-01-28mouse keys addedYale Thomas
2017-01-28new 'yale' keymapYale Thomas
2017-01-28s/Bkps/BkspStephen Tudor
2017-01-29Add luke keymap, as an example of the tapping macrosLuke Silva
2017-01-28Add support for various tapping macrosLuke Silva
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 Tudor
2017-01-28Improve Planck keymapStephen Tudor
- added escape+shift mod-tap key - replaced BRITE with backtick
2017-01-28Merge branch 'master' into smt/planckStephen Tudor
* 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-27Merge pull request #1043 from potz/patch-1skullydazed
Clarify license on abnt2 keymap (#1038)
2017-01-27split kinesis layout into ergodox and planck style symbol layersmilestogo
2017-01-27Clarify license on abnt2 keymap (#1038)Potiguar Faga
2017-01-27Added Espynn's keymapfolkert4
2017-01-27Merge pull request #869 from dylanjgscott/masterJack Humbert
Use `type cmp` to test for cmp in Makefile