summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* adds a sequencer to the music mode (#330)Jack Humbert2016-05-155-81/+122
| | | | | | | | | | | | | | | | | | | | | | | | * implements leader key for planck experimental * allows override of leader timeout * adds ability to use the leader key in seq * fixes leader keycode * adds chording prototype * fixes keycode detection * moves music mode to quantum.c * disables chording by default * adds music sequencer functionality * implements audio/music functions in quantum.c * Merge branch 'master' into process-record
* Leader key implementation (#326)Erez Zukerman2016-05-1520-64/+290
| | | | | | | | | | | | | | | | | | | | * implements leader key for planck experimental * allows override of leader timeout * adds ability to use the leader key in seq * fixes leader keycode * adds chording prototype * fixes keycode detection * moves music mode to quantum.c * disables chording by default * updates process_action functions to return bool
* Adds explanatory note re history of TMK and QMKErez Zukerman2016-05-141-1/+1
|
* adds Bilger321's planck keymapJacob Bilger2016-05-144-0/+1208
|
* Merge pull request #320 from Townk/townkmapErez Zukerman2016-05-138-0/+1624
|\ | | | | Townkmap
| * Remove unused variable on the keymap.Thiago Alves2016-05-111-2/+0
| |
| * Add an initial Readme to the keymap.Thiago Alves2016-05-114-0/+77
| |
| * Tweak some key positions and changed macro location.Thiago Alves2016-05-102-1242/+1229
| | | | | | | | | | | | | | | | | | After using the layout a while I learn that the - and = positions should be swapped since I keep typing = when I intend to type -. I also, removed the only macro from the top left on the right hand to put the power button there and since I never use the arrow keys on the separated groups of keys, I added 4 macros there to get a feel for it.
| * Add custom config.h and revert the changes on the global one.Thiago Alves2016-05-103-2/+94
| | | | | | | | | | | | Some options I defined on the config.h file don't make much sense to other keymaps so I revert the global config.h and add those options on the keymap custom one.
| * Update the .hex file on the keymap folder.Thiago Alves2016-05-091-1166/+1179
| |
| * Revert the Makefile to the original one.Thiago Alves2016-05-092-1/+3
| | | | | | | | Make sure I customize things as much as possible inside the keymap itself.
| * Change the access to the extra layer to be simetric.Thiago Alves2016-05-092-27/+27
| | | | | | | | | | | | Instead of having a key on the left side for one layer and a key on the right side for the other layer, I put two dedicated layers on each side to get to the proper layers.
| * Add my personal keymap for OSX use.Thiago Alves2016-05-094-1/+1456
| | | | | | | | | | | | | | | | | | | | This keymap was created to have a feel keys on a different place and to have as fewer layers as possible. Currently I have only 2 extra layers and only one of them is really required to have all possible keys available. Check out the README.md file for more information.
* | Merge pull request #317 from Twey/masterErez Zukerman2016-05-132-25/+27
|\ \ | | | | | | Updates to `keymaps/twey` to the media layer and for Plover 3.0
| * | keymaps/twey: fix documentationJames ‘Twey’ Kay2016-05-101-2/+2
| | |
| * | keymaps/twey: Plover 3.0 has a standard TOGGLE keybinding; use that insteadJames ‘Twey’ Kay2016-05-102-11/+13
| | |
| * | keymaps/twey: Add more history keys to media layer; stop using toggleable ↵James ‘Twey’ Kay2016-05-101-12/+12
| | | | | | | | | | | | media layer
* | | Merge pull request #307 from sboesebeck/masterErez Zukerman2016-05-135-11/+1503
|\ \ \ | | | | | | | | minor change to default layouts
| * \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-1151-2722/+4081
| |\ \ \
| * | | | remove typoStephan Bösebeck2016-05-051-1/+1
| | | | |
| * | | | making default osx more ELG conformStephan Bösebeck2016-05-051-4/+4
| | | | |
| * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-057-1548/+1505
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-0417-892/+1447
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-031-58/+50
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-0214-0/+5137
| |\ \ \ \ \ \ \
| * | | | | | | | new version of the experimental layout. changed media keys in MDIA layerStephan Bösebeck2016-05-024-8/+1500
| | | | | | | | |
* | | | | | | | | [planck] adds button for toggling output in plover app (#323)cwhits2016-05-121-3/+8
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [planck] toggle plover output in app when toggling plover layer on keyboard * [planck] moved plover toggle to separate key * [planck] renamed toggle button
* | | | | | | | [Erez & Jack] Documents audio outputErez Zukerman2016-05-101-0/+49
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Update build guide with instructions to copy the whole keymap folder (#315)Peter2016-05-091-2/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | Backlight Breathing for Planck and AtomicJack Humbert2016-05-0921-201/+1153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updated personal layouts * tweaked personal * Nightly - Audio Cleanup Refactored the LUTs. Abstracted some of the registers out of audio to use more functional names. Split audio into audio and audio_pwm. WIP * nightly - collapsed code * Added check for note playing to LEDs * Usability tweaks * TWEAE * nightly added extra kcs to keymap common * turned on Plank audio * Added backlight breathing to atomic * reverted accidental merge * adds backlight pulse to planck
* | | | | | quantum accommodates more than 16 columnsJack Humbert2016-05-091-5/+12
| | | | | |
* | | | | | Adds next tab/prev tab back to symb layer and updates legendErez Zukerman2016-05-082-4/+4
| | | | | |
* | | | | | A little more tweakingErez Zukerman2016-05-082-12/+12
| | | | | |
* | | | | | Tweaks layers 1 & 2 in my experimental layoutErez Zukerman2016-05-083-29/+37
| | | | | |
* | | | | | Merge pull request #311 from adiabatic/ergodox-zweihander-osxErez Zukerman2016-05-063-10/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add KC_LABK and KC_RABK (< and >)
| * | | | | | Add KC_L[LR]ABK to top-level READMENathan Sharfi2016-05-061-0/+2
| | | | | | |
| * | | | | | Rearrange code layer on ZweihanderNathan Sharfi2016-05-061-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes it more like the iOS keyboard (and therefore easier to remember). Also adds angle brackets for HTML and comparisons.
| * | | | | | Add KC_LABK and KC_RABK (< and >)Nathan Sharfi2016-05-061-0/+6
| | | | | | |
| * | | | | | zweihander: add ⌘X, ⌘C, ⌘V to media thumb keysNathan Sharfi2016-05-061-4/+4
| | | | | | |
* | | | | | | Merge pull request #310 from nrrkeene/masterErez Zukerman2016-05-0611-1317/+1400
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Lock layers by pressing both shift keys
| * | | | | | | The Ordinary Layout is the layout you are looking for. Come and see.Nicholas Keene2016-05-052-1075/+1075
| | | | | | | |
| * | | | | | | The Ordinary Layout is extraordinarily familiar and powerfulNicholas Keene2016-05-0511-1325/+1373
| | | | | | | |
| * | | | | | | The Ordinary Layout is the most natural and powerful layout for the Ergodox ↵Nicholas Keene2016-05-049-1249/+1284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EZ. Come check it out.
* | | | | | | | Uses @eltang's famous macro! Still not perfect though :(Erez Zukerman2016-05-052-1150/+1162
| | | | | | | |
* | | | | | | | [Erez & Jack] Updates docs with one-shot information and config_user.hErez Zukerman2016-05-051-1/+13
| | | | | | | |
* | | | | | | | [Jack & Erez] Defines MOD_HYPR and MOD_MEHErez Zukerman2016-05-051-0/+3
| | | | | | | |
* | | | | | | | [Jack & Erez] Creates a makefile.mk and a config file for the experimental ↵Erez Zukerman2016-05-052-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layout
* | | | | | | | [Jack & Erez] Enables config_user.h per keymapErez Zukerman2016-05-051-0/+16
| | | | | | | |
* | | | | | | | [Jack & Erez] Adds an option for user-specific config.h filesErez Zukerman2016-05-051-0/+9
| | | | | | | |
* | | | | | | | [Jack & Erez] Removes duplicate reference, sorts whitespaceErez Zukerman2016-05-051-2/+3
| | | | | | | |