summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Moved PREVENT_STUCK_MODIFIERS to config.hJoshua T2016-07-302-3/+3
|
* Moved my Ergodox keymap to match upstream changesJoshua T2016-07-302-8/+10
|
* Merge remote-tracking branch 'upstream/master'Joshua T2016-07-30245-1742/+3096
|\
| * 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
| | |
| | * Rename supercoder config_user to config.hFred Sundvik2016-07-291-1/+1
| | | | | | | | | | | | Also fixup the include path of parent config
| | * Fix config.h include guardsFred Sundvik2016-07-292-4/+4
| | |
| | * Define weak matrix user function for Infinity ErgodoxFred Sundvik2016-07-291-0/+9
| | | | | | | | | | | | So that a few keyboards, which don't use them, links properly.
| | * Speed up ChibiOS keymap compilationFred Sundvik2016-07-291-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 keymapFred Sundvik2016-07-291-1216/+1217
| | |
| | * Move some of the Ergodox config settings to sharedFred Sundvik2016-07-293-37/+37
| | |
| | * Add empty led control functions to Infinity ErgodoxFred Sundvik2016-07-292-0/+96
| | | | | | | | | | | | So that most keymaps compiles and links
| | * Most ergodox keymaps compiles on InfinityFred Sundvik2016-07-2921-32/+46
| | | | | | | | | | | | There are linker errors due to missing led funcitonality though
| | * All Ez keymaps compilesFred Sundvik2016-07-2958-58/+70
| | |
| | * Initial structure for Ergodox as subprojectsFred Sundvik2016-07-29219-23/+58
| |/ | | | | | | Only the EZ default keymaps compiles at the moment though.
| * Merge pull request #584 from algernon/ergodox-ez/algernonErez Zukerman2016-07-294-28/+687
| |\ | | | | | | ergodox_ez: Upgrade my keymap to v1.4
| | * ergodox_ez: Upgrade my keymap to v1.4Gergely Nagy2016-07-294-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_neo2Erez Zukerman2016-07-292-7/+15
| |\ \ | | | | | | | | Ergodox EZ: update keymap “coderkun_neo2”
| | * | disable sleep LEDcoderkun2016-07-291-1/+2
| | | |
| | * | complete labels for modifiers in keymap schemacoderkun2016-07-291-2/+2
| | | |
| | * | use Ergodox EZ’s third LED for “scroll lock”coderkun2016-07-291-2/+9
| | | |
| | * | fix grave (GRV) and acute (ACUT) accentscoderkun2016-07-291-2/+2
| | |/
| * | Merge pull request #580 from MatsLanGoH/patch-1Erez Zukerman2016-07-291-1/+1
| |\ \ | | |/ | |/| Fixed a typo
| | * Fixed a typoMatthias2016-07-291-1/+1
| |/ | | | | Fixed a typo in line 738 'void martix_init' to 'void matrix_init'
| * Merge pull request #578 from 0xdec/masterJack Humbert2016-07-284-0/+234
| |\ | | | | | | 0xdec Preonic keymap
| | * Create 0xdec Preonic keymapJordi Orlando2016-07-284-0/+234
| | | | | | | | | | | | An ergonomically optimized Colemak keymap for the grid-layout Preonic
| * | Merge pull request #577 from hot-leaf-juice/masterJack Humbert2016-07-283-0/+211
| |\ \ | | | | | | | | Pull request to include my keymap if you want it!
| | * | Added readme.md for custom layout.Callum Oakley2016-07-281-0/+48
| | | |
| | * | Added custom keymap.Callum Oakley2016-07-272-0/+163
| | | | | | | | | | | | | | | | Added custom keymap.
| * | | Merge pull request #573 from algernon/f/make-all-stop-on-errorJack Humbert2016-07-281-2/+2
| |\ \ \ | | |_|/ | |/| | tmk_core/rules.mk: Make PRINT_ERROR* stop on error
| | * | tmk_core/rules.mk: Make PRINT_ERROR* stop on errorGergely Nagy2016-07-271-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-debugJack Humbert2016-07-282-0/+16
| |\ \ | | | | | | | | tap-dance: Add some debugging support
| | * | tap-dance: Add some debugging supportGergely Nagy2016-07-272-0/+16
| | |/ | | | | | | | | | Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
| * | Merge pull request #570 from sethbc/fix_bone2planck_buildJack Humbert2016-07-281-10/+8
| |\ \ | | | | | | | | Fix bone2planck build
| | * | remove unnecessary includesSeth Chandler2016-07-271-2/+0
| | | |
| | * | fix numerous errors in bone2planck keymapSeth Chandler2016-07-271-10/+10
| | |/
| * | Merge pull request #569 from sethbc/fix_stanleylai_warningsJack Humbert2016-07-281-10/+5
| |\ \ | | | | | | | | kill warnings filling up travis buildlog
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 11:59:06 +0000