summaryrefslogtreecommitdiff
path: root/keyboards/ergodox
AgeCommit message (Collapse)Author
2016-08-20Split subproject make files into Makefile and rules.mkFred Sundvik
2016-08-20Split keyboard makefiles into rules and MakefileFred Sundvik
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-13Merge remote-tracking branch 'upstream/master'Xyverz
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-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.
2016-08-08Delete keymap.cXyverz
file cleanup
2016-08-08Delete old_keymap.cXyverz
file cleanup
2016-08-08Delete readme.mdXyverz
file cleanup, removing file that doesn't apply to my layout.
2016-08-08Delete dvorak.pngXyverz
Not reflective of my layout.
2016-08-08Adding my own keymaps to the following keyboards:Ian Sterling
Planck, Preonic, Atreus, Ergodox
2016-08-02Merge pull request #592 from sethbc/ez-sethbcErez Zukerman
Ez sethbc
2016-08-02Merge pull request #593 from J3RN/masterErez Zukerman
Updated the J3RN ErgoDox keymap
2016-08-02Merge pull request #600 from adiabatic/masterErez Zukerman
zweihander-osx: add left-hand-thumb tab key
2016-08-01Updates ErgoDox readmeErez Zukerman
2016-07-31Thumb ⌫ into ⇥, numpad & into :, yank home/endNathan Sharfi
Also: add (back?) in the light-shine disabler
2016-07-31Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi
# 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 Sundvik
So that only the files that really needs a version are recompiled.
2016-07-30Updated readme with recent changesJonathan Arnett
2016-07-30Updated my keymapJack Humbert
2016-07-30rebaseSeth Chandler
2016-07-30Update some obsolete referencesGergely Nagy
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-29Small fix for infinity include guardFred Sundvik
2016-07-29Fix typo in the readme.Fred Sundvik
2016-07-29A couple of more Ergodox readme fixesFred Sundvik
2016-07-29Unify the ErgoDox EZ and Infinity documentationFred Sundvik
2016-07-29Refer to the right path in the readmeFred Sundvik
2016-07-29Move Ergodox readme from ez subfolder to parentFred Sundvik
2016-07-29Include the main Makefile before including Ergodox infinity driversFred Sundvik
2016-07-29Move Infinity Ergodox drivers to subproject, and fix makefileFred Sundvik
2016-07-29Remove the Infinity Ergodox default keymapFred Sundvik
2016-07-29Cleanup the townk_osx config.h and make filesFred Sundvik
2016-07-29Rename supercoder config_user to config.hFred Sundvik
Also fixup the include path of parent config
2016-07-29Fix config.h include guardsFred Sundvik
2016-07-29Define weak matrix user function for Infinity ErgodoxFred Sundvik
So that a few keyboards, which don't use them, links properly.
2016-07-29Change _delay_ms to wait_ms in algernon keymapFred Sundvik
2016-07-29Move some of the Ergodox config settings to sharedFred Sundvik
2016-07-29Add empty led control functions to Infinity ErgodoxFred Sundvik
So that most keymaps compiles and links
2016-07-29Most ergodox keymaps compiles on InfinityFred Sundvik
There are linker errors due to missing led funcitonality though
2016-07-29All Ez keymaps compilesFred Sundvik
2016-07-29Initial structure for Ergodox as subprojectsFred Sundvik
Only the EZ default keymaps compiles at the moment though.