summaryrefslogtreecommitdiff
path: root/keyboards/ergodox
AgeCommit message (Collapse)Author
2016-09-01adds Hyper key. improves media layer. first attempt at tap dance.Daniel
2016-08-31Merge remote-tracking branch 'upstream/master'Daniel
2016-08-26Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik
2016-08-26Merge pull request #664 from linsomniac/infinity_readmeErez Zukerman
Adding nicer Infinity build instructions.
2016-08-24Making the existing firmware link betterSean Reifschneider
2016-08-24Changes based on @fredizzimo review, flashing Infinity detailsSean Reifschneider
2016-08-24Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik
2016-08-23Merge pull request #677 from SmackleFunky/masterJack Humbert
Virtual Serial Port - and a Layout that uses that virtual serial port for Plover
2016-08-23move to ergodox-ez onlyJason Green
2016-08-23Merge branch 'master' into makefile_overhaulFred Sundvik
2016-08-23Remove unneeded includeJason Green
2016-08-23add missing #includeJason Green
2016-08-23TxBolt (Steno) Serial protocol for Ergodox EzJason Green
2016-08-22Changes from review by @fredizzimo and @XyverzSean Reifschneider
2016-08-20Add default swap configs for a couple of boards.Joe Wasson
2016-08-20Merge pull request #665 from linsomniac/keymap_jafoJack Humbert
Adding jafo layout.
2016-08-20Merge pull request #658 from Xyverz/masterJack Humbert
Got rid of all the kludge in my ErgoDox keymap.
2016-08-20Merge pull request #630 from nrrkeene/masterJack Humbert
The Ordinary Layout is the unsurprising layout
2016-08-19Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.Xyverz
2016-08-19Changed my keymap to match normal keymaps.Xyverz
2016-08-19The Ordinary Layout is boring because all the keys are where you expect them ↵Nicholas Keene
to be
2016-08-19The Ordinary Layout is boring because all the keys are where you expect them ↵Nicholas Keene
to be
2016-08-19Tweaks after review.Sean Reifschneider
2016-08-19Restructuring of the ergodox README.Sean Reifschneider
2016-08-19Bringing over changes from default map.Sean Reifschneider
2016-08-20Update keyboard readme files with new makefile instructionsFred Sundvik
2016-08-20Split subproject make files into Makefile and rules.mkFred Sundvik
2016-08-20Split keyboard makefiles into rules and MakefileFred Sundvik
2016-08-19Noting the change directory.Sean Reifschneider
2016-08-19Adding submodule note.Sean Reifschneider
2016-08-19Adding jafo layout.Sean Reifschneider
2016-08-19Adding nicer Infinity build instructions.Sean Reifschneider
2016-08-18Added compatibility for the Infinity ErgoDox to my Ergodox keymap.Xyverz
Updated readme.md to reflect this change.
2016-08-18One last change to the readme.Xyverz
2016-08-18One last formatting changeXyverz
2016-08-18more formatting changesXyverz
2016-08-18Hopefully this fixes the layout diagrams.Xyverz
2016-08-18Added a readme, tidied up comments in the keymap.Xyverz
2016-08-17Merge branch 'master' of https://github.com/Xyverz/qmk_firmwareXyverz
2016-08-17Update readme.mdXyverz
2016-08-17Create readme.mdXyverz
2016-08-17tap-dance: Major rework, to make it more reliableGergely Nagy
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-14minor tweaks to numpad and media layerDaniel
2016-08-13Merge remote-tracking branch 'upstream/master'Xyverz
2016-08-13The Ordinary Layout is the unsurprising layoutNicholas Keene
2016-08-12completes first-pass at media layerDaniel
2016-08-12completes first-pass at symbol layerDaniel
2016-08-12ergodox: Update my keymap to v1.5Gergely Nagy
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-10completes first-pass at base layerDaniel
2016-08-09Adding my own layouts for the Phantom and Ergodox. My Ergodox layout adds ↵Ian Sterling
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.