summaryrefslogtreecommitdiff
path: root/keyboards/ergodox
AgeCommit message (Collapse)Author
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.