summaryrefslogtreecommitdiffstats
path: root/keyboard/ergodox_ez
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #73 from dragon788/dragon_modErez Zukerman2016-01-182-0/+457
|\ | | | | Requesting some comments and review on my changes
| * Having media layer defined causes toggles to 'stick' rather than be ↵dragon7882016-01-161-1/+1
| | | | | | | | momentary in my experience
| * Resetting keymap_default.c to origin/master not just my fork's masterdragon7882016-01-161-23/+23
| |
| * Moving my layout to its own file, made plover layout file, restoring default ↵dragon7882016-01-163-89/+501
| | | | | | | | keymap to its default status
| * Added calculator shortcut button to numpad/symbol layerdragon7882016-01-021-2/+2
| |
| * Fixed Plover layer label and updated keymapdragon7882016-01-021-4/+4
| |
| * Added proper link back to Plover layout sourcedragon7882016-01-021-1/+1
| |
| * Added plover layerdragon7882016-01-021-4/+49
| |
| * Fixed button conflicts on mouse/media layerdragon7882015-12-301-18/+18
| |
| * Moving everything around, tap delays driving me nutsdragon7882015-12-301-27/+27
| |
| * Merge branch 'master' of github.com:jackhumbert/qmk_firmwaredragon7882015-12-2818-4/+5971
| |\ | | | | | | | | | | | | Conflicts: keyboard/ergodox_ez/keymaps/keymap_default.c
| * | Updated keymap ascii art and made thumb cluster more standard ↵dragon7882015-12-231-20/+20
| | | | | | | | | | | | ErgoDox/Kinesis-like
| * | add left click and vim keysJosh McCall2015-12-161-2/+2
| | |
* | | Merge branch 'master' into j3rn-keymapJonathan Arnett2016-01-1624-2760/+8992
|\ \ \
| * \ \ Merge pull request #89 from coderkun/masterErez Zukerman2016-01-151-0/+137
| |\ \ \ | | | | | | | | | | add coderkun’s ErgodoxEZ keymap (Neo2)
| | * | | merge upstreamcoderkun2016-01-157-2460/+2730
| | | | |
| | * | | add basic layer 2coderkun2016-01-152-16/+16
| | | | |
| | * | | add basic layer 1coderkun2016-01-121-2/+45
| | | | |
| | * | | add neo2 keymap for ergodoxEZcoderkun2016-01-121-0/+94
| | | | |
| * | | | updated cheat sheet, hex fileStephan Bösebeck2016-01-152-1494/+1508
| | | | |
| * | | | using keymap_german_osx.h more, adding macros for CTRL/CMD-V combinationStephan Bösebeck2016-01-151-25/+64
| | | | |
| * | | | updating layout pngStephan Bösebeck2016-01-131-0/+0
| | | | |
| * | | | adding fixed hex fileStephan Bösebeck2016-01-131-9/+9
| | | | |
| * | | | typo fixStephan Bösebeck2016-01-131-1/+1
| | | | |
| * | | | added adnw layoutStephan Bösebeck2016-01-131-0/+262
| | | | |
| * | | | typo and copy past fixStephan Bösebeck2016-01-131-262/+0
| | | | |
| * | | | minor fixStephan Bösebeck2016-01-131-5/+2
| | | | |
| * | | | bugfixStephan Bösebeck2016-01-131-1/+1
| | | | |
| * | | | updated ANDW layoutStephan Bösebeck2016-01-132-14/+17
| | | | |
| * | | | Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-01-132-1230/+1236
| |\ \ \ \
| | * | | | added mouse wheel support, CMD-V/CMD-C instead of CTRLStephan Bösebeck2016-01-101-3/+3
| | | | | |
| | * | | | removed left space key in favor of a backspaceStephan Bösebeck2016-01-092-1219/+1225
| | | | | |
| | * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-092-1/+186
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-067-0/+3684
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-047-13/+2270
| | |\ \ \ \ \ \
| | * | | | | | | minor fixes, added backtick to left thumbblockStephan Bösebeck2015-12-252-1225/+1225
| | | | | | | | |
| * | | | | | | | andw layout addedStephan Bösebeck2016-01-131-0/+259
| | | | | | | | |
| * | | | | | | | Disables debug console by default for improved performanceErez Zukerman2016-01-122-1221/+1226
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge pull request #80 from agriffis/kinesis-cloneErez Zukerman2016-01-102-0/+203
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add ergodox_ez keymap to match Kinesis Contoured.
| | * | | | | | | Rename to keymap_kines-ish.c and add READMEAron Griffis2016-01-102-0/+19
| | | | | | | | |
| | * | | | | | | Add ergodox_ez keymap to match Kinesis Contoured.Aron Griffis2016-01-091-0/+184
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This keymap attempts to match the Kinesis Contoured (aka Advantage) default layout as closely as possible. See http://www.kinesis-ergo.com/wp-content/uploads/2013/06/advantage_layout_win.pdf Apart from the obvious mappings, this keymap also: * removes the dual-purpose momentary layer/normal keys: Z, /, and Grv; because the author--coming from a Kinesis keyboard--finds the delays and accidental modifiers to be more disconcerting than helpful. * puts Esc in the bottom left since there's no place for it in the top left to match the Kinesis. * changes the bottom-right key into an L2 toggle since there's otherwise no way to get to L2. * adds PrScr, ScrLk and Pause to the L1 keymap, down the left side, since they're present on the Kinesis but not available in the default ergodox_ez keymap.
| * / | | | | | Refer to SYMB and MDIA in default ergodox_ez keymap.Aron Griffis2016-01-091-3/+3
| |/ / / / / /
| * | | | | | Merge pull request #77 from chwilk/masterJack Humbert2016-01-081-0/+184
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Keymap to approximate Kinesis Advantage line of keyboards
| | * | | | | | Moving around modifiers to match KA betterchwilk2016-01-081-11/+11
| | | | | | | |
| | * | | | | | Added keymap variant to approximate Kin Advchwilk2015-12-201-0/+184
| | | | | | | |
| * | | | | | | Fix homebrew referencesSeth Herr2016-01-061-1/+2
| | |_|_|/ / / | |/| | | | | | | | | | | | Replaces #64
| * | | | | | Merge pull request #60 from rothgar/dvorakJack Humbert2016-01-063-0/+368
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | added dvorak keymap and layout picture
| | * | | | | | added jgarr keymap for custom dvorak layout :yay:Justin Garrison2016-01-041-0/+184
| | | | | | | |
| | * | | | | | added dvorak keymap and layout pictureJustin Garrison2015-12-302-0/+184
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #70 from sperochon/ergodox_ez_frJack Humbert2016-01-062-0/+1658
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Ergodox_ez french OS X