Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1117 from priyadi/fix_unicode_map | Jack Humbert | 2017-02-23 | 1 | -4/+6 |
|\ | | | | | Fix UNICODE_MAP input_mode problem | ||||
| * | Fix UNICODE_MAP input_mode problem | Priyadi Iman Nurcahyo | 2017-02-23 | 1 | -4/+6 |
| | | |||||
* | | remove more warnings | Jack Humbert | 2017-02-16 | 1 | -1/+3 |
|/ | |||||
* | fix travis and reduce warnings | Jack Humbert | 2017-02-16 | 2 | -0/+2 |
| | |||||
* | fix weirdness with arm and mods | Jack Humbert | 2017-02-15 | 2 | -19/+20 |
| | |||||
* | unique variable name | Jack Humbert | 2017-02-15 | 2 | -19/+19 |
| | |||||
* | publicise variables | Jack Humbert | 2017-02-15 | 2 | -4/+3 |
| | |||||
* | add unicode common file, get names right | Jack Humbert | 2017-02-15 | 1 | -0/+86 |
| | |||||
* | add unicode common file, get names right | Jack Humbert | 2017-02-15 | 6 | -209/+134 |
| | |||||
* | split up unicode systems into different files | Jack Humbert | 2017-02-15 | 8 | -237/+251 |
| | |||||
* | give error if both unicode/map are enabled | Jack Humbert | 2017-02-15 | 1 | -0/+3 |
| | |||||
* | adds layer tap toggle | Jack Humbert | 2017-02-15 | 2 | -4/+12 |
| | |||||
* | Add keycodes to turn on, turn off and toggle faux clicky | Priyadi Iman Nurcahyo | 2017-02-13 | 3 | -0/+43 |
| | |||||
* | Implement faux-clicky feature | Priyadi Iman Nurcahyo | 2017-02-13 | 3 | -0/+156 |
| | |||||
* | Merge pull request #1082 from priyadi/right-side-dual-function | Jack Humbert | 2017-02-11 | 3 | -10/+24 |
|\ | | | | | Implement tap mod dual role for right side mods. | ||||
| * | Make room for 'loose keycodes' by halving UNICODE_MAP range | Priyadi Iman Nurcahyo | 2017-02-11 | 1 | -2/+2 |
| | | |||||
| * | Implement tap mod dual role for right side mods. | Priyadi Iman Nurcahyo | 2017-02-10 | 3 | -9/+23 |
| | | |||||
* | | added functionality for just a port | Jack Humbert | 2017-02-07 | 1 | -32/+62 |
|/ | |||||
* | Merge pull request #1071 from dungdung/rgb_tweaks | Jack Humbert | 2017-02-07 | 2 | -5/+41 |
|\ | | | | | RGB tweaks | ||||
| * | Added non-animated gradient mode | dungdung | 2017-02-06 | 2 | -1/+20 |
| | | |||||
| * | Added mode reverse step function | dungdung | 2017-02-06 | 2 | -0/+9 |
| | | |||||
| * | Christmas mode now works with even RGBED_NUM | dungdung | 2017-02-06 | 2 | -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 | ||||
* | | Merge pull request #1068 from adzenith/master | Jack Humbert | 2017-02-07 | 4 | -13/+15 |
|\ \ | | | | | | | Minor cleanup | ||||
| * | | Add new DIODE_DIRECTION option | Nikolaus Wittenstein | 2017-02-05 | 3 | -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. | ||||
| * | | Remove unused matrix_raw variable in matrix.c | Nikolaus Wittenstein | 2017-02-05 | 1 | -2/+0 |
| | | | |||||
| * | | Fix compile warnings in light_ws2812.c | Nikolaus Wittenstein | 2017-02-03 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | Fixes the warning "function declaration isn't a prototype" by explicitly making the parameter list void. | ||||
* | | | Merge pull request #1046 from LukeSilva/master | Jack Humbert | 2017-02-07 | 2 | -1/+6 |
|\ \ \ | | | | | | | | | Add Tapping Macros to QMK | ||||
| * | | | Add support for various tapping macros | Luke Silva | 2017-01-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | Add ability to use tap macros without using functions | Luke Silva | 2017-01-27 | 2 | -1/+5 |
| | | | | |||||
* | | | | Merge pull request #1057 from priyadi/selectable_output | Jack Humbert | 2017-02-07 | 3 | -1/+43 |
|\ \ \ \ | | | | | | | | | | | Implement runtime selectable output (USB or BT) | ||||
| * | | | | Restrict outputselect to LUFA only for now | Priyadi Iman Nurcahyo | 2017-02-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Limit outputselect to AVR only for now | Priyadi Iman Nurcahyo | 2017-02-01 | 2 | -1/+4 |
| | | | | | |||||
| * | | | | Add layer switcher keycodes: OUT_AUTO, OUT_USB, OUT_BT, OUT_BLE | Priyadi Iman Nurcahyo | 2017-02-01 | 2 | -0/+39 |
| | | | | | |||||
* | | | | | Merge pull request #1059 from qmk/hf/algr_t | Jack Humbert | 2017-02-06 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Introduces ALGR_T for dual-function AltGr | ||||
| * | | | | | Introduces ALGR_T for dual-function AltGr | Erez Zukerman | 2017-01-31 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #960 from ofples/feature/combos | Jack Humbert | 2017-02-06 | 4 | -0/+189 |
|\ \ \ \ \ | | | | | | | | | | | | | Keyboard combination triggers | ||||
| * | | | | | Moved combo processing lower down in process logic | Ofer Plesser | 2016-12-16 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into feature/combos | Ofer Plesser | 2016-12-16 | 3 | -4/+26 |
| |\ \ \ \ \ | |||||
| * | | | | | | Refactored as well as added support for action keys in combos | Ofer Plesser | 2016-12-16 | 2 | -68/+89 |
| | | | | | | | |||||
| * | | | | | | Added support for timing out combos if a key as been pressed for longer than ↵ | Ofer Plesser | 2016-12-10 | 3 | -31/+101 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | COMBO_TERM | ||||
| * | | | | | | Implemented basic key combination feature | Ofer Plesser | 2016-12-10 | 4 | -0/+98 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairs | Jack Humbert | 2017-02-06 | 1 | -1/+10 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Add support for Unicode supplementary planes on OS X | ||||
| * | | | | | | Add support for supplementary planes for OS X | Jonas Oberschweiber | 2016-12-31 | 1 | -1/+10 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1030 from SjB/refactor_register_code16 | Jack Humbert | 2017-02-06 | 1 | -2/+30 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | speeding up (un)register_code16 | ||||
| * | | | | | | registering a weak_mods when using register_code16 | SjB | 2017-01-29 | 1 | -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. | ||||
| * | | | | | | speeding up (un)register_code16 | SjB | 2017-01-23 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In register_code16 and unregister_code16 we call register_code and unregister_code twice, once for the mods and once for the keycode. The (un)register_code have many check to see that keycode we have sent however because we know that we are sending it a mods key, why not just skip all of it and call (un)register_mods instead. This will skip alot of checks and should speedup the loop a little. | ||||
* | | | | | | | race condition between oneshot_mods and tap_dance | SjB | 2017-01-29 | 2 | -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. | ||||
* | | | | | | Clarify license on abnt2 keymap (#1038) | Potiguar Faga | 2017-01-27 | 1 | -0/+16 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #1014 from SjB/lcd_mods_status | Jack Humbert | 2017-01-24 | 2 | -2/+65 |
|\ \ \ \ \ | |/ / / / |/| | | | | added mods status bit to visualizer. | ||||
| * | | | | added mods status bit to visualizer. | SjB | 2017-01-17 | 2 | -2/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. |