summaryrefslogtreecommitdiffstats
path: root/quantum
AgeCommit message (Collapse)AuthorFilesLines
2016-07-25Merge pull request #558 from lindhe/masterJack Humbert2-2/+2
Fix misspelled command in Norwegian helper
2016-07-25Change Nordic ampersand code to match the EnglishAndreas Lindhé1-1/+1
Changed from "NO_AMP" to "NO_AMPR" since the KC one is "KC_AMPR"
2016-07-25Fix misspelled command in Norwegian helperAndreas Lindhé1-1/+1
2016-07-25Fixes midi functionalityJack Humbert2-13/+13
2016-07-25Merge pull request #552 from robertdale/music-play-fixJack Humbert1-1/+6
Fixes issue #551 - ensure there's a recording to play before playing
2016-07-25Merge pull request #550 from Darthabel/fix_bepoJack Humbert1-2/+2
Fix some errors in bepo mapping
2016-07-24ensure there's a recording to play before playing; also enables the LGUI ↵Robert Dale1-1/+6
button to play a tone
2016-07-24Fix some errors in bepo mappingVivien Alger1-2/+2
2016-07-22tap-dance: Code cleanupGergely Nagy1-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>
2016-07-22tap-dance: Support user_data for the callbacksGergely Nagy2-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>
2016-07-22tap-dance: Support for holding keysGergely Nagy2-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>
2016-07-22Merge pull request #518 from jakllsch/upstreamJack Humbert8-13/+20
keymap_extras changes
2016-07-19add a couple of commentsPavlos Vinieratos1-0/+2
2016-07-19on_each_tap_fn is called on tap down and tap upPavlos Vinieratos1-1/+1
2016-07-18in the default case, it should be called if there is actually a tapPavlos Vinieratos1-2/+2
dance happening, and in the normal case, it should be called when the tap down is happening.
2016-07-17change naming, and remove extraneous definitionPavlos Vinieratos2-36/+23
2016-07-16add an `anyway` and a `reset` callbackPavlos Vinieratos2-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.
2016-07-16in case its NULLPavlos Vinieratos1-1/+3
2016-07-14keymap_dvorak.h: add missing shifted keys, fix whitespaceJonathan A. Kollasch1-4/+11
2016-07-14extra_keymaps: use RALT() instead of 0x1400 for AltGrJonathan A. Kollasch7-7/+7
2016-07-14keymap_extras: add newline at end of filesJonathan A. Kollasch2-2/+2
2016-07-13extract reset keyboard into a functionPavlos Vinieratos2-10/+16
that makes it easy to call reset_keyboard() from a function in a keymap
2016-07-11Merge pull request #477 from Smilliam/masterJack Humbert1-0/+12
Canceling Space Cadet state with opposite shift key
2016-07-11Made rollover behavior for space cadet optionalSmilliam1-8/+12
2016-07-08Move return out of event if blockTerryMathews1-26/+26
According to Jack, this makes the return case not be processed. Doesn't break anything in the firmware.
2016-07-08Create keycodes for RGB control functionsTerryMathews2-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)
2016-07-07Fix the range for consumer keysFred Sundvik1-1/+1
2016-07-07fixes quantum template (actually)Jack Humbert1-1/+1
2016-07-07updates rgblight implementation, makes non-timer stuff compatible with audioJack Humbert3-14/+41
2016-07-07Merge pull request #490 from fredizzimo/integrate_visualizerJack Humbert4-31/+25
Integrate visualizer for ChibiOS and Infinity Ergodox
2016-07-07corrects quantum templateJack Humbert1-1/+1
2016-07-07Move the visualizer_user file to keymap folderFred Sundvik1-3/+8
Also rename it to visualizer.c
2016-07-07Delete lcd_backlight_hal.cFred Sundvik1-3/+0
The functionality can now be found in the infinity_erogodox.c file instead.
2016-07-07Fix the SERIAL_LINK_ENABLE macro in VisualizerFred Sundvik1-5/+5
Rename from USE_SERIAL_LINK -> SERIAL_LINK_ENABLE
2016-07-07Fix visualizer crash at startupFred Sundvik2-3/+1
Visualizer and serial link initialized in the wrong order. The LED_ENABLED define wasn't set properly uGfx is always initialized
2016-07-07Makefile fixes and update of VisualizerFred Sundvik2-7/+5
2016-07-07default keymap, reset sorted out for now, added serial to makefileJack Humbert1-1/+1
2016-07-06Makefile changes and files to compile VisualizerFred Sundvik3-15/+11
2016-07-06Merge commit '73d890a2c9c34b905cd5e74e7146fdd4578dcb96' into add_visualizerFred Sundvik5-25/+342
2016-07-06Delete .gitmodules from visualizerFred Sundvik2-3/+0
2016-07-06Add 'quantum/visualizer/' from commit 'bde869aa7ec8601459bc63b9636081d21108d1be'Fred Sundvik13-0/+1403
git-subtree-dir: quantum/visualizer git-subtree-mainline: 19f480992c015aec0a15dca43e740bad8b7834e6 git-subtree-split: bde869aa7ec8601459bc63b9636081d21108d1be
2016-07-06Merge pull request #482 from fredizzimo/serial_linkJack Humbert21-0/+2374
Add serial link library
2016-07-06Remove extra serial_link subdirectoryFred Sundvik22-62/+1
2016-07-06Remove CGreen make filesFred Sundvik3-71/+0
2016-07-06Remove serial_link .gitignore and .gitmodulesFred Sundvik2-4/+0
2016-07-06fix/annotate wait_us linesJack Humbert1-12/+2
2016-07-05Add 'quantum/serial_link/' from commit ↵Fred Sundvik28-0/+2510
'a20d513e3cdacbf6e0e70a80402497ad10166434' git-subtree-dir: quantum/serial_link git-subtree-mainline: 7d28d6a7bc81578bb5a83f1d55810ee3d1458e96 git-subtree-split: a20d513e3cdacbf6e0e70a80402497ad10166434
2016-07-05Merge pull request #471 from Chipairon/patch-1Jack Humbert1-2/+2
Fix for '~' in spanish layout
2016-07-05fixed indentation.Smilliam1-8/+8
2016-07-05Allow Space Cadet state to be canceled by alternate Shift keySmilliam1-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.