summaryrefslogtreecommitdiffstats
path: root/quantum
Commit message (Collapse)AuthorAgeFilesLines
* Most ergodox keymaps compiles on InfinityFred Sundvik2016-07-291-0/+1
| | | | There are linker errors due to missing led funcitonality though
* tap-dance: Add some debugging supportGergely Nagy2016-07-272-0/+16
| | | | Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* Merge pull request #558 from lindhe/masterJack Humbert2016-07-252-2/+2
|\ | | | | Fix misspelled command in Norwegian helper
| * Change Nordic ampersand code to match the EnglishAndreas Lindhé2016-07-251-1/+1
| | | | | | | | Changed from "NO_AMP" to "NO_AMPR" since the KC one is "KC_AMPR"
| * Fix misspelled command in Norwegian helperAndreas Lindhé2016-07-251-1/+1
| |
* | Fixes midi functionalityJack Humbert2016-07-242-13/+13
| |
* | Merge pull request #552 from robertdale/music-play-fixJack Humbert2016-07-241-1/+6
|\ \ | | | | | | Fixes issue #551 - ensure there's a recording to play before playing
| * | ensure there's a recording to play before playing; also enables the LGUI ↵Robert Dale2016-07-241-1/+6
| |/ | | | | | | button to play a tone
* | Merge pull request #550 from Darthabel/fix_bepoJack Humbert2016-07-241-2/+2
|\ \ | | | | | | Fix some errors in bepo mapping
| * | Fix some errors in bepo mappingVivien Alger2016-07-241-2/+2
| |/
* | tap-dance: Code cleanupGergely Nagy2016-07-221-21/+24
| | | | | | | | | | | | | | | | Removes a number of duplicated code, by passing actions around instead of keycodes, so the various dance action functions do not have to look up the action, but the caller does that for them. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* | tap-dance: Support user_data for the callbacksGergely Nagy2016-07-222-64/+38
| | | | | | | | | | | | | | | | | | | | | | Refactored the code a little, so all callbacks now receive a `user_data` pointer, which can be anything. As an example, the key pairs from `ACTION_TAP_DANCE_DOUBLE` now use this, and custom, built-in functions. This makes it easier to extend the tap dance functionality, and also simplifies the code a little. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* | tap-dance: Support for holding keysGergely Nagy2016-07-222-1/+12
|/ | | | | | | | | | | | With this change, tap dance will now store the pressed state of the tap-dance key, and allow one to make an action sooner, while the key is still held, and only unregister when the key is released. The registration must happen in the `on_dance_finished` callback, while unregistering goes to `on_reset`. The surrounding code makes sure not to call either multiple times. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* Merge pull request #518 from jakllsch/upstreamJack Humbert2016-07-218-13/+20
|\ | | | | keymap_extras changes
| * keymap_dvorak.h: add missing shifted keys, fix whitespaceJonathan A. Kollasch2016-07-141-4/+11
| |
| * extra_keymaps: use RALT() instead of 0x1400 for AltGrJonathan A. Kollasch2016-07-147-7/+7
| |
| * keymap_extras: add newline at end of filesJonathan A. Kollasch2016-07-142-2/+2
| |
* | add a couple of commentsPavlos Vinieratos2016-07-191-0/+2
| |
* | on_each_tap_fn is called on tap down and tap upPavlos Vinieratos2016-07-191-1/+1
| |
* | in the default case, it should be called if there is actually a tapPavlos Vinieratos2016-07-181-2/+2
| | | | | | | | | | dance happening, and in the normal case, it should be called when the tap down is happening.
* | change naming, and remove extraneous definitionPavlos Vinieratos2016-07-172-36/+23
| |
* | add an `anyway` and a `reset` callbackPavlos Vinieratos2016-07-162-5/+59
| | | | | | | | | | | | | | when using tap dance, we have the `regular` callback that is called on the last tap. this commit adds an `anyway` callback that is called on every tap, and a `reset` callback that is called on reset of the tap dance taps.
* | in case its NULLPavlos Vinieratos2016-07-161-1/+3
|/
* extract reset keyboard into a functionPavlos Vinieratos2016-07-132-10/+16
| | | | that makes it easy to call reset_keyboard() from a function in a keymap
* Merge pull request #477 from Smilliam/masterJack Humbert2016-07-111-0/+12
|\ | | | | Canceling Space Cadet state with opposite shift key
| * Made rollover behavior for space cadet optionalSmilliam2016-07-101-8/+12
| |
| * fixed indentation.Smilliam2016-07-041-8/+8
| |
| * Allow Space Cadet state to be canceled by alternate Shift keySmilliam2016-07-041-0/+8
| | | | | | | | Allows you to press RSHIFT to cancel the insertion of a "(" when holding down LSHIFT. Alternatively, allows you to press LSHIFT to cancel the insertion of a ")" when holding down RSHIFT. This change enables you to renege from outputting a character should you press a shift key erroneously.
* | Move return out of event if blockTerryMathews2016-07-081-26/+26
| | | | | | | | | | According to Jack, this makes the return case not be processed. Doesn't break anything in the firmware.
* | Create keycodes for RGB control functionsTerryMathews2016-07-072-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | Moves RGB controls out of the macro function and assigns them their own keycodes: RGB_TOG (toggle on/off) RGB_MOD (mode step) RGB_HUI (increase hue) RGB_HUD (decrease hue) RGB_SAI (increase saturation) RGB_SAD (decrease saturation) RGB_VAI (increase brightness) RGB_VAD (decrease brightness)
* | Fix the range for consumer keysFred Sundvik2016-07-071-1/+1
| |
* | fixes quantum template (actually)Jack Humbert2016-07-071-1/+1
| |
* | updates rgblight implementation, makes non-timer stuff compatible with audioJack Humbert2016-07-073-14/+41
| |
* | Merge pull request #490 from fredizzimo/integrate_visualizerJack Humbert2016-07-074-31/+25
|\ \ | | | | | | Integrate visualizer for ChibiOS and Infinity Ergodox
| * | Move the visualizer_user file to keymap folderFred Sundvik2016-07-071-3/+8
| | | | | | | | | | | | Also rename it to visualizer.c
| * | Delete lcd_backlight_hal.cFred Sundvik2016-07-071-3/+0
| | | | | | | | | | | | | | | The functionality can now be found in the infinity_erogodox.c file instead.
| * | Fix the SERIAL_LINK_ENABLE macro in VisualizerFred Sundvik2016-07-071-5/+5
| | | | | | | | | | | | Rename from USE_SERIAL_LINK -> SERIAL_LINK_ENABLE
| * | Fix visualizer crash at startupFred Sundvik2016-07-072-3/+1
| | | | | | | | | | | | | | | | | | Visualizer and serial link initialized in the wrong order. The LED_ENABLED define wasn't set properly uGfx is always initialized
| * | Makefile fixes and update of VisualizerFred Sundvik2016-07-072-7/+5
| | |
| * | Makefile changes and files to compile VisualizerFred Sundvik2016-07-073-15/+11
| | |
* | | corrects quantum templateJack Humbert2016-07-071-1/+1
| | |
* | | default keymap, reset sorted out for now, added serial to makefileJack Humbert2016-07-061-1/+1
|/ /
* | Merge commit '73d890a2c9c34b905cd5e74e7146fdd4578dcb96' into add_visualizerFred Sundvik2016-07-065-25/+342
| |
* | Delete .gitmodules from visualizerFred Sundvik2016-07-062-3/+0
| |
* | Add 'quantum/visualizer/' from commit 'bde869aa7ec8601459bc63b9636081d21108d1be'Fred Sundvik2016-07-0613-0/+1403
| | | | | | | | | | | | git-subtree-dir: quantum/visualizer git-subtree-mainline: 19f480992c015aec0a15dca43e740bad8b7834e6 git-subtree-split: bde869aa7ec8601459bc63b9636081d21108d1be
* | Merge pull request #482 from fredizzimo/serial_linkJack Humbert2016-07-0621-0/+2374
|\ \ | | | | | | Add serial link library
| * | Remove extra serial_link subdirectoryFred Sundvik2016-07-0622-62/+1
| | |
| * | Remove CGreen make filesFred Sundvik2016-07-063-71/+0
| | |
| * | Remove serial_link .gitignore and .gitmodulesFred Sundvik2016-07-062-4/+0
| | |
| * | Add 'quantum/serial_link/' from commit ↵Fred Sundvik2016-07-0528-0/+2510
| | | | | | | | | | | | | | | | | | | | | | | | 'a20d513e3cdacbf6e0e70a80402497ad10166434' git-subtree-dir: quantum/serial_link git-subtree-mainline: 7d28d6a7bc81578bb5a83f1d55810ee3d1458e96 git-subtree-split: a20d513e3cdacbf6e0e70a80402497ad10166434