Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #561 from 0xdec/patch-1 | Jack Humbert | 2016-08-03 | 1 | -357/+378 |
|\ | | | | | Clean up formatting & tiny refactor in rgblight.c | ||||
| * | Simplify HSV->RGB calculation | Jordi Orlando | 2016-07-26 | 1 | -14/+12 |
| | | | | | | De-dupe repeated code | ||||
| * | Increament -> increment | Jordi Orlando | 2016-07-26 | 1 | -9/+9 |
| | | |||||
| * | Clean up rgblight.c | Jordi Orlando | 2016-07-26 | 1 | -354/+377 |
| | | | | | | Fix formatting issues, clarify comments | ||||
* | | Add IN_LIKE_FLINT song | JeeBak Kim | 2016-07-30 | 1 | -0/+8 |
| | | |||||
* | | Most ergodox keymaps compiles on Infinity | Fred Sundvik | 2016-07-29 | 1 | -0/+1 |
| | | | | | | | | There are linker errors due to missing led funcitonality though | ||||
* | | tap-dance: Add some debugging support | Gergely Nagy | 2016-07-27 | 2 | -0/+16 |
|/ | | | | Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
* | Merge pull request #558 from lindhe/master | Jack Humbert | 2016-07-25 | 2 | -2/+2 |
|\ | | | | | Fix misspelled command in Norwegian helper | ||||
| * | Change Nordic ampersand code to match the English | Andreas Lindhé | 2016-07-25 | 1 | -1/+1 |
| | | | | | | | | Changed from "NO_AMP" to "NO_AMPR" since the KC one is "KC_AMPR" | ||||
| * | Fix misspelled command in Norwegian helper | Andreas Lindhé | 2016-07-25 | 1 | -1/+1 |
| | | |||||
* | | Fixes midi functionality | Jack Humbert | 2016-07-24 | 2 | -13/+13 |
| | | |||||
* | | Merge pull request #552 from robertdale/music-play-fix | Jack Humbert | 2016-07-24 | 1 | -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 Dale | 2016-07-24 | 1 | -1/+6 |
| |/ | | | | | | | button to play a tone | ||||
* | | Merge pull request #550 from Darthabel/fix_bepo | Jack Humbert | 2016-07-24 | 1 | -2/+2 |
|\ \ | | | | | | | Fix some errors in bepo mapping | ||||
| * | | Fix some errors in bepo mapping | Vivien Alger | 2016-07-24 | 1 | -2/+2 |
| |/ | |||||
* | | tap-dance: Code cleanup | Gergely Nagy | 2016-07-22 | 1 | -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 callbacks | Gergely Nagy | 2016-07-22 | 2 | -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 keys | Gergely Nagy | 2016-07-22 | 2 | -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/upstream | Jack Humbert | 2016-07-21 | 8 | -13/+20 |
|\ | | | | | keymap_extras changes | ||||
| * | keymap_dvorak.h: add missing shifted keys, fix whitespace | Jonathan A. Kollasch | 2016-07-14 | 1 | -4/+11 |
| | | |||||
| * | extra_keymaps: use RALT() instead of 0x1400 for AltGr | Jonathan A. Kollasch | 2016-07-14 | 7 | -7/+7 |
| | | |||||
| * | keymap_extras: add newline at end of files | Jonathan A. Kollasch | 2016-07-14 | 2 | -2/+2 |
| | | |||||
* | | add a couple of comments | Pavlos Vinieratos | 2016-07-19 | 1 | -0/+2 |
| | | |||||
* | | on_each_tap_fn is called on tap down and tap up | Pavlos Vinieratos | 2016-07-19 | 1 | -1/+1 |
| | | |||||
* | | in the default case, it should be called if there is actually a tap | Pavlos Vinieratos | 2016-07-18 | 1 | -2/+2 |
| | | | | | | | | | | dance happening, and in the normal case, it should be called when the tap down is happening. | ||||
* | | change naming, and remove extraneous definition | Pavlos Vinieratos | 2016-07-17 | 2 | -36/+23 |
| | | |||||
* | | add an `anyway` and a `reset` callback | Pavlos Vinieratos | 2016-07-16 | 2 | -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 NULL | Pavlos Vinieratos | 2016-07-16 | 1 | -1/+3 |
|/ | |||||
* | extract reset keyboard into a function | Pavlos Vinieratos | 2016-07-13 | 2 | -10/+16 |
| | | | | that makes it easy to call reset_keyboard() from a function in a keymap | ||||
* | Merge pull request #477 from Smilliam/master | Jack Humbert | 2016-07-11 | 1 | -0/+12 |
|\ | | | | | Canceling Space Cadet state with opposite shift key | ||||
| * | Made rollover behavior for space cadet optional | Smilliam | 2016-07-10 | 1 | -8/+12 |
| | | |||||
| * | fixed indentation. | Smilliam | 2016-07-04 | 1 | -8/+8 |
| | | |||||
| * | Allow Space Cadet state to be canceled by alternate Shift key | Smilliam | 2016-07-04 | 1 | -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 block | TerryMathews | 2016-07-08 | 1 | -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 functions | TerryMathews | 2016-07-07 | 2 | -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 keys | Fred Sundvik | 2016-07-07 | 1 | -1/+1 |
| | | |||||
* | | fixes quantum template (actually) | Jack Humbert | 2016-07-07 | 1 | -1/+1 |
| | | |||||
* | | updates rgblight implementation, makes non-timer stuff compatible with audio | Jack Humbert | 2016-07-07 | 3 | -14/+41 |
| | | |||||
* | | Merge pull request #490 from fredizzimo/integrate_visualizer | Jack Humbert | 2016-07-07 | 4 | -31/+25 |
|\ \ | | | | | | | Integrate visualizer for ChibiOS and Infinity Ergodox | ||||
| * | | Move the visualizer_user file to keymap folder | Fred Sundvik | 2016-07-07 | 1 | -3/+8 |
| | | | | | | | | | | | | Also rename it to visualizer.c | ||||
| * | | Delete lcd_backlight_hal.c | Fred Sundvik | 2016-07-07 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | The functionality can now be found in the infinity_erogodox.c file instead. | ||||
| * | | Fix the SERIAL_LINK_ENABLE macro in Visualizer | Fred Sundvik | 2016-07-07 | 1 | -5/+5 |
| | | | | | | | | | | | | Rename from USE_SERIAL_LINK -> SERIAL_LINK_ENABLE | ||||
| * | | Fix visualizer crash at startup | Fred Sundvik | 2016-07-07 | 2 | -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 Visualizer | Fred Sundvik | 2016-07-07 | 2 | -7/+5 |
| | | | |||||
| * | | Makefile changes and files to compile Visualizer | Fred Sundvik | 2016-07-07 | 3 | -15/+11 |
| | | | |||||
* | | | corrects quantum template | Jack Humbert | 2016-07-07 | 1 | -1/+1 |
| | | | |||||
* | | | default keymap, reset sorted out for now, added serial to makefile | Jack Humbert | 2016-07-06 | 1 | -1/+1 |
|/ / | |||||
* | | Merge commit '73d890a2c9c34b905cd5e74e7146fdd4578dcb96' into add_visualizer | Fred Sundvik | 2016-07-06 | 5 | -25/+342 |
| | | |||||
* | | Delete .gitmodules from visualizer | Fred Sundvik | 2016-07-06 | 2 | -3/+0 |
| | | |||||
* | | Add 'quantum/visualizer/' from commit 'bde869aa7ec8601459bc63b9636081d21108d1be' | Fred Sundvik | 2016-07-06 | 13 | -0/+1403 |
| | | | | | | | | | | | | git-subtree-dir: quantum/visualizer git-subtree-mainline: 19f480992c015aec0a15dca43e740bad8b7834e6 git-subtree-split: bde869aa7ec8601459bc63b9636081d21108d1be |