Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #592 from sethbc/ez-sethbc | Erez Zukerman | 2016-08-02 | 3 | -0/+119 |
|\ | | | | | Ez sethbc | ||||
| * | rebase | Seth Chandler | 2016-07-30 | 3 | -0/+119 |
| | | |||||
* | | Merge pull request #593 from J3RN/master | Erez Zukerman | 2016-08-02 | 2 | -22/+26 |
|\ \ | | | | | | | Updated the J3RN ErgoDox keymap | ||||
| * | | Updated readme with recent changes | Jonathan Arnett | 2016-07-30 | 1 | -3/+6 |
| | | | |||||
| * | | Updated my keymap | Jack Humbert | 2016-07-30 | 2 | -20/+21 |
| |\| | |||||
* | | | Merge pull request #600 from adiabatic/master | Erez Zukerman | 2016-08-02 | 4 | -14/+1167 |
|\ \ \ | | | | | | | | | zweihander-osx: add left-hand-thumb tab key | ||||
| * | | | Thumb ⌫ into ⇥, numpad & into :, yank home/end | Nathan Sharfi | 2016-07-31 | 3 | -13/+1166 |
| | | | | | | | | | | | | | | | | Also: add (back?) in the light-shine disabler | ||||
| * | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | Nathan Sharfi | 2016-07-31 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | | | | | | | # Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex | ||||
* | | | Updates ErgoDox readme | Erez Zukerman | 2016-08-01 | 1 | -9/+6 |
| | | | |||||
* | | | Generate version information to version.h | Fred Sundvik | 2016-07-31 | 3 | -0/+3 |
|/ / | | | | | | | So that only the files that really needs a version are recompiled. | ||||
* / | Update some obsolete references | Gergely Nagy | 2016-07-30 | 1 | -1/+1 |
|/ | | | | | | | | | | | 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> | ||||
* | Small fix for infinity include guard | Fred Sundvik | 2016-07-29 | 1 | -3/+3 |
| | |||||
* | Fix typo in the readme. | Fred Sundvik | 2016-07-29 | 1 | -1/+1 |
| | |||||
* | A couple of more Ergodox readme fixes | Fred Sundvik | 2016-07-29 | 1 | -2/+2 |
| | |||||
* | Unify the ErgoDox EZ and Infinity documentation | Fred Sundvik | 2016-07-29 | 1 | -8/+13 |
| | |||||
* | Refer to the right path in the readme | Fred Sundvik | 2016-07-29 | 1 | -1/+1 |
| | |||||
* | Move Ergodox readme from ez subfolder to parent | Fred Sundvik | 2016-07-29 | 1 | -0/+0 |
| | |||||
* | Include the main Makefile before including Ergodox infinity drivers | Fred Sundvik | 2016-07-29 | 1 | -4/+4 |
| | |||||
* | Move Infinity Ergodox drivers to subproject, and fix makefile | Fred Sundvik | 2016-07-29 | 14 | -2/+2 |
| | |||||
* | Remove the Infinity Ergodox default keymap | Fred Sundvik | 2016-07-29 | 2 | -282/+0 |
| | |||||
* | Cleanup the townk_osx config.h and make files | Fred Sundvik | 2016-07-29 | 2 | -52/+2 |
| | |||||
* | Rename supercoder config_user to config.h | Fred Sundvik | 2016-07-29 | 1 | -1/+1 |
| | | | | Also fixup the include path of parent config | ||||
* | Fix config.h include guards | Fred Sundvik | 2016-07-29 | 2 | -4/+4 |
| | |||||
* | Define weak matrix user function for Infinity Ergodox | Fred Sundvik | 2016-07-29 | 1 | -0/+9 |
| | | | | So that a few keyboards, which don't use them, links properly. | ||||
* | Change _delay_ms to wait_ms in algernon keymap | Fred Sundvik | 2016-07-29 | 1 | -1216/+1217 |
| | |||||
* | Move some of the Ergodox config settings to shared | Fred Sundvik | 2016-07-29 | 3 | -37/+37 |
| | |||||
* | Add empty led control functions to Infinity Ergodox | Fred Sundvik | 2016-07-29 | 2 | -0/+96 |
| | | | | So that most keymaps compiles and links | ||||
* | Most ergodox keymaps compiles on Infinity | Fred Sundvik | 2016-07-29 | 19 | -31/+42 |
| | | | | There are linker errors due to missing led funcitonality though | ||||
* | All Ez keymaps compiles | Fred Sundvik | 2016-07-29 | 58 | -58/+70 |
| | |||||
* | Initial structure for Ergodox as subprojects | Fred Sundvik | 2016-07-29 | 219 | -0/+27312 |
Only the EZ default keymaps compiles at the moment though. |