summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-057-1548/+1505
|\
| * 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 branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-0417-892/+1447
|\| | |
| * | | 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 branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-031-58/+50
|\| | |
| * | | 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 branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-05-0214-0/+5137
|\| | |
| * | | 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
| | | | | |
* | | | | | new version of the experimental layout. changed media keys in MDIA layerStephan Bösebeck2016-05-024-8/+1500
|/ / / / /
* | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Add my layout to the list
| * | | | | Added readmeThomas Anderson2016-04-291-0/+36
| | | | | |
| * | | | | Finalized my personal layoutThomas Anderson2016-04-292-0/+1397
| | | | | |
* | | | | | moves backlight functionality to keyboard files and updates template makefileJack Humbert2016-04-2915-215/+287
| | | | | | | | | | | | | | | | | | | | | | | | previously there were two backlight.c files (bad)
* | | | | | fixes plover start soundJack Humbert2016-04-291-3/+1
| | | | | |
* | | | | | Adds brackets to inner vertical keys in experimental layoutErez Zukerman2016-04-293-12/+21
| | | | | |
* | | | | | removes extra voices, updates .hex filesJack Humbert2016-04-297-6393/+6370
| | | | | |
* | | | | | stops forcing debug_actionJack Humbert2016-04-284-16/+16
| | | | | |
* | | | | | adds condition to one last audio ref in planck defaultJack Humbert2016-04-281-1/+3
| | | | | |
* | | | | | Bring the clueboard firmware size downskullY2016-04-283-14/+16
| |_|_|/ / |/| | | |
* | | | | Addresses #290Erez Zukerman2016-04-291-1/+1
|/ / / /
* | | | Updating my entry in the READMEskullY2016-04-271-1/+1
| | | |
* | | | Updated personal layouts (#291)IBNobody2016-04-275-189/+658
| | | |
* | | | gh60 Rev C with LED controls (#289)a0-c2016-04-268-0/+592
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gh60_rev_c * gh60 Rev C Support for WASD, Poker, Esc, FN LED clusters * clean up spacing * Update README.md * Added image and pinout * PCB image
* | | | actually resolves conflicts in rgblight.cJack Humbert2016-04-261-5/+0
| | | |
* | | | resolves conflicts in rgblight.cJack Humbert2016-04-2625-6/+1891
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # quantum/rgblight.c
| * | | | updates README, fixes typo in new_project.shJack Humbert2016-04-262-3/+5
| | | | |
| * | | | Fixup rgb underlight for clueboard1skullY2016-04-133-10/+9
| | | | |
| * | | | Fixup RGBLIGHT support for clueboard2skullY2016-04-102-9/+8
| | | | |
| * | | | Add a help message to new_project.shskullY2016-04-071-0/+5
| | | | |
| * | | | Fixup the cluepad codeskullY2016-04-054-13/+13
| | | | |