Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Generate version information to version.h | Fred Sundvik | 2016-07-31 | 7 | -2/+10 |
| | | | | So that only the files that really needs a version are recompiled. | ||||
* | Force compilation and linking when options changes | Fred Sundvik | 2016-07-31 | 1 | -9/+28 |
| | |||||
* | More reliable .d file generation | Fred Sundvik | 2016-07-31 | 1 | -8/+16 |
| | | | | Also generated inside the obj dir instead of separate deps folder. | ||||
* | Put the build output inside the root/.build directory | Fred Sundvik | 2016-07-31 | 1 | -1/+2 |
| | |||||
* | Enable vpath seraching for source files only | Fred Sundvik | 2016-07-31 | 1 | -1/+11 |
| | |||||
* | Better "include guards" for the makefiles | Fred Sundvik | 2016-07-31 | 1 | -9/+14 |
| | | | | | | | | | | | | Checking for ARCH is not good enough, since some subprojects define it. Ergodox Ez for example. The leads to running the make from keyboards/ergodox/ez failing. The keyboard makefile will not be included in that case, and therefore not the CUSTOM_MATRIX either. Furthermore the output files are read from many different .build directories, so it doesn't fail deterministically. For example on the Travis CI the compilation passes, since there's no outdated objects that needs recompilation. | ||||
* | Merge pull request #589 from algernon/h/ergodox_ez-vs-ergodox | Jack Humbert | 2016-07-30 | 7 | -9/+9 |
|\ | | | | | Update some obsolete references | ||||
| * | Update some obsolete references | Gergely Nagy | 2016-07-30 | 7 | -9/+9 |
|/ | | | | | | | | | | | 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> | ||||
* | Merge pull request #587 from fredizzimo/documentation_quick_fix | Jack Humbert | 2016-07-29 | 1 | -13/+15 |
|\ | | | | | Fix the quick aliases documentation section | ||||
| * | Fix the quick aliases documentation section | Fred Sundvik | 2016-07-29 | 1 | -13/+15 |
| | | | | | | | | | | Also move all keyboard customization documentation under the "Going Beyond the keycodes" heading. | ||||
* | | Merge pull request #503 from fredizzimo/ergodox_subproject | Jack Humbert | 2016-07-29 | 225 | -1795/+1651 |
|\ \ | |/ |/| | Add both Ergodox EZ and Infinity Ergodox as sub-projects of Ergodox | ||||
| * | 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. | ||||
| * | Speed up ChibiOS keymap compilation | Fred Sundvik | 2016-07-29 | 1 | -17/+33 |
| | | | | | | | | | | By sharing the external library object files between the whole keyboard, instead of re-compiling them for each keymap. | ||||
| * | 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 | 21 | -32/+46 |
| | | | | | | | | 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 | -23/+58 |
|/ | | | | Only the EZ default keymaps compiles at the moment though. | ||||
* | Merge pull request #584 from algernon/ergodox-ez/algernon | Erez Zukerman | 2016-07-29 | 4 | -28/+687 |
|\ | | | | | ergodox_ez: Upgrade my keymap to v1.4 | ||||
| * | ergodox_ez: Upgrade my keymap to v1.4 | Gergely Nagy | 2016-07-29 | 4 | -28/+687 |
| | | | | | | | | | | | | | | | | | | | | * When toggling the key logging on or off, the LEDs will do a little dance. * The keylogger is now optional, but enabled by default. Use `KEYLOGGER_ENABLE=no` on the `make` command line to disable it. * The `TAB`/`ARRW` key was turned into a tap-dance key, allowing one to toggle the **ARROW** layer on by double-tapping, and as such, avoid the need to hold the key. * The `-`/`_` key was turned into a tap-dance key too. * There is now a way to travel time with the keyboard, toggle the feature on by hitting `LEAD t`. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
* | | Merge pull request #583 from coderkun/coderkun_neo2 | Erez Zukerman | 2016-07-29 | 2 | -7/+15 |
|\ \ | | | | | | | Ergodox EZ: update keymap “coderkun_neo2” | ||||
| * | | disable sleep LED | coderkun | 2016-07-29 | 1 | -1/+2 |
| | | | |||||
| * | | complete labels for modifiers in keymap schema | coderkun | 2016-07-29 | 1 | -2/+2 |
| | | | |||||
| * | | use Ergodox EZ’s third LED for “scroll lock” | coderkun | 2016-07-29 | 1 | -2/+9 |
| | | | |||||
| * | | fix grave (GRV) and acute (ACUT) accents | coderkun | 2016-07-29 | 1 | -2/+2 |
| |/ | |||||
* | | Merge pull request #580 from MatsLanGoH/patch-1 | Erez Zukerman | 2016-07-29 | 1 | -1/+1 |
|\ \ | |/ |/| | Fixed a typo | ||||
| * | Fixed a typo | Matthias | 2016-07-29 | 1 | -1/+1 |
|/ | | | Fixed a typo in line 738 'void martix_init' to 'void matrix_init' | ||||
* | Merge pull request #578 from 0xdec/master | Jack Humbert | 2016-07-28 | 4 | -0/+234 |
|\ | | | | | 0xdec Preonic keymap | ||||
| * | Create 0xdec Preonic keymap | Jordi Orlando | 2016-07-28 | 4 | -0/+234 |
| | | | | | | | | An ergonomically optimized Colemak keymap for the grid-layout Preonic | ||||
* | | Merge pull request #577 from hot-leaf-juice/master | Jack Humbert | 2016-07-28 | 3 | -0/+211 |
|\ \ | | | | | | | Pull request to include my keymap if you want it! | ||||
| * | | Added readme.md for custom layout. | Callum Oakley | 2016-07-28 | 1 | -0/+48 |
| | | | |||||
| * | | Added custom keymap. | Callum Oakley | 2016-07-27 | 2 | -0/+163 |
| | | | | | | | | | | | | Added custom keymap. | ||||
* | | | Merge pull request #573 from algernon/f/make-all-stop-on-error | Jack Humbert | 2016-07-28 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | tmk_core/rules.mk: Make PRINT_ERROR* stop on error | ||||
| * | | tmk_core/rules.mk: Make PRINT_ERROR* stop on error | Gergely Nagy | 2016-07-27 | 1 | -2/+2 |
| |/ | | | | | | | | | | | | | Instead of `&& false`, explicitly `exit 1` to make the rules using these macros fail. This fixes #571, and likely breaks Travis badly. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
* | | Merge pull request #572 from algernon/f/tap-dance-debug | Jack Humbert | 2016-07-28 | 2 | -0/+16 |
|\ \ | | | | | | | tap-dance: Add some debugging support | ||||
| * | | tap-dance: Add some debugging support | Gergely Nagy | 2016-07-27 | 2 | -0/+16 |
| |/ | | | | | | | Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
* | | Merge pull request #570 from sethbc/fix_bone2planck_build | Jack Humbert | 2016-07-28 | 1 | -10/+8 |
|\ \ | | | | | | | Fix bone2planck build |