summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | [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
* | | | | | | | | | | Merge pull request #300 from Twey/tweymap-momentaryErez Zukerman2016-05-021-58/+50
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | Swap steno/media layers to allow using media keys in the Plover layer…
| * | | | | | | | | | Swap steno/media layers to allow using media keys in the Plover layer; ↵James ‘Twey’ Kay2016-05-021-58/+50
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | display all active layers, not just the top; use only momentary modifiers
* | | | | | | | | | Merge pull request #298 from adiabatic/ergodox-zweihander-osxErez Zukerman2016-05-023-0/+1381
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ergodox-zweihander-osx: initial commit
| * | | | | | | | | zweihander: move dim/brighten to 1/2, add ⌘QNathan Sharfi2016-05-012-11/+11
| | | | | | | | | |
| * | | | | | | | | zweihander: Add ⌘`, ⌘⇧`, ⌥⇥, ⌥⇧⇥Nathan Sharfi2016-05-013-11/+16
| | | | | | | | | |
| * | | | | | | | | Ergodox EZ: add zweihander-osx.hexNathan Sharfi2016-04-301-0/+1152
| | | | | | | | | |
| * | | | | | | | | ergodox-zweihander: initial commitNathan Sharfi2016-04-302-0/+224
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #294 from sneako/masterErez Zukerman2016-05-023-0/+1345
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add my Ergodox EZ config
| * | | | | | | | | Adding .hex filesneako2016-04-281-0/+1152
| | | | | | | | | |
| * | | | | | | | | Add my Ergodox EZ configsneako2016-04-282-0/+193
| | | | | | | | | |
* | | | | | | | | | Merge pull request #258 from romanzolotarev/masterErez Zukerman2016-05-028-0/+2411
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | Add Roman's single layer layout based on Norman
| * | | | | | | | | Add Roman's layout with QWERTYRoman Zolotarev2016-04-264-0/+1246
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareRoman Zolotarev2016-04-26110-9261/+18629
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add Roman's single layer layout based on NormanRoman Zolotarev2016-04-164-0/+1165
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #292 from abperiasamy/ergo-abErez Zukerman2016-04-305-0/+1692
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | Beginner's keymap for Ergodox-EZ
| * | | | | | | | | | Beginner's keymap for Ergodox-EZAnand Babu (AB) Periasamy2016-04-305-0/+1692
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #295 from techtomas/techtomasErez Zukerman2016-04-303-0/+1433
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | |