summaryrefslogtreecommitdiffstats
path: root/quantum
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1068 from adzenith/masterJack Humbert2017-02-074-13/+15
|\ | | | | Minor cleanup
| * Add new DIODE_DIRECTION optionNikolaus Wittenstein2017-02-053-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.cNikolaus Wittenstein2017-02-051-2/+0
| |
| * Fix compile warnings in light_ws2812.cNikolaus Wittenstein2017-02-031-3/+3
| | | | | | | | | | Fixes the warning "function declaration isn't a prototype" by explicitly making the parameter list void.
* | Merge pull request #1046 from LukeSilva/masterJack Humbert2017-02-072-1/+6
|\ \ | | | | | | Add Tapping Macros to QMK
| * | Add support for various tapping macrosLuke Silva2017-01-281-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 functionsLuke Silva2017-01-272-1/+5
| | |
* | | Merge pull request #1057 from priyadi/selectable_outputJack Humbert2017-02-073-1/+43
|\ \ \ | | | | | | | | Implement runtime selectable output (USB or BT)
| * | | Restrict outputselect to LUFA only for nowPriyadi Iman Nurcahyo2017-02-011-2/+2
| | | |
| * | | Limit outputselect to AVR only for nowPriyadi Iman Nurcahyo2017-02-012-1/+4
| | | |
| * | | Add layer switcher keycodes: OUT_AUTO, OUT_USB, OUT_BT, OUT_BLEPriyadi Iman Nurcahyo2017-02-012-0/+39
| | | |
* | | | Merge pull request #1059 from qmk/hf/algr_tJack Humbert2017-02-061-0/+1
|\ \ \ \ | | | | | | | | | | Introduces ALGR_T for dual-function AltGr
| * | | | Introduces ALGR_T for dual-function AltGrErez Zukerman2017-01-311-0/+1
| |/ / /
* | | | Merge pull request #960 from ofples/feature/combosJack Humbert2017-02-064-0/+189
|\ \ \ \ | | | | | | | | | | Keyboard combination triggers
| * | | | Moved combo processing lower down in process logicOfer Plesser2016-12-161-3/+3
| | | | |
| * | | | Merge branch 'master' into feature/combosOfer Plesser2016-12-163-4/+26
| |\ \ \ \
| * | | | | Refactored as well as added support for action keys in combosOfer Plesser2016-12-162-68/+89
| | | | | |
| * | | | | Added support for timing out combos if a key as been pressed for longer than ↵Ofer Plesser2016-12-103-31/+101
| | | | | | | | | | | | | | | | | | | | | | | | COMBO_TERM
| * | | | | Implemented basic key combination featureOfer Plesser2016-12-104-0/+98
| | | | | |
* | | | | | Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairsJack Humbert2017-02-061-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add support for Unicode supplementary planes on OS X
| * | | | | | Add support for supplementary planes for OS XJonas Oberschweiber2016-12-311-1/+10
| | | | | | |
* | | | | | | Merge pull request #1030 from SjB/refactor_register_code16Jack Humbert2017-02-061-2/+30
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | speeding up (un)register_code16
| * | | | | | registering a weak_mods when using register_code16SjB2017-01-291-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_code16SjB2017-01-231-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_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.
* | | | | | Clarify license on abnt2 keymap (#1038)Potiguar Faga2017-01-271-0/+16
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #1014 from SjB/lcd_mods_statusJack Humbert2017-01-242-2/+65
|\ \ \ \ \ | |/ / / / |/| | | | added mods status bit to visualizer.
| * | | | added mods status bit to visualizer.SjB2017-01-172-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.
* | | | | turn off rgb_midi in ezJack Humbert2017-01-231-0/+1
|/ / / /
* | | | Update quantum_keycodes.hJack Humbert2017-01-131-2/+2
| | | |
* | | | A shot at aliasingErez Zukerman2017-01-121-0/+2
| | | |
* | | | Adds SCMD and SCMD_TErez Zukerman2017-01-111-0/+2
| | | |
* | | | Unregister all mods before inputting Unicode, and reregister afterwardsPriyadi Iman Nurcahyo2017-01-091-8/+33
|/ / /
* | | Merge pull request #973 from Wilba6582/keycode_refactorJack Humbert2016-12-303-313/+330
|\ \ \ | | | | | | | | Keycode refactor
| * | | Keycode refactorWilba65822016-12-293-313/+330
| | | |
* | | | Merge pull request #974 from fredizzimo/remove_malloc_from_sysexJack Humbert2016-12-302-16/+46
|\ \ \ \ | | | | | | | | | | API Sysex fixes
| * | | | API Sysex fixesFred Sundvik2016-12-292-16/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix memory leaks by using stack instead of malloc Reduce memory usage by having less temporary bufffers Remove warnings by adding includes Decrease code size by 608 bytes (mostly due to not linking malloc) More robust handling of buffer overflows
* | | | | Merge pull request #972 from mechkeys/rgb_compatJack Humbert2016-12-292-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Add extern for 'led' global, set 'weak' attribute for rgblight_set()
| * | | | Removed errant +Scott Wilson2016-12-291-1/+1
| | | | |
| * | | | Add extern for 'led' global, set 'weak' attribute for rgblight_set()Scott Wilson2016-12-282-0/+3
| |/ / /
* | | | Merge pull request #968 from ofples/bugfix/right-modifiersJack Humbert2016-12-282-0/+3
|\ \ \ \ | |/ / / |/| | | Fixed bug in do_code16
| * | | Added check that makes sure a code is a right modifier before considering it ↵Ofer Plesser2016-12-232-0/+3
| | | | | | | | | | | | | | | | as one
* | | | add different scales for music modeJack Humbert2016-12-231-0/+9
|/ / /
* | | Christmas RGB light modeJack Humbert2016-12-232-1/+23
| | |
* | | initial subatomic keymap (text)Jack Humbert2016-12-211-2/+0
| | |
* | | limit voices by default, add some drumsJack Humbert2016-12-202-25/+82
| | |
* | | rgb clean-up, api clean-upJack Humbert2016-12-195-35/+76
| |/ |/|
* | specialise music variablesJack Humbert2016-12-121-3/+3
| |
* | re-enable audio and extrakeysJack Humbert2016-12-122-1/+23
|/
* Merge pull request #914 from wez/ble_2Jack Humbert2016-12-021-0/+37
|\ | | | | Add arduino-alike GPIO pin control helpers