Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Stephan Bösebeck | 2016-01-04 | 9 | -26/+2283 | |
| | | |\ | |_|_|/ |/| | | | ||||||
* | | | | Merge pull request #68 from waveform80/daves-comments | Jack Humbert | 2016-01-02 | 2 | -1/+1496 | |
|\ \ \ \ | | | | | | | | | | | Added comments to LED stuff and included .hex file | |||||
| * | | | | Added comments to LED stuff and included .hex file | Dave Jones | 2016-01-02 | 2 | -1/+1496 | |
|/ / / / | ||||||
* | | | | Merge pull request #66 from gdiegel/master | Jack Humbert | 2016-01-02 | 1 | -13/+12 | |
|\ \ \ \ | | | | | | | | | | | Fix for faulty fn layer | |||||
| * | | | | Fix incorrect number of rows on fn layer. Add additional navigation keys | Gabriel Diegel | 2016-01-02 | 1 | -4/+3 | |
| | | | | | | | | | | | | | | | | | | | | to fn layer | |||||
| * | | | | Use planck-style arrow keys | Gabriel Diegel | 2015-12-20 | 1 | -4/+4 | |
| | | | | | ||||||
| * | | | | Fix typos and add comments, swap plus with equals, swap pipe with | Gabriel Diegel | 2015-12-15 | 1 | -11/+11 | |
| | | | | | | | | | | | | | | | | | | | | backslash, move slash, change cursor keys to make the classic shape | |||||
* | | | | | Merge pull request #67 from waveform80/daves-keymap | Jack Humbert | 2016-01-02 | 4 | -11/+217 | |
|\ \ \ \ \ | | | | | | | | | | | | | Dave's custom keymap | |||||
| * | | | | | Dave's custom keymap | Dave Jones | 2016-01-02 | 4 | -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/master | Erez Zukerman | 2015-12-31 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Small change to filename spelling in README | |||||
| * | | | | Small change to filename spelling in README | MattLeBeauViewpoint | 2015-12-31 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | | | | | | | | | Edited filename to remove plural case in example so that prefix is correctly parsed in step 6. | |||||
* | | | | Merge pull request #56 from sboesebeck/master | Jack Humbert | 2015-12-23 | 1 | -5/+5 | |
|\ \ \ \ | | | | | | | | | | | fix number pad for german keys | |||||
* | | | | | Updates readme | Erez Zukerman | 2015-12-23 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #55 from sboesebeck/master | Jack Humbert | 2015-12-22 | 3 | -1296/+1296 | |
|\ \ \ \ \ | | | | | | | | | | | | | fixed some typos, learned, DE_-keycodes are for Win, not OSX | |||||
* \ \ \ \ \ | Merge pull request #53 from sboesebeck/master | Jack Humbert | 2015-12-21 | 3 | -15/+15 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | minor updates | |||||
* \ \ \ \ \ \ | Merge pull request #52 from technovangelist/master | Jack Humbert | 2015-12-21 | 1 | -0/+366 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | first attempt at a working workman layout for the ergodoxez | |||||
| * | | | | | | | swapped the space and enter to get the space under where the thumb is. | Technovangelist | 2015-12-21 | 1 | -4/+4 | |
| | | | | | | | | ||||||
| * | | | | | | | first attempt at a working workman layout for the ergodoxez | Technovangelist | 2015-12-21 | 1 | -0/+366 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #47 from pnutster/master | Jack Humbert | 2015-12-19 | 1 | -0/+191 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | OSX Kinesis-like Mapping | |||||
| * | | | | | | | Fixed keymap "graphic" | Piet Nutbey | 2015-12-19 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | corrected folder | Piet Nutbey | 2015-12-19 | 1 | -0/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | OSX Kinesis-like Mapping | Piet Nutbey | 2015-12-19 | 1 | -0/+191 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OS X Kinesis Like key mapping. Only the default layer was changed into a more Kinesis-like mapping. Hopefully useful as a starting point. | |||||
* | | | | | | | | Merge pull request #46 from sboesebeck/master | Jack Humbert | 2015-12-19 | 3 | -0/+1757 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | German layout for osx | |||||
| | | | | | | * | minor fixes, added backtick to left thumbblock | Stephan Bösebeck | 2015-12-25 | 2 | -1225/+1225 | |
| | | | | |_|/ | | | | |/| | | ||||||
| | | | * | | | fix number pad for german keys | Stephan Bösebeck | 2015-12-23 | 1 | -5/+5 | |
| | | |/ / / | ||||||
| | | * / / | fixed some typos, learned, DE_-keycodes are for Win, not OSX | Stephan Bösebeck | 2015-12-22 | 3 | -1296/+1296 | |
| | |/ / / | ||||||
| | * | | | new firmware file containing current changes | Stephan Bösebeck | 2015-12-22 | 1 | -7/+7 | |
| | | | | | ||||||
| | * | | | added png file for layout documentation | Stephan Bösebeck | 2015-12-22 | 1 | -0/+0 | |
| | | | | | ||||||
| | * | | | minor changes, fixes | Stephan Bösebeck | 2015-12-22 | 1 | -8/+8 | |
| |/ / / | ||||||
| * | | | added hex file | Stephan Bösebeck | 2015-12-20 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | typo fix | Stephan Bösebeck | 2015-12-20 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | minor change | Stephan Bösebeck | 2015-12-20 | 1 | -19/+47 | |
| | | | | ||||||
| * | | | added hex file and readme | Stephan Bösebeck | 2015-12-20 | 2 | -0/+1516 | |
| | | | | ||||||
| * | | | first version for german osx layout | Stephan Bösebeck | 2015-12-20 | 1 | -0/+213 | |
|/ / / | ||||||
* | | | Merge pull request #45 from matzebond/master | Jack Humbert | 2015-12-19 | 5 | -0/+429 | |
|\ \ \ | | | | | | | | | German keymap + ErgoDox keymaps | |||||
| * | | | Add neo2 keymap and neo2 ergodox layout | Matthias Schmitt | 2015-12-19 | 2 | -0/+183 | |
| | | | | ||||||
| * | | | Add Ctrl-Shift tap modifier | Matthias Schmitt | 2015-12-19 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Add german keymap and german ergodox layout | Matthias Schmitt | 2015-12-19 | 2 | -0/+245 | |
| | | | | ||||||
* | | | | Further clarifies README | Erez Zukerman | 2015-12-19 | 1 | -3/+5 | |
|/ / / | ||||||
* | / | Updates readme | Erez Zukerman | 2015-12-18 | 1 | -2/+24 | |
| |/ |/| | ||||||
* | | jack's ergodox layout | Jack Humbert | 2015-12-17 | 1 | -0/+185 | |
| | | ||||||
* | | Fixes media keys on OSX layout | Erez Zukerman | 2015-12-18 | 2 | -5/+5 | |
| | | ||||||
* | | Adds a new default keymap for OSX with working prev/next keys | Erez Zukerman | 2015-12-18 | 6 | -1467/+1654 | |
| | | ||||||
* | | Moves compiled default keymap + legends to keymaps directory | Erez Zukerman | 2015-12-18 | 3 | -0/+1467 | |
| | | ||||||
* | | A compiled version which sends left click in mouse mode | Erez Zukerman | 2015-12-16 | 1 | -0/+1466 | |
| | | ||||||
* | | Merge pull request #41 from joshmccall221/right_click_fix | Erez Zukerman | 2015-12-16 | 1 | -1/+1 | |
|\ \ | | | | | | | Left click was mapped to scroll wheel. This fixes that. :) | |||||
| * | | Left click was mapped to scroll wheel. This fixes that. :) | Josh McCall | 2015-12-16 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #39 from gdiegel/master | Jack Humbert | 2015-12-14 | 1 | -0/+109 | |
|\| | | | | | New keymap | |||||
| * | Remove redundant definitions | Gabriel Diegel | 2015-12-13 | 1 | -10/+10 | |
| | | ||||||
| * | Rename keymap | Gabriel Diegel | 2015-12-13 | 1 | -0/+0 | |
| | |