Commit Graph

198 Commits (e36a441274e9e494e1d8e38df1901f3acf9def27)

Author SHA1 Message Date
dragon788 d1f8d0104b Merge branch 'master' of github.com:jackhumbert/qmk_firmware
Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c
9 years ago
Stephan Bösebeck 381ca294fe minor fixes, added backtick to left thumbblock 9 years ago
dragon788 b61ea5dfaf Updated keymap ascii art and made thumb cluster more standard ErgoDox/Kinesis-like 9 years ago
Jack Humbert 9814343336 Merge pull request #56 from sboesebeck/master
fix number pad for german keys
9 years ago
Erez Zukerman 58e237d2dc Updates readme 9 years ago
Stephan Bösebeck 7115196ddf fix number pad for german keys 9 years ago
Jack Humbert 694fe4e1e2 Merge pull request #55 from sboesebeck/master
fixed some typos, learned, DE_-keycodes are for Win, not OSX
9 years ago
Stephan Bösebeck d3e54552fb fixed some typos, learned, DE_-keycodes are for Win, not OSX 9 years ago
Jack Humbert b1fbd4c9ca Merge pull request #53 from sboesebeck/master
minor updates
9 years ago
Stephan Bösebeck 370e9028ac new firmware file containing current changes 9 years ago
Stephan Bösebeck 5f0965ce39 added png file for layout documentation 9 years ago
Stephan Bösebeck d35b563816 minor changes, fixes 9 years ago
Technovangelist 42ca2e6684 swapped the space and enter to get the space under where the thumb is. 9 years ago
Technovangelist a67ef035b8 first attempt at a working workman layout for the ergodoxez 9 years ago
chwilk 2b1a256825 Added keymap variant to approximate Kin Adv 9 years ago
Jack Humbert e70cdb0693 Merge pull request #47 from pnutster/master
OSX Kinesis-like Mapping
9 years ago
Piet Nutbey cc79f17424 Fixed keymap "graphic" 9 years ago
Piet Nutbey ac3513b79f corrected folder 9 years ago
Piet Nutbey 190562288c OSX Kinesis-like Mapping
OS X Kinesis Like key mapping. Only the default layer was changed into
a more Kinesis-like mapping. Hopefully useful as a starting point.
9 years ago
Stephan Bösebeck 737afc9dc7 added hex file 9 years ago
Stephan Bösebeck 203528869d typo fix 9 years ago
Stephan Bösebeck f35609bd89 minor change 9 years ago
Stephan Bösebeck 1b579212d4 added hex file and readme 9 years ago
Stephan Bösebeck 56104858fc first version for german osx layout 9 years ago
Jack Humbert e0acb8a0ee Merge pull request #45 from matzebond/master
German keymap + ErgoDox keymaps
9 years ago
Erez Zukerman 11f0724951 Further clarifies README 9 years ago
Matthias Schmitt 7b7870bae1 Add neo2 keymap and neo2 ergodox layout 9 years ago
Matthias Schmitt 3dbcad51d1 Add german keymap and german ergodox layout 9 years ago
Erez Zukerman 7f22b67f8a Updates readme 9 years ago
Jack Humbert 0a58ce3881 jack's ergodox layout 9 years ago
Erez Zukerman f4efa110f8 Fixes media keys on OSX layout 9 years ago
Erez Zukerman c7c414b2fb Adds a new default keymap for OSX with working prev/next keys 9 years ago
Erez Zukerman 7923f212e1 Moves compiled default keymap + legends to keymaps directory 9 years ago
Erez Zukerman 4f4553cb90 A compiled version which sends left click in mouse mode 9 years ago
Josh McCall 4e290a7d59 Left click was mapped to scroll wheel. This fixes that. :) 9 years ago
Josh McCall c63c615ff8 add left click and vim keys 9 years ago
Erez Zukerman 1edb050d20 Adds Hyper on the left side 9 years ago
Erez Zukerman 926ce2262f Uses App key as Alt when held 9 years ago
Erez Zukerman f5ec585ed8 [Erez & Jack] Adds Meh key (Hyper without Win/Cmd) 9 years ago
Erez Zukerman 80397187cd Enabled NKRO by default, drops irrelevant makefile options 9 years ago
Jack Humbert 6485c7d7da nkro info 9 years ago
Erez Zukerman 4b0c54324a Adds Hyper key, tweaks ErgoDox EZ default keymap 9 years ago
Erez Zukerman f024a462cd Fixes rolling combos for mod-tap keys 9 years ago
Erez Zukerman d3db8d62f6 More work on ErgoDox EZ default keymap 9 years ago
Erez Zukerman 2739aa8d78 Initial working version of ErgoDox EZ layout using new syntax 9 years ago
Jack Humbert 909d30553f updated EZ makefile with tmk_core changes 9 years ago
Jack Humbert 6f3141965e new project script 9 years ago
Erez Zukerman 0c47e8b008 [Jack & Erez] Comments + tiny updates and cleanup 9 years ago