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
2016-07-31 14:02:25 -07:00
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>
2016-07-30 08:37:30 +02:00
Fred Sundvik
566c79554e
Small fix for infinity include guard
2016-07-29 21:09:42 +03:00
Fred Sundvik
6e8a5aca9d
Fix typo in the readme.
2016-07-29 21:09:41 +03:00
Fred Sundvik
401dd09077
A couple of more Ergodox readme fixes
2016-07-29 21:09:40 +03:00
Fred Sundvik
c65da1f208
Unify the ErgoDox EZ and Infinity documentation
2016-07-29 21:09:39 +03:00
Fred Sundvik
44cefcb40a
Refer to the right path in the readme
2016-07-29 21:09:38 +03:00
Fred Sundvik
349f189e83
Move Ergodox readme from ez subfolder to parent
2016-07-29 21:09:37 +03:00
Fred Sundvik
ad416fb1a3
Include the main Makefile before including Ergodox infinity drivers
2016-07-29 21:09:37 +03:00
Fred Sundvik
592ef7c6f0
Move Infinity Ergodox drivers to subproject, and fix makefile
2016-07-29 21:09:36 +03:00
Fred Sundvik
37052a53f1
Remove the Infinity Ergodox default keymap
2016-07-29 21:09:35 +03:00
Fred Sundvik
650298cec3
Cleanup the townk_osx config.h and make files
2016-07-29 21:09:34 +03:00
Fred Sundvik
fd7f20b029
Rename supercoder config_user to config.h
...
Also fixup the include path of parent config
2016-07-29 21:09:33 +03:00
Fred Sundvik
426e9ecc6f
Fix config.h include guards
2016-07-29 21:09:32 +03:00
Fred Sundvik
a6577b272e
Define weak matrix user function for Infinity Ergodox
...
So that a few keyboards, which don't use them, links properly.
2016-07-29 21:09:31 +03:00
Fred Sundvik
1641743b9d
Change _delay_ms to wait_ms in algernon keymap
2016-07-29 21:09:21 +03:00
Fred Sundvik
e7670f6d19
Move some of the Ergodox config settings to shared
2016-07-29 20:48:22 +03:00
Fred Sundvik
e0f28c2b10
Add empty led control functions to Infinity Ergodox
...
So that most keymaps compiles and links
2016-07-29 20:48:21 +03:00
Fred Sundvik
e01b4c3fd9
Most ergodox keymaps compiles on Infinity
...
There are linker errors due to missing led funcitonality though
2016-07-29 20:48:20 +03:00
Fred Sundvik
b0376687f4
All Ez keymaps compiles
2016-07-29 20:48:19 +03:00
Fred Sundvik
9af995c59b
Initial structure for Ergodox as subprojects
...
Only the EZ default keymaps compiles at the moment though.
2016-07-29 20:48:04 +03:00
