summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix mkdir cmdJack Humbert2016-08-011-1/+1
|
* Updates ErgoDox readmeErez Zukerman2016-08-011-9/+6
|
* automatically forward ergodox ezJack Humbert2016-08-012-0/+3
|
* Merge pull request #597 from Jiehong/feature/basic_keyboard_docJack Humbert2016-08-011-0/+96
|\ | | | | feature: add basic doc about how a keyboard works on USB
| * feature: add basic doc about how a keyboard works on USBJiehong Ma2016-07-311-0/+96
| | | | | | | | This comes from the discussion on #520
* | Merge pull request #596 from fredizzimo/rid_of_quickJack Humbert2016-08-0110-56/+87
|\ \ | | | | | | Fix the makefile dependencies and remove quick targets
| * | Travis calls the normal build target, instead of quickFred Sundvik2016-07-311-1/+1
| | |
| * | Fix the readme for the removed quick targetFred Sundvik2016-07-311-4/+3
| | |
| * | Remove the quick commands and add proper cleanFred Sundvik2016-07-311-26/+5
| | |
| * | Also depend on the gcc versionFred Sundvik2016-07-311-3/+5
| | |
| * | Generate version information to version.hFred Sundvik2016-07-317-2/+10
| | | | | | | | | | | | So that only the files that really needs a version are recompiled.
| * | Force compilation and linking when options changesFred Sundvik2016-07-311-9/+28
| | |
| * | More reliable .d file generationFred Sundvik2016-07-311-8/+16
| | | | | | | | | | | | Also generated inside the obj dir instead of separate deps folder.
| * | Put the build output inside the root/.build directoryFred Sundvik2016-07-311-1/+2
| | |
| * | Enable vpath seraching for source files onlyFred Sundvik2016-07-311-1/+11
| | |
| * | Better "include guards" for the makefilesFred Sundvik2016-07-311-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 #594 from jeebak/jeebakJack Humbert2016-07-313-0/+496
|\ \ \ | | | | | | | | Jeebak's keymap for planck
| * | | Update readme.mdJeeBak Kim2016-07-301-1/+106
| | | |
| * | | Add additional shortcut keymaps to TOUCHCURSOR layerJeeBak Kim2016-07-301-4/+7
| | | |
| * | | Add additional maps for [, and ], to LOWERJeeBak Kim2016-07-301-4/+4
| | | |
| * | | Make RAISE layer an all numbers/arithmatic layerJeeBak Kim2016-07-301-6/+6
| | | |
| * | | Move reset to a less accessible locationJeeBak Kim2016-07-301-4/+4
| | | |
| * | | Add -, +, and . to RAISEJeeBak Kim2016-07-301-4/+4
| | | |
| * | | Change calls from persistant_default_layer_set() to default_layer_set()JeeBak Kim2016-07-301-3/+3
| | | |
| * | | PrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE ↵JeeBak Kim2016-07-301-10/+10
| | | | | | | | | | | | | | | | layers
| * | | Media keys for all the "regular" layersJeeBak Kim2016-07-301-10/+10
| | | |
| * | | Add mouse layer, and remove default arrow keys (touchcursor only, now)JeeBak Kim2016-07-301-15/+36
| | | |
| * | | Add numbers to _RAISEJeeBak Kim2016-07-301-4/+4
| | | |
| * | | Move _RAISE symbols to _LOWERJeeBak Kim2016-07-301-6/+6
| | | |
| * | | Tap for Enter, hold for ShiftJeeBak Kim2016-07-301-30/+31
| | | |
| * | | Add personalized TouchCursor layerJeeBak Kim2016-07-301-6/+28
| | | |
| * | | Tap for Esc, hold for ControlJeeBak Kim2016-07-301-30/+33
| | | |
| * | | Add "jeebak" keymap folder as a copy of the "default" folderJeeBak Kim2016-07-303-0/+341
| |/ /
* | | Merge pull request #590 from jeebak/in-like-flintJack Humbert2016-07-311-0/+8
|\ \ \ | |/ / |/| | Add IN_LIKE_FLINT song
| * | Add IN_LIKE_FLINT songJeeBak Kim2016-07-301-0/+8
|/ /
* | Merge pull request #589 from algernon/h/ergodox_ez-vs-ergodoxJack Humbert2016-07-307-9/+9
|\ \ | | | | | | Update some obsolete references
| * | Update some obsolete referencesGergely Nagy2016-07-307-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_fixJack Humbert2016-07-291-13/+15
|\ \ | | | | | | Fix the quick aliases documentation section
| * | Fix the quick aliases documentation sectionFred Sundvik2016-07-291-13/+15
| | | | | | | | | | | | | | | Also move all keyboard customization documentation under the "Going Beyond the keycodes" heading.
* | | Merge pull request #503 from fredizzimo/ergodox_subprojectJack Humbert2016-07-29225-1795/+1651
|\ \ \ | |/ / |/| | Add both Ergodox EZ and Infinity Ergodox as sub-projects of Ergodox
| * | Small fix for infinity include guardFred Sundvik2016-07-291-3/+3
| | |
| * | Fix typo in the readme.Fred Sundvik2016-07-291-1/+1
| | |
| * | A couple of more Ergodox readme fixesFred Sundvik2016-07-291-2/+2
| | |
| * | Unify the ErgoDox EZ and Infinity documentationFred Sundvik2016-07-291-8/+13
| | |
| * | Refer to the right path in the readmeFred Sundvik2016-07-291-1/+1
| | |
| * | Move Ergodox readme from ez subfolder to parentFred Sundvik2016-07-291-0/+0
| | |
| * | Include the main Makefile before including Ergodox infinity driversFred Sundvik2016-07-291-4/+4
| | |
| * | Move Infinity Ergodox drivers to subproject, and fix makefileFred Sundvik2016-07-2914-2/+2
| | |
| * | Remove the Infinity Ergodox default keymapFred Sundvik2016-07-292-282/+0
| | |
| * | Cleanup the townk_osx config.h and make filesFred Sundvik2016-07-292-52/+2
| | |