Commit Graph

432 Commits (3bfe4cdb4feeee9c9282839ee8a1fe497dac24b5)

Author SHA1 Message Date
Joshua T 6df31120a1 Merge remote-tracking branch 'upstream/master' 8 years ago
Erez Zukerman 79a9e04706 Merge pull request #592 from sethbc/ez-sethbc
Ez sethbc
8 years ago
Erez Zukerman 8c52327aa6 Merge pull request #593 from J3RN/master
Updated the J3RN ErgoDox keymap
8 years ago
Erez Zukerman 6eab4ecd7e Merge pull request #600 from adiabatic/master
zweihander-osx: add left-hand-thumb tab key
8 years ago
Erez Zukerman 56aa51664e Updates ErgoDox readme 8 years ago
Nathan Sharfi 07a631bd5a Thumb ⌫ into ⇥, numpad & into :, yank home/end
Also: add (back?) in the light-shine disabler
8 years ago
Nathan Sharfi d889648d53 Merge branch 'master' of github.com:jackhumbert/qmk_firmware
# Conflicts:
#	keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
#	keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
8 years ago
Fred Sundvik 97817a773e Generate version information to version.h
So that only the files that really needs a version are recompiled.
8 years ago
Jonathan Arnett 1876e100be
Updated readme with recent changes 8 years ago
Jack Humbert 17bd4ac062
Updated my keymap 8 years ago
Seth Chandler a6ec5fa74a rebase 8 years ago
Joshua T 0064f1f84c Moved my Ergodox keymap to match upstream changes 8 years ago
Gergely Nagy 8a9bf1f165 Update some obsolete references
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>
8 years ago
Fred Sundvik 566c79554e Small fix for infinity include guard 8 years ago
Fred Sundvik 6e8a5aca9d Fix typo in the readme. 8 years ago
Fred Sundvik 401dd09077 A couple of more Ergodox readme fixes 8 years ago
Fred Sundvik c65da1f208 Unify the ErgoDox EZ and Infinity documentation 8 years ago
Fred Sundvik 44cefcb40a Refer to the right path in the readme 8 years ago
Fred Sundvik 349f189e83 Move Ergodox readme from ez subfolder to parent 8 years ago
Fred Sundvik ad416fb1a3 Include the main Makefile before including Ergodox infinity drivers 8 years ago
Fred Sundvik 592ef7c6f0 Move Infinity Ergodox drivers to subproject, and fix makefile 8 years ago
Fred Sundvik 37052a53f1 Remove the Infinity Ergodox default keymap 8 years ago
Fred Sundvik 650298cec3 Cleanup the townk_osx config.h and make files 8 years ago
Fred Sundvik fd7f20b029 Rename supercoder config_user to config.h
Also fixup the include path of parent config
8 years ago
Fred Sundvik 426e9ecc6f Fix config.h include guards 8 years ago
Fred Sundvik a6577b272e Define weak matrix user function for Infinity Ergodox
So that a few keyboards, which don't use them, links properly.
8 years ago
Fred Sundvik 1641743b9d Change _delay_ms to wait_ms in algernon keymap 8 years ago
Fred Sundvik e7670f6d19 Move some of the Ergodox config settings to shared 8 years ago
Fred Sundvik e0f28c2b10 Add empty led control functions to Infinity Ergodox
So that most keymaps compiles and links
8 years ago
Fred Sundvik e01b4c3fd9 Most ergodox keymaps compiles on Infinity
There are linker errors due to missing led funcitonality though
8 years ago
Fred Sundvik b0376687f4 All Ez keymaps compiles 8 years ago
Fred Sundvik 9af995c59b Initial structure for Ergodox as subprojects
Only the EZ default keymaps compiles at the moment though.
8 years ago