summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox/keymaps
AgeCommit message (Collapse)AuthorFilesLines
2016-08-20Merge pull request #665 from linsomniac/keymap_jafoJack Humbert5-0/+213
Adding jafo layout.
2016-08-20Merge pull request #658 from Xyverz/masterJack Humbert2-209/+211
Got rid of all the kludge in my ErgoDox keymap.
2016-08-20Merge pull request #630 from nrrkeene/masterJack Humbert10-275/+237
The Ordinary Layout is the unsurprising layout
2016-08-20Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.Xyverz2-17/+10
2016-08-20Changed my keymap to match normal keymaps.Xyverz1-314/+198
2016-08-20The Ordinary Layout is boring because all the keys are where you expect them ↵Nicholas Keene1-1/+1
to be
2016-08-20The Ordinary Layout is boring because all the keys are where you expect them ↵Nicholas Keene8-111/+98
to be
2016-08-20Bringing over changes from default map.Sean Reifschneider1-4/+3
2016-08-19Adding jafo layout.Sean Reifschneider5-0/+214
2016-08-19Added compatibility for the Infinity ErgoDox to my Ergodox keymap.Xyverz2-53/+178
Updated readme.md to reflect this change.
2016-08-18One last change to the readme.Xyverz1-3/+1
2016-08-18One last formatting changeXyverz1-1/+1
2016-08-18more formatting changesXyverz1-90/+90
2016-08-18Hopefully this fixes the layout diagrams.Xyverz1-91/+91
2016-08-18Added a readme, tidied up comments in the keymap.Xyverz2-29/+147
2016-08-18Merge branch 'master' of https://github.com/Xyverz/qmk_firmwareXyverz1-0/+5
2016-08-17Update readme.mdXyverz1-1/+1
2016-08-17Create readme.mdXyverz1-0/+5
2016-08-17tap-dance: Major rework, to make it more reliableGergely Nagy1-1/+1
This reworks how the tap-dance feature works: instead of one global state, we have a state for each tap-dance key, so we can cancel them when another tap-dance key is in flight. This fixes #527. Since we have a state for each key, we can avoid situation where a keyup would mess with our global state. This fixes #563. And while here, we also make sure to fire events only once, and this fixes #574. There is one breaking change, though: tap-dance debugging support was removed, because dumping the whole state would increase the firmware size too much. Any keymap that made use of this, will have to be updated (but there's no such keymap in the repo). Also, there's a nice trick used in this rework: we need to iterate through tap_dance_actions in a few places, to check for timeouts, and so on. For this, we'd need to know the size of the array. We can't discover that at compile-time, because tap-dance gets compiled separately. We'd like to avoid having to terminate the list with a sentinel value, because that would require updates to all keymaps that use the feature. So, we keep track of the highest tap-dance code seen so far, and iterate until that index. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-14Merge remote-tracking branch 'upstream/master'Xyverz6-1237/+1244
2016-08-13The Ordinary Layout is the unsurprising layoutNicholas Keene10-183/+158
2016-08-12ergodox: Update my keymap to v1.5Gergely Nagy6-1237/+1244
Major changes include: * The **1HAND** layer has been removed. * A `Delete` key is now available on the right thumb cluster. * The **ADORE** layer received a major update, see the updated layout image. * It is now possible to enable automatic logging for the **ADORE** layer, by setting the `ADORE_AUTOLOG` makefile variable to `yes` when compiling the keymap. It is off by default. * The `~` key and the `Media Next/Prev` key have been swapped on the **base** layer. * On the **ARROW** layer, `Backspace` has been replaced by `Enter`. * There is some experimental support for entering Unicode symbols. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-10Adding my own layouts for the Phantom and Ergodox. My Ergodox layout adds ↵Ian Sterling1-0/+311
persistent layers based on the Planck and Preonic setup. The layout arrays are pulled directly from the ergodox/ez/ez.h keymap definition starting at line 81.
2016-08-09Delete keymap.cXyverz1-184/+0
file cleanup
2016-08-09Delete old_keymap.cXyverz1-311/+0
file cleanup
2016-08-09Delete readme.mdXyverz1-10/+0
file cleanup, removing file that doesn't apply to my layout.
2016-08-09Delete dvorak.pngXyverz1-0/+0
Not reflective of my layout.
2016-08-09Adding my own keymaps to the following keyboards:Ian Sterling4-0/+505
Planck, Preonic, Atreus, Ergodox
2016-08-02Merge pull request #592 from sethbc/ez-sethbcErez Zukerman3-0/+119
Ez sethbc
2016-08-02Merge pull request #593 from J3RN/masterErez Zukerman2-22/+26
Updated the J3RN ErgoDox keymap
2016-08-02Merge pull request #600 from adiabatic/masterErez Zukerman4-14/+1167
zweihander-osx: add left-hand-thumb tab key
2016-07-31Thumb ⌫ into ⇥, numpad & into :, yank home/endNathan Sharfi3-13/+1166
Also: add (back?) in the light-shine disabler
2016-07-31Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi178-0/+21862
# Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
2016-07-31Generate version information to version.hFred Sundvik3-0/+3
So that only the files that really needs a version are recompiled.
2016-07-30Updated readme with recent changesJonathan Arnett1-3/+6
2016-07-30Updated my keymapJack Humbert2-20/+21
2016-07-30rebaseSeth Chandler3-0/+119
2016-07-30Update some obsolete referencesGergely Nagy1-1/+1
Some links were still pointing to `/keyboards/ergodox_ez`, while the directory is `/keyboards/erdogox` now. Not all references have been updated, and some of the text here and there may need updating to mention the ErgoDox Infinity too, but that's out of the scope for this quick fix. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-29Cleanup the townk_osx config.h and make filesFred Sundvik2-52/+2
2016-07-29Rename supercoder config_user to config.hFred Sundvik1-1/+1
Also fixup the include path of parent config
2016-07-29Change _delay_ms to wait_ms in algernon keymapFred Sundvik1-1216/+1217
2016-07-29All Ez keymaps compilesFred Sundvik57-58/+58
2016-07-29Initial structure for Ergodox as subprojectsFred Sundvik178-0/+21911
Only the EZ default keymaps compiles at the moment though.