summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-02-07Revert "Reverse rev2 and rev2fliphalf"TerryMathews2-7/+7
This reverts commit 0537977ba1412aa2ba753e152eec445e18858244.
2017-02-07Reverse rev2 and rev2fliphalfTerryMathews2-7/+7
Flipped definitions on what constitutes "fliphalf" by popular demand.
2017-02-07Merge pull request #1010 from SjB/oneshot_timeout_fixJack Humbert1-8/+8
oneshot timeout would only timeout after an event.
2017-02-07Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert1-1/+10
2017-02-07[skip build] testing travis scriptJack Humbert1-1/+1
2017-02-07Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairsJack Humbert1-1/+10
Add support for Unicode supplementary planes on OS X
2017-02-06[skip build] testing travis scriptJack Humbert2-1/+3
2017-02-06Added non-animated gradient modedungdung2-1/+20
2017-02-06Added mode reverse step functiondungdung2-0/+9
2017-02-06Christmas mode now works with even RGBED_NUMdungdung2-4/+12
Added Christmas mode steps to reduce red and green colors blending into each other Added Christmas mode interval Increased green hue to 120
2017-02-06Merge pull request #1030 from SjB/refactor_register_code16Jack Humbert1-2/+30
speeding up (un)register_code16
2017-02-06[skip build] testing travis scriptJack Humbert1-1/+1
2017-02-06[skip build] testing travis scriptJack Humbert1-1/+5
2017-02-06[skip build] testing travis scriptJack Humbert1-1/+1
2017-02-06[skip build] testing travis scriptJack Humbert1-3/+1
2017-02-06[skip build] testing travis scriptJack Humbert2-19/+25
2017-02-06fixes qmk.fm linking, tests out auto version incrementingJack Humbert1-1/+20
2017-02-06change cmd-l and cmd-r for actual home and endCallum Oakley2-5/+3
2017-02-06Minor cleanupNikolaus Wittenstein3-8/+2
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-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-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.