summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | 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
| | | | | | | | |
* | | | | | | | | adds keycode shortcuts for OSL and OSMJack Humbert2016-05-052-0/+14
| | | | | | | | |
* | | | | | | | | Adds oneshot layer and oneshot tap toggling (#308)Thiago Alves2016-05-055-14/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is mostly a cherry-pick from `ahtn` at https://github.com/tmk/tmk_keyboard/pull/255. These are the changes: * Adds ACTION_LAYER_ONESHOT * Adds ONESHOT_TAP_TOGGLE * Mentions sticky keys in the docs on oneshot.
* | | | | | | | | Referencing the hex file (#309)Tom Duckering2016-05-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Seems that this is a typo. When I used the hex file it worked so presuming that means it's right ;)
* | | | | | | | | updates atreus's column mappingJack Humbert2016-05-051-1/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge pull request #305 from nrrkeene/masterErez Zukerman2016-05-047-1548/+1505
|\| | | | | | | | |_|_|_|_|/ / |/| | | | | | Custom handling for shift keys, improved media layer
| * | | | | | The Ordinary Layout is arranged as close as possible to a traditional ↵Nicholas Keene2016-05-032-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboard, but with extra special features
| * | | | | | The Ordinary Layout works the way you expect it to, with extra powerful featuresNicholas Keene2016-05-031-979/+1008
| | | | | | |
| * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareNicholas Keene2016-05-02255-7159/+39956
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | The Ordinary Layout is the layout you are looking for. Come and see v3.14.Nicholas Keene2016-05-017-1541/+1469
| | | | | | |
* | | | | | | Merge pull request #304 from adiabatic/ergodox-zweihander-osxErez Zukerman2016-05-031-0/+3
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | zweihander: comment out action_get_macro()
| * | | | | | zweihander: comment out action_get_macro()Nathan Sharfi2016-05-031-0/+3
| | | | | | |
* | | | | | | Clarified audio.c (#302)IBNobody2016-05-0316-892/+1444
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | |