summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-139-0/+1108
|\
| * Merge pull request #84 from sboesebeck/masterErez Zukerman2016-01-135-1239/+1504
| |\ | | | | | | new alternative layout ADNW_Koy
| * \ Merge pull request #83 from lxol/feature/hhkb-qmkJack Humbert2016-01-139-0/+1108
| |\ \ | | | | | | | | migrate hhkb to QMK firmware
| | * | migrate hhkb to QMK firmwareAlex Olkhovskiy2016-01-139-0/+1108
| | | |
* | | | Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-01-135-13/+272
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| |\ \ \
| * | | | andw layout addedStephan Bösebeck2016-01-131-0/+259
| | |/ / | |/| |
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-125-1224/+1432
|\| | | | |/ / |/| |
| * | 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.
| * | Merge pull request #79 from agriffis/cleanup-defaultErez Zukerman2016-01-101-3/+3
| |\ \ | | |/ | |/| Minor cleanup to refer to SYMB and MDIA in default ergodox_ez keymap rather than hard-coding numbers.
| | * Refer to SYMB and MDIA in default ergodox_ez keymap.Aron Griffis2016-01-091-3/+3
| |/
* | 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 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
| | |
| * | Merge pull request #74 from sethherr/patch-3Jack Humbert2016-01-061-1/+2
| |\ \ | | | | | | | | Fix homebrew references
| | * | Fix homebrew referencesSeth Herr2016-01-061-1/+2
| |/ / | | | | | | Replaces #64
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-068-0/+3761
|\| |
| * | 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-063-0/+1735
| |\ \ \ | | | | | | | | | | Ergodox_ez french OS X
| | * | | ergodox_ez: Add keymap_osx_fr hex fileSébastien Pérochon2016-01-051-0/+1471
| | | | |
| | * | | ergodox_ez: Add French keymap for OSX (keymap_osx_fr) based on ↵Sébastien Pérochon2016-01-051-0/+187
| | | | | | | | | | | | | | | | | | | | keymap_default_osx
| | * | | quantum: Add French keymap for OSX (keymap_french_osx)Sébastien Pérochon2016-01-051-0/+77
| | | | |
| * | | | Merge pull request #71 from andruby/andrew_osxJack Humbert2016-01-062-0/+1658
| |\ \ \ \ | | |/ / / | |/| | | Andrew's OSX ergodox ez keymap
| | * | | Andrew's OSX ergodox ez keymapAndrew Fecheyr2016-01-052-0/+1658
| |/ / /
* | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-049-26/+2283
|\| | |
| * | | Merge pull request #68 from waveform80/daves-commentsJack Humbert2016-01-022-1/+1496
| |\ \ \ | | | | | | | | | | Added comments to LED stuff and included .hex file
| | * | | Added comments to LED stuff and included .hex fileDave Jones2016-01-022-1/+1496
| |/ / /
| * | | Merge pull request #66 from gdiegel/masterJack Humbert2016-01-021-13/+12
| |\ \ \ | | | | | | | | | | Fix for faulty fn layer
| | * | | Fix incorrect number of rows on fn layer. Add additional navigation keysGabriel Diegel2016-01-021-4/+3
| | | | | | | | | | | | | | | | | | | | to fn layer
| | * | | Use planck-style arrow keysGabriel Diegel2015-12-201-4/+4
| | | | |
| | * | | Fix typos and add comments, swap plus with equals, swap pipe withGabriel Diegel2015-12-151-11/+11
| | | | | | | | | | | | | | | | | | | | backslash, move slash, change cursor keys to make the classic shape
| * | | | Merge pull request #67 from waveform80/daves-keymapJack Humbert2016-01-024-11/+217
| |\ \ \ \ | | | | | | | | | | | | Dave's custom keymap
| | * | | | Dave's custom keymapDave Jones2016-01-024-11/+217
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the keys closer to a traditional layout with some redundancy around the middle to compensate for fast non-traditional typists like myself who tend to wander from the home row a fair bit. Navigation keys are provided in layer 2 (accessed by left thumb button), programming symbols and classic numeric keypad in layer 1 (accessed by right thumb button). Permanent layer switching is provided with a smaller thumb button. Ctrl provided in place of caps lock (because no-one needs caps/num lock), space, backspace, enter, shift all in traditional positions with layer 1 providing things like equals, tilde and apostrophe (an attempt to re-use existing muscle memory). LEDs are pimped to the point of being silly (fading in/out on layer switch, rolling on reboot ... because I can). Power and reset keys provided on left thumb pad in layer 2. No meh or hyper as I haven't found a burning need for them yet.
| * | | | Merge pull request #63 from MattLeBeauViewpoint/masterErez Zukerman2015-12-311-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | Small change to filename spelling in README