Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Ryan Ascheman | 2016-10-18 | 6939 | -2419915/+106820 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (1239 commits) Update ez.c removes planck/rev3 temporarily Move hand_swap_config to ez.c, removes error for infinity Update Makefile ergodox: Update algernon's keymap to v1.9 Added VS Code dir to .gitignore Support the Pegasus Hoof controller. [Jack & Erez] Simplifies and documents TO add readme use wait_ms instead of _delay_ms add messenger init keymap Add example keymap Adding whiskey_tango_foxtrot_capslock ergodox keymap Unicode map framework. Allow unicode up to 0xFFFFF using separate mapping table CIE 1931 dim curve Apply the dim curve to the RGB output Update the Cluecard readme files Tune snake and knight intervals for Cluecard Tunable RGB light intervals ... | ||||
| * | Merge pull request #829 from r2d2rogers/master | Jack Humbert | 2016-10-18 | 2 | -21/+22 |
| |\ | | | | | | | Move hand_swap_config to ez.c, removes error for infinity | ||||
| | * | Update ez.c | Rob Rogers | 2016-10-18 | 1 | -1/+0 |
| | | | |||||
| | * | Move hand_swap_config to ez.c, removes error for infinity | Rob Rogers | 2016-10-17 | 2 | -20/+22 |
| | | | |||||
| * | | Merge pull request #824 from dsvensson/pegasushoof | Jack Humbert | 2016-10-18 | 11 | -0/+662 |
| |\ \ | | | | | | | | | Support the Pegasus Hoof controller. | ||||
| | * | | Support the Pegasus Hoof controller. | Daniel Svensson | 2016-10-13 | 11 | -0/+662 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacement controller for Filco Majestouch TKL keyboards. matrix.c ported from: https://github.com/BathroomEpiphanies/epiphanies_tmk_keyboard More details: http://bathroomepiphanies.com/controllers/ | ||||
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Jack Humbert | 2016-10-18 | 9 | -103/+189 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #826 from algernon/ergodox-ez/algernon | Erez Zukerman | 2016-10-17 | 9 | -103/+189 |
| | |\ \ \ | | | |_|/ | | |/| | | ergodox: Update algernon's keymap to v1.9 | ||||
| | | * | | ergodox: Update algernon's keymap to v1.9 | Gergely Nagy | 2016-10-16 | 9 | -103/+189 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overall changes =============== * `F12` was replaced by an `Fx` key, that activate the **Media** layer as a one-shot layer, and also `Alt` as a one-shot modifier. Base layer changes ================== * The `Media Stop` key is now a tap-dance key, and resets the device for programming on the fourth tap. Miscellaneous ============= * `π` can now be entered with UCIS. * `🐁` can now be entered with UCIS. Tools ===== * The `tools/layer-notify` tool was removed, it was an example, which I don't use. `tools/hid-commands` -------------------- * Now looks at the `DISABLE_APPSEL_START` environment value, and does not display an AppSel notification if it is non-empty. * Will attempt to re-program the keyboard when receiving a `reflash` command. * No longer tries to select Emacs 24 on `APPSEL_EMACS`, rather, it goes for any Emacs. * The `APPSEL_MUSIC` command now includes Kodi in the list too, as the last choice. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
| * | / | removes planck/rev3 temporarily | Jack Humbert | 2016-10-18 | 1 | -3/+0 |
| |/ / | |||||
| * | | Update Makefile | Jack Humbert | 2016-10-16 | 1 | -72/+1 |
| | | | |||||
| * | | Merge pull request #815 from priyadi/unicode_map | Jack Humbert | 2016-10-16 | 9 | -0/+495 |
| |\ \ | | | | | | | | | Allow unicode up to 0xFFFFF using separate mapping table | ||||
| | * | | Add example keymap | Priyadi Iman Nurcahyo | 2016-10-10 | 3 | -0/+444 |
| | | | | |||||
| | * | | Unicode map framework. Allow unicode up to 0xFFFFF using separate | Priyadi Iman Nurcahyo | 2016-10-10 | 6 | -0/+51 |
| | | | | | | | | | | | | | | | | mapping table | ||||
| * | | | Merge pull request #825 from replicaJunction/pr-vscode | Jack Humbert | 2016-10-16 | 1 | -0/+1 |
| |\ \ \ | | |_|/ | |/| | | Added VS Code dir to .gitignore | ||||
| | * | | Added VS Code dir to .gitignore | Joshua T | 2016-10-15 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge pull request #818 from pvinis/pvinis-keymap | Erez Zukerman | 2016-10-13 | 4 | -0/+511 |
| |\ \ | | | | | | | | | pvinis keymap | ||||
| | * | | add readme | Pavlos Vinieratos | 2016-10-11 | 2 | -0/+72 |
| | | | | |||||
| | * | | use wait_ms instead of _delay_ms | Pavlos Vinieratos | 2016-10-11 | 1 | -7/+7 |
| | | | | |||||
| | * | | add messenger | Pavlos Vinieratos | 2016-10-11 | 1 | -2/+3 |
| | | | | |||||
| | * | | init keymap | Pavlos Vinieratos | 2016-10-11 | 2 | -0/+438 |
| | | | | |||||
| * | | | Merge pull request #822 from jackhumbert/hotfix/simplify_to | Erez Zukerman | 2016-10-13 | 3 | -7/+12 |
| |\ \ \ | | |/ / | |/| | | [Jack & Erez] Simplifies and documents TO | ||||
| | * | | [Jack & Erez] Simplifies and documents TO | Jack & Erez | 2016-10-12 | 3 | -7/+12 |
| |/ / | |||||
| * | | Merge pull request #803 from coderkun/coderkun_neo2 | Erez Zukerman | 2016-10-10 | 1 | -2/+27 |
| |\ \ | | | | | | | | | Merge Unicode fixes for keymap “coderkun_neo2” | ||||
| | * | | Overwrite method hex_to_unicode() for make it compatible with Neo | coderkun | 2016-10-03 | 1 | -0/+25 |
| | | | | |||||
| | * | | Merge branch 'master' into coderkun_neo2 | coderkun | 2016-10-03 | 1 | -0/+1 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into coderkun_neo2 | coderkun | 2016-10-02 | 346 | -12401/+20510 |
| | |\ \ \ | |||||
| | * | | | | Add double arrow Unicode characters to FMU layer | coderkun | 2016-10-02 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #809 from nathanejohnson/osx_whiskey_tango_foxtrot_capslock | Erez Zukerman | 2016-10-10 | 3 | -0/+269 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Adding whiskey_tango_foxtrot_capslock ergodox keymap | ||||
| | * | | | | | Adding whiskey_tango_foxtrot_capslock ergodox keymap | Nathan Johnson | 2016-10-09 | 3 | -0/+269 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge pull request #808 from npoirey/master | Jack Humbert | 2016-10-10 | 2 | -0/+4 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Altgr quick combination and updated readme | ||||
| | * | | | | | Updated Readme to help windows users use docker for build | npoirey | 2016-10-07 | 1 | -0/+3 |
| | | | | | | | |||||
| | * | | | | | Add Altgr combination for non US layouts | npoirey | 2016-10-07 | 1 | -0/+1 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #811 from Vifon/planck_keymap_vifon | Jack Humbert | 2016-10-10 | 3 | -0/+303 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | New Planck keymap: vifon | ||||
| | * | | | | | New Planck keymap: vifon | Wojciech Siewierski | 2016-10-09 | 3 | -0/+303 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #810 from Vifon/dynamic_macros | Jack Humbert | 2016-10-10 | 2 | -4/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Reduce the default dynamic macro buffer | ||||
| | * | | | | | Reduce the default dynamic macro buffer | Wojciech Siewierski | 2016-10-09 | 2 | -4/+9 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | There have been reports of it leaving not enough free memory preventing the keyboard from working properly. | ||||
| * | | | | | Merge pull request #814 from fredizzimo/rgb_tuning | Jack Humbert | 2016-10-10 | 1 | -22/+33 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Improve the RGB led effects | ||||
| | * | | | | | CIE 1931 dim curve | Fred Sundvik | 2016-10-09 | 1 | -17/+30 |
| | | | | | | | |||||
| | * | | | | | Apply the dim curve to the RGB output | Fred Sundvik | 2016-10-09 | 1 | -5/+3 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | Just like it's supposed to be used. It now looks much better. | ||||
| * | | | | | Merge pull request #813 from fredizzimo/add_cluecard_rgb_effects | Jack Humbert | 2016-10-10 | 7 | -0/+84 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Add a Cluecard keymap for testing the RGB effects | ||||
| | * | | | | Update the Cluecard readme files | Fred Sundvik | 2016-10-09 | 2 | -1/+9 |
| | | | | | | |||||
| | * | | | | Tune snake and knight intervals for Cluecard | Fred Sundvik | 2016-10-09 | 1 | -0/+3 |
| | | | | | | |||||
| | * | | | | Tunable RGB light intervals | Fred Sundvik | 2016-10-09 | 2 | -0/+12 |
| | | | | | | |||||
| | * | | | | Tune the snake and knight effect parameters for Cluecard | Fred Sundvik | 2016-10-09 | 1 | -0/+3 |
| | | | | | | |||||
| | * | | | | Add keymap with audio disabled but RGB effects enabled | Fred Sundvik | 2016-10-09 | 4 | -0/+58 |
| |/ / / / | |||||
| * | | | | Merge pull request #807 from hot-leaf-juice/master | Jack Humbert | 2016-10-06 | 2 | -7/+7 |
| |\ \ \ \ | | | | | | | | | | | | | minor update to callum planck keymap | ||||
| | * | | | | updated readme | Callum Oakley | 2016-10-06 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | added lock screen button and fixed error in diagram | Callum Oakley | 2016-10-06 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Merge pull request #805 from SethSenpai/gamenum | Jack Humbert | 2016-10-06 | 7 | -0/+443 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Gamenum |