aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #829 from r2d2rogers/masterJack Humbert2016-10-182-21/+22
|\ | | | | Move hand_swap_config to ez.c, removes error for infinity
| * Update ez.cRob Rogers2016-10-181-1/+0
| |
| * Move hand_swap_config to ez.c, removes error for infinityRob Rogers2016-10-172-20/+22
| |
* | Merge pull request #824 from dsvensson/pegasushoofJack Humbert2016-10-1811-0/+662
|\ \ | | | | | | Support the Pegasus Hoof controller.
| * | Support the Pegasus Hoof controller.Daniel Svensson2016-10-1311-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_firmwareJack Humbert2016-10-189-103/+189
|\ \ \
| * \ \ Merge pull request #826 from algernon/ergodox-ez/algernonErez Zukerman2016-10-179-103/+189
| |\ \ \ | | |_|/ | |/| | ergodox: Update algernon's keymap to v1.9
| | * | ergodox: Update algernon's keymap to v1.9Gergely Nagy2016-10-169-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 temporarilyJack Humbert2016-10-181-3/+0
|/ /
* | Update MakefileJack Humbert2016-10-161-72/+1
| |
* | Merge pull request #815 from priyadi/unicode_mapJack Humbert2016-10-169-0/+495
|\ \ | | | | | | Allow unicode up to 0xFFFFF using separate mapping table
| * | Add example keymapPriyadi Iman Nurcahyo2016-10-103-0/+444
| | |
| * | Unicode map framework. Allow unicode up to 0xFFFFF using separatePriyadi Iman Nurcahyo2016-10-106-0/+51
| | | | | | | | | | | | mapping table
* | | Merge pull request #825 from replicaJunction/pr-vscodeJack Humbert2016-10-161-0/+1
|\ \ \ | |_|/ |/| | Added VS Code dir to .gitignore
| * | Added VS Code dir to .gitignoreJoshua T2016-10-151-0/+1
|/ /
* | Merge pull request #818 from pvinis/pvinis-keymapErez Zukerman2016-10-134-0/+511
|\ \ | | | | | | pvinis keymap
| * | add readmePavlos Vinieratos2016-10-112-0/+72
| | |
| * | use wait_ms instead of _delay_msPavlos Vinieratos2016-10-111-7/+7
| | |
| * | add messengerPavlos Vinieratos2016-10-111-2/+3
| | |
| * | init keymapPavlos Vinieratos2016-10-112-0/+438
| | |
* | | Merge pull request #822 from jackhumbert/hotfix/simplify_toErez Zukerman2016-10-133-7/+12
|\ \ \ | |/ / |/| | [Jack & Erez] Simplifies and documents TO
| * | [Jack & Erez] Simplifies and documents TOJack & Erez2016-10-123-7/+12
|/ /
* | Merge pull request #803 from coderkun/coderkun_neo2Erez Zukerman2016-10-101-2/+27
|\ \ | | | | | | Merge Unicode fixes for keymap “coderkun_neo2”
| * | Overwrite method hex_to_unicode() for make it compatible with Neocoderkun2016-10-031-0/+25
| | |
| * | Merge branch 'master' into coderkun_neo2coderkun2016-10-031-0/+1
| |\ \
| * \ \ Merge branch 'master' into coderkun_neo2coderkun2016-10-02346-12401/+20510
| |\ \ \
| * | | | Add double arrow Unicode characters to FMU layercoderkun2016-10-021-2/+2
| | | | |
* | | | | Merge pull request #809 from nathanejohnson/osx_whiskey_tango_foxtrot_capslockErez Zukerman2016-10-103-0/+269
|\ \ \ \ \ | | | | | | | | | | | | Adding whiskey_tango_foxtrot_capslock ergodox keymap
| * | | | | Adding whiskey_tango_foxtrot_capslock ergodox keymapNathan Johnson2016-10-093-0/+269
| | |_|_|/ | |/| | |
* | | | | Merge pull request #808 from npoirey/masterJack Humbert2016-10-102-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Altgr quick combination and updated readme
| * | | | | Updated Readme to help windows users use docker for buildnpoirey2016-10-071-0/+3
| | | | | |
| * | | | | Add Altgr combination for non US layoutsnpoirey2016-10-071-0/+1
| |/ / / /
* | | | | Merge pull request #811 from Vifon/planck_keymap_vifonJack Humbert2016-10-103-0/+303
|\ \ \ \ \ | | | | | | | | | | | | New Planck keymap: vifon
| * | | | | New Planck keymap: vifonWojciech Siewierski2016-10-093-0/+303
| |/ / / /
* | | | | Merge pull request #810 from Vifon/dynamic_macrosJack Humbert2016-10-102-4/+9
|\ \ \ \ \ | | | | | | | | | | | | Reduce the default dynamic macro buffer
| * | | | | Reduce the default dynamic macro bufferWojciech Siewierski2016-10-092-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_tuningJack Humbert2016-10-101-22/+33
|\ \ \ \ \ | | | | | | | | | | | | Improve the RGB led effects
| * | | | | CIE 1931 dim curveFred Sundvik2016-10-091-17/+30
| | | | | |
| * | | | | Apply the dim curve to the RGB outputFred Sundvik2016-10-091-5/+3
| |/ / / / | | | | | | | | | | | | | | | Just like it's supposed to be used. It now looks much better.
* | | | | Merge pull request #813 from fredizzimo/add_cluecard_rgb_effectsJack Humbert2016-10-107-0/+84
|\ \ \ \ \ | |/ / / / |/| | | | Add a Cluecard keymap for testing the RGB effects
| * | | | Update the Cluecard readme filesFred Sundvik2016-10-092-1/+9
| | | | |
| * | | | Tune snake and knight intervals for CluecardFred Sundvik2016-10-091-0/+3
| | | | |
| * | | | Tunable RGB light intervalsFred Sundvik2016-10-092-0/+12
| | | | |
| * | | | Tune the snake and knight effect parameters for CluecardFred Sundvik2016-10-091-0/+3
| | | | |
| * | | | Add keymap with audio disabled but RGB effects enabledFred Sundvik2016-10-094-0/+58
|/ / / /
* | | | Merge pull request #807 from hot-leaf-juice/masterJack Humbert2016-10-062-7/+7
|\ \ \ \ | | | | | | | | | | minor update to callum planck keymap
| * | | | updated readmeCallum Oakley2016-10-061-3/+3
| | | | |
| * | | | added lock screen button and fixed error in diagramCallum Oakley2016-10-061-4/+4
| | | | |
* | | | | Merge pull request #805 from SethSenpai/gamenumJack Humbert2016-10-067-0/+443
|\ \ \ \ \ | |/ / / / |/| | | | Gamenum
| * | | | updated the wrong makefile like a dummySethSenpai2016-10-041-73/+3
| | | | |